Fixed EventMetadata to Context mapping