Added support for session storage