More work on the foreign key feature