Added DROP and extra field for templates.