Improved build process