renaming permissionModel to entityModel
fixed bugs regarding annotations