CEDAW and the rights to Non-discrimination and Equality