Added ability to modify templates