Added support for mailboxer