Added default google id if one not present. Made the noaId optional.