Entities' refactoring in progress