A/HRC/41/42 100. With respect to the Commission on Crime Prevention and Criminal Justice, States, United Nations entities and other relevant stakeholders should include violence against women and the criminal justice system as a standard agenda item during sessions of the Commission and incorporate gender mainstreaming into all its work. 101. With respect to the system-wide approach to eradicate violence against women and girls, States, United Nations entities and other relevant stakeholders should: (a) Adopt a General Assembly resolution, or other appropriate measures, to institutionalize the Platform of independent international and regional mechanisms on women’s rights and violence against women; (b) Support UN-Women, in collaboration with OHCHR and UNODC, in taking a leading role in establishing a more connected, system-wide approach to prevent and combat violence against women, with the full inclusion of the Special Rapporteur and other relevant independent monitoring mechanisms; (c) Include the Special Rapporteur and other relevant independent mechanisms in the development of initiatives to eliminate violence against women, such as the Spotlight Initiative, as a means of ensuring the sustainability of their results. 102. With respect to the women, peace and security agenda and Security Council resolution 1325 (2000), States, United Nations entities and other relevant stakeholders should support the involvement of the Special Rapporteur in the agenda, including through the provision to the Council of additional briefings and documentation on sexual violence in armed conflict, in line with Security Council resolution 1888 (2009). 103. With respect to national action plans on violence against women, States, United Nations entities and other relevant stakeholders should: (a) Update and implement national action plans on violence against women in line with general recommendation No. 35; (b) Establish a femicide watch or observatories on violence against women and femicide, in line with the report of the Special Rapporteur (A/71/398) and general recommendation No. 35. 20