That's correct. There will be substantially different diagnostic factors, and, as a matter of fact, as we talk about gender-variant people, it will spell out that there is a broad spectrum of gender rather than just two genders.
WPATH, which is the most authoritative organization internationally, was invited to give a deposition to the DSM-5. In fact, the DSM-5 will recommend that the WPATH standards of care published in September 2011 should be taken as authoritative.