Adopt to the new Master Trigger interface