Few changes in User