Improve tracking of event from the editor