Add default folding clauses