Update to GCMCLient_2