Added support for deletion template