add support for <TimeStamp>