Added some direct message handling support