Event mapping is now attribute-based.  This change facilitates obfuscation.
Merge branch 'Attribute-Based-Event-Mapping'
Event mapping is now attribute-based. This change facilitates obfuscation.