Reworked model system