Now accepts urls