Added folding support