Add fold unfold support.