Adding cross-currency swap integration
Preserving backwards compatibility