Updated DataModel