Add more functions in Timetable (unfinished)