Added token configurations.
Merge branch 'panos/add-tokens'