Migrated some to new interface
Converted to using compound dataset interface