added the jpa support