Refactor and add puavoId as an externalId to Google