Adding Session properties
Fixing merge