Added decoding of countries and currencies.