Improving the architecture