TODO added to plot service