RoomMessage - refactoring