Added trigger parsing