Added inital JPA impl