Consolidate ModelCreator implementations

+review REVIEW-5204