Improve build task