Okay, now I get it. How would you like to see this done? Modify SaveFileStateJob to handle PVR channels too and then add the needed extra calls where necessary (like PerformChannelSwitch)?