Migrate to new session storage model