Add named paths
Add optional relationships