TimeSeries Generator Improved