Add missing  and  fields to