Refactoring some classes and other news were aggregated to resolve some issues inside of the entities model