Added autoTriggerUntil function support