Added Channels support