Updated Episode & Channel classes