Add support for OData URL's