Moving specific functionality out of CLDR