Refactored component triggers