Added template version