Builder support added to build configuration