[Working Capital] Refactored to comply with the new Generated API