Fix usage of Map
Merge branch 'master' into event