Added timetables with substitution integration