added trigger support