Added support for Sessions