Finished adding URL support