Add support for FPM_EXTRA_ARGS