Improve router