Use generic session class whenever possible
Merge pull request #598 from hurtonm/master

Use generic session class whenever possible