Also add order data handling to Client API.