Further develop the templates