refactoring to support the hybrid-connect for ccp