A/HRC/44/52/Add.2 (c) Expedite the adoption of the national strategy and national action plan on ending gender-based violence and allocate adequate resources for their implementation; (d) Strengthen cooperation between the Subsecretariat for the Prevention and Eradication of Violence against Women, Children and Adolescents and the National Council on Gender Equality in order to ensure the coordinated implementation of the Comprehensive Organic Law to Prevent and Eradicate Violence against Women; (e) Guarantee the systematic participation of women’s organizations in the implementation of the Comprehensive Organic Law and other decision-making processes concerning the protection of women’s rights at the national and local levels; (f) Ensure the establishment of specialized judicial units on violence against women throughout the country, including in remote and rural areas, and provide adequate resources and funding for their full implementation; (g) Ensure sustainable funding for a sufficient number of safe shelters throughout the country, offering culturally sensitive accessibility for women with disabilities in line with the Special Rapporteur’s report on a human rights-based approach to integrated services and protection measures on violence against women, with a focus on shelters and protection orders (A/HRC/35/30); (h) Establish an observatory on violence against women, as provided for in the Comprehensive Organic Law to Prevent and Eradicate Violence against Women, and include in its mandate a femicide prevention watch that should include the collection of administrative data by police and other relevant stakeholders on: (i) all intimate partner gender-related killings of women and girls (intimate partner femicides) based on the established relationship between the victim and the perpetrator (husbands, ex-husbands, partners etc.); (ii) family-related gender-based killings of women and girls based on the established family relationship between the victim and the perpetrator, or family-related femicide; and (iii) other gender-related killings or femicide; (i) Ensure careful analysis of all cases of femicide on an annual basis to identify any failure within the protection chain, with a view to improving and developing further preventive measures, in close cooperation with the National Council on Gender Equality, the Ombudsperson and representatives of civil society, as recommended in the Special Rapporteur’s report on this topic (A/71/398); (j) Establish protection orders as legal instruments in criminal and civil laws and grant the competent authorities the power to issue effective protection orders for all forms of violence against women and domestic violence. The orders must be easily available 24 hours a day, seven days a week, and must be enforced to protect the well-being and safety of those under their protection, including children. 26 96. Concerning the Comprehensive Criminal Code, the Government should: (a) Take steps to amend the current definition of rape and ensure that it is based on the absence of consent and that it is in line with international standards, as indicated by the Committee on the Elimination of Discrimination against Women in its general recommendation No. 35; (b) Take immediate measures to ensure that the necessary legislative and other steps are taken to guarantee that the statute of limitations for initiating any legal proceedings with regard to rape and other sexual violence covers a period of time that is sufficient and commensurate with the gravity of the offence in question to allow for 26 The Special Rapporteur draws the Government’s attention to the recommendations contained in her thematic report on a human rights-based approach to integrated services and protection measures on violence against women, with a focus on shelters and protection orders (A/HRC/35/30). 17