Updated composer to handle GoogleClient well