WIP refactor in MailboxMetrics