Improved CEventAgent