Add Configuration function
Merge branch 'channel'