Refactored entity for messaging