Added more relationships
Remove redundant