Add some route management structure
Fix merge conflict