Added annotation for fields in Role and User entities