Improvements in the entities ORM (JPA)