Refactor timetable perPersistence