Better event handling, no dummy entities used