Working on HistoricalDataCollector