Added fields and replaced header