Message refactoring.