Improved time diff support