Update to include with_urls option