add Map generic to Events