Updated classes with google lookup