6. Recalling its general recommendation No. 8 (1990) concerning the interpretation and application of article 1, paragraphs 1 and 4 of the Convention, its guidelines for reporting under the Convention and its previous recommendations, the Committee recommends that the State party collect and provide to the Committee updated and comprehensive statistics on the demographic composition of the population, based on the principle of self-identification, disaggregated by ethnic or national origin, including on Maroons, Tainos, Rastafaris and non-citizens, such as migrants, refugees, asylum-seekers and stateless persons, together with relevant socioeconomic indicators that would enable an accurate assessment of progress towards the equal enjoyment by all groups, without discrimination, of the rights enshrined in the Convention.
28. (...) It also recommends that the State party adopt comprehensive legislation to eradicate statelessness, which includes procedures for the determination of statelessness, and consider acceding to the Convention relating to the Status of Stateless Persons.