Adopt to the new trigger interface