Updated BuilderDefinitionInterface