Auto expand and clauses