Refactored the Messages hierarchy