Adds better parse_plot_format support