Added template-editor support