Added support for sessions