Build script and api changes