Issue 403 rebase

Use structs for passing args to AddRoute