Update to template handling.