added primary keys to data model