Alter Event class to use dictionary for storing all values of fields