r306: Changes for PlotFile support