adding JPA support