Move more logic to Messenger class