updated class User and Session