Improved the build process