Fix date objects construction. Stop using dataset name