Adjusted configuration order and routes for command-line-only