Combine methods, as no re-use required.
Improvements for DataModelBuilder