Add UAVOs to other targets.