VAD and Plotter refactoring