Added new version of ClientSetup