Add support extended-timestamp