Events now use TypeEnumDiscriminatorMap