Removed unnecessary generics on DataModel