datasets refactoring