(CFACT-59) Add id and gid facts