Added support for persistent session ids