refactoring to support the hybrid-connect for ccp
refactoring to support the hybrid-connect for ccp