Set session storage is optional now