Improved timeframe support.