Some JPA changes