Actually use user options
Fix user-defined routing