Add support for new build.sh script