Added template handler