adapted templates to new models.