Added query objects to represent Url's as objects.