Improve build script