More changes for a build task