Session class restructure