Updates to handle all model types