Updated Data Model