Updated Session handling