Some add-ons and fix on Router