Add in saving FID into table. Update tests and related data structures.