CurrencyTypeConverterFactory refactoring