Replaced SessionId token with more generic Url token