Perhaps include this based on the `extension` setting for the Client