Some changes to connect to gmail account.