More restructuring of channel classes