Migrated some more to use dataset interface
Migrated to compound dataset interface
Migrate some more to dataset interface