Updated Build script