Adds support for future timestamps