Added missing template_handler