Add entity notifications
Fix