Added support for auth tokens and permissions