Change Event to BaseEvent