Refactor step 2: Moved all connector common parts to the super class (CliConnectorBase).