Upgraded build script