Redesign session storage