More improvements in the entities ORM (JPA)