Improve start of router