Improved timespans supported