Migrated some more to use dataset interface
Migrated to compound dataset interface
Finished migration to dataset interface