Migrated some more to use dataset interface
Migrated some more to use dataset interface