Break up queries to be easier to read
Refactor resources into hierarchy
Make token methods more strict on input