Updates Clauses to use static references