Add sessionStorage mode support