Added foreign key relationship support