The International Bill of Human Rights together with the CRPD provides a comprehensive charter, among other things, to be adopted by a ratifying state for a modern and non-discriminatory mental health system.