Update to support multi channel