Added client-side JPA