ES6: Convert more routes over