Entities refactored