Modified Session class