Improve route class