Made adjustments to registering of Events.

Made adjustments to registering of Events.