More work on static template