Finish migration to use dataset interface