Improve build process