Fix model loading to use the latest model format