ODataRequest refactoring.