Fix Relation names
Add more Relations