Minor updates to the router modules so can add new routers etc