r5373: prepare infrastructure for maing different events