Applied some changes in User class
Applied some changes in User and Country classes