Adapted plotting to new message format