Added user and session management