Got it. Maybe we should look at these listeners to replace the Entity listener we already have elsewhere. These sound more flexible.