add expedient support for FAPI