Adding support for jfa