Improved Router syntax, see #50