Added time series support