Rework to make with JPA included in EE7