It should probably be split into 10 different slices, but that won’t happen until we understand a hell of a lot more. In the meanwhile – yeah, break it up. I think a NIMH director tried to push a division of the insanely broad syndromic classification years ago. The current definition is too broad to be useful for either research, prognosis, or treatment.