Reorganized event system