!fixup use DataModel instead of Model for all data based models
All tests passing