Improve event fragmentation