Improve tracking of pending calls