Added locking session storage handler