Added trigger selection handlers