Updated TimeTable and TimeSlot classes