It would be better to use an ``OrgUnit`` instead of a ``Client`` since we are in the process of migrating away from ``Client``.