Refactor removing internal use of V1APIConnector.
Replaces some signatures so they use the IAPIConnector interface.