Migration to new builder