Adding usage by Token
Updating to work in API v1.6
Updating Tests to work in API v1.6