A/HRC/13/39/Add.2 Administration of criminal justice for juvenile offenders (q) Develop a modern juvenile justice system aimed at the prevention of crime and the rehabilitation of juvenile offenders; and (r) Introduce drug-substitute programmes in juvenile detention facilities. Women (s) In accordance with the National Plan to Combat Domestic Violence, establish effective mechanisms to address cases of violence against women, including through further awareness-raising within the law-enforcement organs and the judiciary; and (t) Establish shelters for victims of domestic violence and rehabilitation centres for offenders. 106. The Special Rapporteur also recommends that the relevant United Nations bodies, donor Governments and development agencies assist the Government of Uruguay in the implementation of these recommendations, in particular in its efforts to reform its criminal law system, to improve the prison system and to provide appropriate training to police and prison personnel. 24 GE.09-17655