Updated to new typed mailbox