Reworked model extension