diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 0d1bebe..093be7e 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.6.0"
+  ".": "1.6.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df24fa0..50c3ba5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.6.1](https://github.com/googleapis/python-debugger-client/compare/v1.6.0...v1.6.1) (2023-01-20)
+
+
+### Bug Fixes
+
+* Add context manager return types ([3a95f76](https://github.com/googleapis/python-debugger-client/commit/3a95f76295407b60d20c2be35a07611e1ec3ed2d))
+
+
+### Documentation
+
+* Add documentation for enums ([3a95f76](https://github.com/googleapis/python-debugger-client/commit/3a95f76295407b60d20c2be35a07611e1ec3ed2d))
+
 ## [1.6.0](https://github.com/googleapis/python-debugger-client/compare/v1.5.0...v1.6.0) (2023-01-10)
 
 
diff --git a/google/cloud/debugger/gapic_version.py b/google/cloud/debugger/gapic_version.py
index a016bdf..b4028ab 100644
--- a/google/cloud/debugger/gapic_version.py
+++ b/google/cloud/debugger/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.6.0"  # {x-release-please-version}
+__version__ = "1.6.1"  # {x-release-please-version}
diff --git a/google/cloud/debugger_v2/gapic_version.py b/google/cloud/debugger_v2/gapic_version.py
index a016bdf..b4028ab 100644
--- a/google/cloud/debugger_v2/gapic_version.py
+++ b/google/cloud/debugger_v2/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.6.0"  # {x-release-please-version}
+__version__ = "1.6.1"  # {x-release-please-version}
diff --git a/google/cloud/debugger_v2/services/controller2/client.py b/google/cloud/debugger_v2/services/controller2/client.py
index ac03524..1fcfd80 100644
--- a/google/cloud/debugger_v2/services/controller2/client.py
+++ b/google/cloud/debugger_v2/services/controller2/client.py
@@ -783,7 +783,7 @@ def sample_update_active_breakpoint():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "Controller2Client":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/google/cloud/debugger_v2/services/debugger2/client.py b/google/cloud/debugger_v2/services/debugger2/client.py
index d5c7d5b..b220ba8 100644
--- a/google/cloud/debugger_v2/services/debugger2/client.py
+++ b/google/cloud/debugger_v2/services/debugger2/client.py
@@ -1017,7 +1017,7 @@ def sample_list_debuggees():
         # Done; return the response.
         return response
 
-    def __enter__(self):
+    def __enter__(self) -> "Debugger2Client":
         return self
 
     def __exit__(self, type, value, traceback):
diff --git a/google/cloud/debugger_v2/types/data.py b/google/cloud/debugger_v2/types/data.py
index 356727e..7887bfc 100644
--- a/google/cloud/debugger_v2/types/data.py
+++ b/google/cloud/debugger_v2/types/data.py
@@ -82,7 +82,29 @@ class StatusMessage(proto.Message):
     """
 
     class Reference(proto.Enum):
-        r"""Enumerates references to which the message applies."""
+        r"""Enumerates references to which the message applies.
+
+        Values:
+            UNSPECIFIED (0):
+                Status doesn't refer to any particular input.
+            BREAKPOINT_SOURCE_LOCATION (3):
+                Status applies to the breakpoint and is
+                related to its location.
+            BREAKPOINT_CONDITION (4):
+                Status applies to the breakpoint and is
+                related to its condition.
+            BREAKPOINT_EXPRESSION (7):
+                Status applies to the breakpoint and is
+                related to its expressions.
+            BREAKPOINT_AGE (8):
+                Status applies to the breakpoint and is
+                related to its age.
+            VARIABLE_NAME (5):
+                Status applies to the entire variable.
+            VARIABLE_VALUE (6):
+                Status applies to variable value (variable
+                name is valid).
+        """
         UNSPECIFIED = 0
         BREAKPOINT_SOURCE_LOCATION = 3
         BREAKPOINT_CONDITION = 4
@@ -439,12 +461,31 @@ class Action(proto.Enum):
         r"""Actions that can be taken when a breakpoint hits.
         Agents should reject breakpoints with unsupported or unknown
         action values.
+
+        Values:
+            CAPTURE (0):
+                Capture stack frame and variables and update
+                the breakpoint. The data is only captured once.
+                After that the breakpoint is set in a final
+                state.
+            LOG (1):
+                Log each breakpoint hit. The breakpoint
+                remains active until deleted or expired.
         """
         CAPTURE = 0
         LOG = 1
 
     class LogLevel(proto.Enum):
-        r"""Log severity levels."""
+        r"""Log severity levels.
+
+        Values:
+            INFO (0):
+                Information log message.
+            WARNING (1):
+                Warning log message.
+            ERROR (2):
+                Error log message.
+        """
         INFO = 0
         WARNING = 1
         ERROR = 2
diff --git a/samples/generated_samples/snippet_metadata_google.devtools.clouddebugger.v2.json b/samples/generated_samples/snippet_metadata_google.devtools.clouddebugger.v2.json
index a8125d6..b5526a5 100644
--- a/samples/generated_samples/snippet_metadata_google.devtools.clouddebugger.v2.json
+++ b/samples/generated_samples/snippet_metadata_google.devtools.clouddebugger.v2.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-debugger-client",
-    "version": "1.6.0"
+    "version": "1.6.1"
   },
   "snippets": [
     {