Data Model Updated