Update Time-related functions - draft