added jpa support