Refactored some messaging classes
Merge commit '305681239b70cb501587cf5408ceca4c5922dfc6'