Visualizer-related changes