Improved keyword messaging