Updated event logging