VE-1178 Make use of TargetEvents class