Added extra fields to the data model