Reworked model loading