Moved from passport to gapi