Added support for JPA/Hibernate