Merged the two OData writers