Updating listeners for correct event processing for usage collection