More progress in templating