Finished migration to dataset interface
Missed one final class in migration to dataset interface