Improve the build process