Improved the usage check logic and included mailboxes usage