Triggers refactoring