Added extra_fields functionality