Maybe we should rename TargetName to TargetInfo if we add the extra information?