Full support for token based auth