Add foreign key support
Add more foeign key support