Added time-series and WMS - again