UserStorage refactoring