The Australian Bureau of Statistics is changing its Gender Indicators & they are inviting input:

https://beta.abs.gov.au/statistics/people/people-and-communities/gender-indicators.html

You might like to think about what should be included & provide some input to them. (See top of page.)