Converted more files to use NewChannel-API