Merge pull request #211 from qiangdavidliu/2.x

Refactor of InterestChannel to consolidate apis