More work on mappings for experiments and management events