Changed eventmessage generation a bit