Added the attributes to the Data set
Updated the incident class.