Changing MappingEvent types to be an enum