Convert to Messenger class