Use generic session class whenever possible