Starting refactoring of the Trigger system