Refactor of ConnectwiseApiFactory