Refactoring GenericMailbox