SetUpClientImpl refactored