Improvement/build task improvements