Add support for fid regen