Code

Modified all session calls of this type