Disease Model: refinements