Refactor relationships with links

Placeholder