modified data model to match database