Add odata support