Changes for handling google auth token