CML Viewer updates