New feature : Template management