Improved Url::make