Update for TimeTable use case