EventType and TargetType added