Added support for session variables