Fix message trigger, add mode method