Reorganized message handler configuration.