Add other source of channels, and distinguish between local and remote channels.