refactor hybridconnector

Change-Id: I00734964c20c43585c0677194ed2e676a2c021ba