Added  and  fields to the  clause.