Fix DataModel