Improve build spec