Update routes
Merge with upstream