Update messaging logic