Converted  more hard-coded routes.