Refactored the Url Plugin.