Added JPA support