diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 65cca76..d2074a8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,11 @@ Change Log
 
 .. There should always be an "Unreleased" section for changes pending release.
 
+[0.7.0] - 2020-09-07
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Simplify the feature toggle annotation format
+
 [0.6.0] - 2020-08-27
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/code_annotations/__init__.py b/code_annotations/__init__.py
index 8538025..cb705bc 100644
--- a/code_annotations/__init__.py
+++ b/code_annotations/__init__.py
@@ -2,4 +2,4 @@
 Extensible tools for parsing annotations in codebases.
 """
 
-__version__ = '0.6.0'
+__version__ = '0.7.0'
diff --git a/code_annotations/config_and_tools/config/feature_toggle_annotations.yaml b/code_annotations/config_and_tools/config/feature_toggle_annotations.yaml
index 4d2aeeb..ff94e2e 100644
--- a/code_annotations/config_and_tools/config/feature_toggle_annotations.yaml
+++ b/code_annotations/config_and_tools/config/feature_toggle_annotations.yaml
@@ -11,17 +11,15 @@ annotations:
   feature_toggle:
     - ".. toggle_name:":
     - ".. toggle_implementation:":
-        choices: [ExperimentWaffleFlag, WaffleFlag, WaffleSample, WaffleSwitch, CourseWaffleFlag, ConfigurationModel, DjangoSetting]
+        choices: [WaffleFlag, WaffleSwitch, CourseWaffleFlag, ExperimentWaffleFlag, SettingToggle, SettingDictToggle, ConfigurationModel, DjangoSetting]
     - ".. toggle_default:":
     - ".. toggle_description:":
-    - ".. toggle_category:":
     - ".. toggle_use_cases:":
-        choices: [incremental_release, launch_date, monitored_rollout, graceful_degradation, beta_testing, vip, opt_out, opt_in, open_edx]
+        choices: [temporary, circuit_breaker, vip, opt_out, opt_in, open_edx]
     - ".. toggle_creation_date:":
-    - ".. toggle_expiration_date:":
+    - ".. toggle_target_removal_date:":
     - ".. toggle_warnings:":
     - ".. toggle_tickets:":
-    - ".. toggle_status:":
 extensions:
     python:
         - py