Upgraded model loading