changed hierarchy
added handler for google api auth