Upgraded build process