Add session tracking
Merge and fix