A/HRC/22/49/Add.1 implemented, including school catchment and enrolment policies that promote integration. National consultations should be held towards establishing a single, harmonized and ethnically and religiously neutral State curriculum for all schools. Where the two-schools-under-one-roof system exists, steps to achieve administrative and classroom integration should be based upon dialogue and confidence-building across communities. Returnee communities 102. Seventeen years after the war, attention to returnees is fading and communities are struggling to become fully viable. Considerable efforts were made by national authorities and the international community to facilitate the return of many displaced persons. Nevertheless, substantial additional efforts and resources are required to fully implement annex 7 to the Dayton Agreement. The Independent Expert urges the full implementation of the 2010 revised strategy for the implementation of annex 7 and highlights the continuing role of the international community, and urges international donors to continue to provide funding to support sustainable returns. 103. The challenges facing those who remained in or have returned to their pre-war homes are manifested in physical, social, economic and psychological difficulties, exclusion and discrimination. Special attention must be paid by all responsible authorities to the rights and needs of such potentially vulnerable, isolated and marginalized communities. Attention must also be given to the needs of Roma and other non-constituent peoples with legitimate claims to property and reconstruction whose needs have sometimes been overlooked. 104. Evidence indicates that numerous cases of alleged war crimes perpetrated against civilians have not come before the courts, and consequently victims, who are often minorities and returnees, have not received the financial or psychological support they may require or are entitled to. Outstanding cases should be brought to completion without further delay. No undue restrictions or administrative barriers should be imposed on individuals seeking to claim their rights and allowances as ―civilian victims‖ in their places of residence, and laws should be harmonized in favour of victims. 105. Responsible authorities should put in place comprehensive long-term strategies for the improvement and sustainability of returnee communities in compliance with annex 7. Strategies should include key support for economic opportunities, infrastructure projects, enjoyment of cultural life, and social cohesion and inclusion. Returnee communities should be assisted to integrate into wider society, and discrimination, including in employment and service provision, must be rigorously addressed in compliance with non-discrimination laws. 106. Minorities have the right to freely and peacefully associate and assemble and this must be respected in practice. No undue obstacles or restrictions should be imposed, including for constituent peoples and minorities in all localities who wish to peacefully protest or commemorate dates or events significant to them while fully respecting relevant laws relating to peaceful assembly. 22