Added option for alternate trigger format