Add PersistentQueryTokens and link it to PersistentQuery