Part #1 of FX api change complete