Refactored data model creation to reuse the model creation function.  Fixed data model link loading.