#296 Relax EventMap parsing
#296 Relax EventMap parsing