diff --git a/DiagnosticCategoryAndIdRanges.txt b/DiagnosticCategoryAndIdRanges.txt
index a184bda..311d5e2 100644
--- a/DiagnosticCategoryAndIdRanges.txt
+++ b/DiagnosticCategoryAndIdRanges.txt
@@ -13,14 +13,14 @@
 # In the event of conflict in step 3, make sure you discard your changes, pull latest, and try again.
 # DO NOT remove ID ranges already defined or merge this file in git.  
 #
-Design: LuceneDev1000-LuceneDev1006
+Design: LuceneDev1000-LuceneDev1008
 Globalization:
 Mobility:
 Performance:
 Security:
-Usage:
+Usage: LuceneDev6000
 Naming:
 Interoperability:
-Maintainability:
+Maintainability: 
 Reliability:
 Documentation:
diff --git a/src/Lucene.Net.CodeAnalysis.Dev/AnalyzerReleases.Unshipped.md b/src/Lucene.Net.CodeAnalysis.Dev/AnalyzerReleases.Unshipped.md
index bcb2c83..188612b 100644
--- a/src/Lucene.Net.CodeAnalysis.Dev/AnalyzerReleases.Unshipped.md
+++ b/src/Lucene.Net.CodeAnalysis.Dev/AnalyzerReleases.Unshipped.md
@@ -2,3 +2,6 @@
 
  Rule ID       | Category | Severity | Notes
 ---------------|----------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------
+ LuceneDev1007 | Design   | Warning  | Generic Dictionary<TKey, TValue> indexer should not be used to retrieve values because it may throw KeyNotFoundException (value type value)
+ LuceneDev1008 | Design   | Warning  | Generic Dictionary<TKey, TValue> indexer should not be used to retrieve values because it may throw KeyNotFoundException (reference type value)
+ LuceneDev6000 | Usage    | Info     | IDictionary indexer may be used to retrieve values, but must be checked for null before using the value