All JPA models corrected