Amended session class