Potentially finished refactored entity design.