Add support for Map listeners and event batches