ODataClient internal implementation refactoring.