session handling updated