First location refactoring
Triggers refactored