Refactored entity structure.