Improve build