Usermessage refactoring