Modified Event Model and Entity

Modified Event Model and Entity