Events optimization