#652 Session access moved to separate class