Added support for alternative build types