* Added support for sessions