Fixed model loading