Applied some changes in User class