SessionService refactor