Update Build Script to V2