added token and session class