Begin Messaging refactoring