CE-311 Refactoring messages more