Some changes for the mock visualizer