Refactor to have more consistency between multi-instance model systems (gridded calib) - Work on WRAA-749
Minor class diagram update