Started refactoring of suspending the session