Finished refactoring triggers