REFACTOR: entity