Added new fields for Timetable