Updated files to work with Google APIs