small changes for foreign key identifier mapping