diff --git a/Gu.State.Benchmarks/Gu.State.Benchmarks.csproj b/Gu.State.Benchmarks/Gu.State.Benchmarks.csproj
index 11fa00a0..582155ce 100644
--- a/Gu.State.Benchmarks/Gu.State.Benchmarks.csproj
+++ b/Gu.State.Benchmarks/Gu.State.Benchmarks.csproj
@@ -69,7 +69,7 @@
   -->
   <Import Project="..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
       <ItemGroup>
         <Reference Include="BenchmarkDotNet">
           <HintPath>..\packages\BenchmarkDotNet\lib\net40\BenchmarkDotNet.dll</HintPath>
@@ -79,39 +79,6 @@
         <Reference Include="System.Management">
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="mscorlib">
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')">
-      <ItemGroup>
-        <Reference Include="BenchmarkDotNet">
-          <HintPath>..\packages\BenchmarkDotNet\lib\net45\BenchmarkDotNet.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="System.Management">
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="mscorlib">
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
-      <ItemGroup>
-        <Reference Include="BenchmarkDotNet">
-          <HintPath>..\packages\BenchmarkDotNet\lib\net46\BenchmarkDotNet.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="System.Management">
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="mscorlib">
-          <Paket>True</Paket>
-        </Reference>
       </ItemGroup>
     </When>
   </Choose>
diff --git a/Gu.State.Tests/Gu.State.Tests.csproj b/Gu.State.Tests/Gu.State.Tests.csproj
index e34494ed..7ed40b48 100644
--- a/Gu.State.Tests/Gu.State.Tests.csproj
+++ b/Gu.State.Tests/Gu.State.Tests.csproj
@@ -256,6 +256,17 @@
     <Folder Include="Internals\Collections\" />
     <Folder Include="Sandbox\" />
   </ItemGroup>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
+      <ItemGroup>
+        <Reference Include="Castle.Core">
+          <HintPath>..\packages\Castle.Core\lib\net45\Castle.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0' Or $(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
       <ItemGroup>
diff --git a/Gu.State/Gu.State.csproj b/Gu.State/Gu.State.csproj
index 93b340ee..872ba8ca 100644
--- a/Gu.State/Gu.State.csproj
+++ b/Gu.State/Gu.State.csproj
@@ -284,6 +284,14 @@
       </ItemGroup>
     </When>
   </Choose>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll">
+      <Paket>True</Paket>
+    </Analyzer>
+  </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\Newtonsoft.Json.dll">
       <Paket>True</Paket>
diff --git a/Gu.State/paket.references b/Gu.State/paket.references
index b422a8fd..a80e58d7 100644
--- a/Gu.State/paket.references
+++ b/Gu.State/paket.references
@@ -1,2 +1,3 @@
 JetBrains.Annotations
 StyleCop.Analyzers
+Microsoft.CodeAnalysis.Analyzers
diff --git a/Gu.State/paket.template b/Gu.State/paket.template
index d82344c5..90bc2e4b 100644
--- a/Gu.State/paket.template
+++ b/Gu.State/paket.template
@@ -1,6 +1,6 @@
 type project
 title Gu.State
-tags INotifyPropertyChanged, WPF
+tags Equals, Copy, Sync, Diff, Dirty
 projectUrl https://github.com/JohanLarsson/Gu.State
 licenseUrl http://opensource.org/licenses/MIT
 
diff --git a/paket.dependencies b/paket.dependencies
index bee2e202..b18d2a69 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -8,4 +8,4 @@ nuget BenchmarkDotNet
 nuget System.Collections.Immutable
 #nuget Desktop.Analyzers
 #nuget Microsoft.ApiDesignGuidelines.Analyzers
-#nuget Microsoft.CodeAnalysis.Analyzers
\ No newline at end of file
+nuget Microsoft.CodeAnalysis.Analyzers
\ No newline at end of file
diff --git a/paket.lock b/paket.lock
index 2b51ae3b..95c7c612 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,10 +1,13 @@
 NUGET
   remote: http://www.nuget.org/api/v2
   specs:
-    BenchmarkDotNet (0.9.6)
+    BenchmarkDotNet (0.9.7)
+    Castle.Core (3.3.3) - framework: >= net45
     JetBrains.Annotations (10.1.4)
       System.Runtime (>= 4.0) - framework: dnxcore50
-    Moq (4.5.3)
+    Microsoft.CodeAnalysis.Analyzers (1.1)
+    Moq (4.5.8)
+      Castle.Core (>= 3.3.3) - framework: >= net45
     NUnit (2.6.4)
     StyleCop.Analyzers (1.0)
     System.Collections (4.0.10) - framework: dnxcore50