Added class for country and state