Make refactoring of some entities. Make refactoring of Hibernate
objects.