Changed to Hibernate JPA