templates adjusted to model changes