Add proper notifications on entity insertion/removal.