Optimize performance using OData