Added mailbox class