added support for session variables