Allow us to get different types of tokens

This is a slight work around waiting for core
Change-Id: Iaa949bae696dad98756e6c99b910e22eb476b0bc
Merge "Allow us to get different types of tokens"