Support for new builder