Second version of incident and incident_type table managment