Added support for build task