Completed JPA annotations