added JPA support