SessionStorage refactoring;