Expanding model definitions in preparation for saving actual B-R data