Updates to routing, nested goals