Refactor AddEventMonitor and RemoveEventMonitor