- refactoring AbstractEntity structure