Updating routers to unify the code used in both as much as possible
Bump version number