Add more fine grained control from command line for plotting