Added support for Server Tokens from Portal Tokens