Adapt to latest FIRM version.