ONIX improvements for validity, use new DAOs