Add support for future dates