Further work on the templates