Improve router dispatch
Improve auto route