update SessionStorage to be more robust and work with multiple users/tokens/states