JPA Specific Changes