Entity model annotations complete