Remove TriggerStateMap and use instead triggerWrapper which contains
Trigger AND TriggerState