Added user and session classes