Enhance: session token generation may be overridden