Added custom trigger support