initial work on foreign key support