Add Country, Language and Nationality to terms and contexts