Refactor on our Client Object Model.