Added support for build preparation