Better tracking for entities added and removed.