Added some support for event messages