Better build script