Introduce models.entity and models.partial