Refactor: Move session to Context class