Timings improvements.
Support TimingsOnDemand