improved Trigger infomation managment