Add back external URL support; make URL resolution optional