Reorganized more message handler configuration.