Promote this class since it will be used by different `Client`s?