Added new classes for the new trigger framework: