Made Mailbox and MailboxFactory more configurable