Added fixedRateCurrencyType and general refactors