Merge the two Dataset classes into a single one. Refactoring, better comments