Refactored accounting.client