Add initial OData support