Completed the new builder implementation.