Updates to enable regulatory modeling