Moved model.builder to model.internal