Alter PlanGenerator and OnBoardDepartServiceImpl to deal with real-time updates correctly