Adding multiple @URL support