Added support to webTokens