Enhance url support