Minors and those with dementia should be included in the legislation likely to be accepted later this year.