Message section refactored