Fix Broken Relationships

Fix Broken Relationships