Added support for session token