Add support for auth tokens