Improved event system.