Update to add EventHanders object name