Added handler support to template

Changed template to support the new options for handled items