Add more FAPI functions