Channel refactor

We do not handle here instanceInfo == null case.