Session evaluations refactor