Refactor of pending channels