Improved schedule and switch handling