Added session token handling to the Session container