Refactor to use the new departuresurl in config;