Add the unwinder feature