[BUGFIX] Consolidate usage of DocumentTemplate