Updates to Data Model