proto + jpa changes