Add session handling
Fix merge changes