Refactoring of template plugin is done