Updated IncidentModel