Modified GraphBuilder and added PlotBuilder