Add Channel Data
Merge branch 'channel'

* channel:
  Add Channel Data