Modified some var for User and Session.