Updated event dispatcher