Updated channel class