Update for new model format