Added GlobalChannel and OrganizationChannel