Fix session class and change to static