Added mailbox logic