[IMP] More dataset refactoring