Add suboptions for targets
Merge