Added some more of the subtargets