Change from singleton to session variables