Model changes to support Booz-Data