Disease data model refinements (WIP)