Added save FID feature