JPA support added