Improving the build time