Refactor of Dataset definitions