Optimized the build script so Package runs faster