Improve build script
Rebuild