Adding country detection support.