Added dispatching of entity-related events