Added fields to data model