Added custom URL support