diff --git a/src/StructId.Package/StructId.targets b/src/StructId.Package/StructId.targets
index 67fa127..3e8a234 100644
--- a/src/StructId.Package/StructId.targets
+++ b/src/StructId.Package/StructId.targets
@@ -44,7 +44,23 @@
     <WriteRaw Content="%(StructId.Content)" SourcePath="%(StructId.FullPath)" TargetPath="%(StructId.TargetPath)" />
   </Target>
 
-  <Target Name="AddStructId" DependsOnTargets="IncludeStructIdAsIs;CopyStructIdNamespaced" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
+  <Target Name="AddStructId" DependsOnTargets="IncludeStructIdAsIs;CopyStructIdNamespaced;ResolveLockFileReferences" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
+    <!-- Feature detection -->
+    <PropertyGroup>
+      <UseDapper>false</UseDapper>
+      <UseDapper Condition="'@(Reference -> WithMetadataValue('NuGetPackageId', 'Dapper'))' != ''">true</UseDapper>
+      <UseEntityFramework>false</UseEntityFramework>
+      <UseEntityFramework Condition="'@(Reference -> WithMetadataValue('NuGetPackageId', 'Microsoft.EntityFrameworkCore'))' != ''">true</UseEntityFramework>
+      <UseUlid>false</UseUlid>
+      <UseUlid Condition="'@(Reference -> WithMetadataValue('NuGetPackageId', 'Ulid'))' != ''">true</UseUlid>
+    </PropertyGroup>
+    <ItemGroup>
+      <FeatureTemplatesToRemove Include="@(StructId -> WithMetadataValue('Filename', 'DapperTypeHandler'))" Condition="!$(UseDapper)" />
+      <FeatureTemplatesToRemove Include="@(StructId -> WithMetadataValue('Filename', 'EntityFrameworkValueConverter'))" Condition="!$(UseEntityFramework)" />
+      <FeatureTemplatesToRemove Include="@(StructId -> WithMetadataValue('Filename', 'NewableUlid'))" Condition="!$(UseUlid)" />
+      <StructId Remove="@(FeatureTemplatesToRemove)" />
+    </ItemGroup>
+    <!-- Add final template items to project -->
     <ItemGroup>
       <Compile Include="%(StructId.TargetPath)" />
     </ItemGroup>
diff --git a/src/StructId.FunctionalTests/NewUlid.cs b/src/StructId/Templates/NewableUlid.cs
similarity index 67%
rename from src/StructId.FunctionalTests/NewUlid.cs
rename to src/StructId/Templates/NewableUlid.cs
index f7b5f0e..a981d9d 100644
--- a/src/StructId.FunctionalTests/NewUlid.cs
+++ b/src/StructId/Templates/NewableUlid.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using StructId.Functional;
+using StructId;
 
 [TStructId]
 file partial record struct TSelf(Ulid Value)