Added support for tokens and authenticated services