Improved handling future dates