Changed to use Unique-ID as identifier for channel.
Partial commit.