Session class modified