Added channel fanout support