Added Session calls & Minor cleanup