Improve route config