Trigger improvement: device state change with ... ALL or NOTHING