More generic way of adding clauses