Update to cover addition of Template formatting