Added timerange awareness