Updates to support time_offset