Add ability to query tokens