Raul

Messaging-related refactorings