adding the ability to track cursor streams