Refactor of the constructors of entities