Fixup DataModel