Refactoring message properties