Jpa changes 2