jpa support added