Updated Session class