Adding simulator and plotter