Added custom url support