Added update handler tracking