Improved events for better forwarding