refactoring transport/connector