Changed Session store code
merged changes from deploy help