Re-architected to move away from session-based storage