Migrated plotting to use dataset interface