Add more subscription switching code