update to support new model types