Some more refactoring question entity