Starting architecture redesign. Updated data storage in session