Finished migration to dataset interface