2. To the Ministry of Justice and Ministry of the Interior, to continue improving the accommodation conditions and cease to use facilities for the accommodation of persons deprived of their liberty which are not in compliance with international and legal standards; 3. To the Ministry of Justice, to ensure the required number of health care workers and improve the quality of health care provided to persons deprived of their liberty and, with the Ministry of Health, to consider the transfer of health care provision for persons deprived of liberty from the judicial system to the health care system; 4. To the Ministry of Social Policy and Youth and Ministry of Health, to intensify activities aimed at reducing the rate of institutionalisation of persons with mental disorders, including the strengthening of mental health care services at the local level; 5. To the Ministry of Justice, to remove the listed legislative shortcomings, particularly with regard to the EPSA, CPA and APPMD; 6. To the Ministry of Justice, to carry out a study on the efficiency of instruments for the protection of the rights of persons deprived of their liberty.