Improve build time