Refactor for a global Call and Channel object space