Update for more generic url pattern and import