Improved switching schedule handling