pyegeria 5.4.0.28__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

pyegeria/{data_designer.py → omvs/data_designer.py}

@@ -11,18 +11,16 @@ import asyncio
 
 from loguru import logger
 
-from pyegeria import Client2
-from pyegeria._client import max_paging_size
-from pyegeria._output_formats import select_output_format_set, get_output_format_type_match
+from pyegeria.core._server_client import max_paging_size, ServerClient
+from pyegeria.view.base_report_formats import select_report_spec, get_report_spec_match
 from pyegeria.models import (SearchStringRequestBody, FilterRequestBody, GetRequestBody, NewElementRequestBody,
                              TemplateRequestBody,
                              UpdateElementRequestBody, NewRelationshipRequestBody,
-                             DeleteRequestBody)
-from pyegeria.output_formatter import (extract_mermaid_only, extract_basic_dict)
-from pyegeria.output_formatter import (generate_output,
-                                       _extract_referenceable_properties)
-from pyegeria.utils import body_slimmer, dynamic_catch
-
+                             DeleteElementRequestBody, DeleteRelationshipRequestBody)
+from pyegeria.view.output_formatter import (extract_mermaid_only, extract_basic_dict, populate_common_columns)
+from pyegeria.view.output_formatter import (generate_output)
+from pyegeria.core.utils import dynamic_catch
+from typing import Any, Optional
 
 def query_seperator(current_string):
     if current_string == "":
@@ -47,21 +45,21 @@ def base_path(client, view_server: str):
     return f"{client.platform_url}/servers/{view_server}/api/open-metadata/data-designer"
 
 
-class DataDesigner(Client2):
+class DataDesigner(ServerClient):
     """DataDesigner is a class that extends the Client class. The Data Designer OMVS provides APIs for
       building specifications for data. This includes common data fields in a data dictionary, data specifications
       for a project and data classes for data quality validation.
     """
 
-    def __init__(self, view_server_name: str, platform_url: str, user_id: str = None, user_pwd: str = None,
-                 token: str = None, ):
+    def __init__(self, view_server_name: str, platform_url: str, user_id: Optional[str] = None, user_pwd: Optional[str] = None,
+                 token: Optional[str] = None, ):
         self.view_server = view_server_name
         self.platform_url = platform_url
         self.user_id = user_id
         self.user_pwd = user_pwd
         self.data_designer_root: str = (
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/data-designer")
-        Client2.__init__(self, view_server_name, platform_url, user_id=user_id, user_pwd=user_pwd, token=token, )
+        ServerClient.__init__(self, view_server_name, platform_url, user_id=user_id, user_pwd=user_pwd, token=token, )
 
     #
     #    Data Structures
@@ -83,11 +81,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -154,11 +152,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -299,11 +297,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -468,7 +466,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_link_member_data_field(self, parent_data_struct_guid: str, member_data_field_guid: str,
-                                            body: dict | NewRelationshipRequestBody = None) -> None:
+                                            body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect a data structure to a data field. Async version.
 
@@ -487,11 +485,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -524,7 +522,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_member_data_field(self, parent_data_struct_guid: str, member_data_field_guid: str,
-                               body: dict | NewRelationshipRequestBody = None) -> None:
+                               body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
          Connect a data structure to a data field.
 
@@ -543,11 +541,11 @@ class DataDesigner(Client2):
 
          Raises
          ------
-         InvalidParameterException
+         PyegeriaInvalidParameterException
              one of the parameters is null or invalid or
-         PropertyServerException
+         PyegeriaAPIException
              There is a problem adding the element properties to the metadata repository or
-         UserNotAuthorizedException
+         PyegeriaUnauthorizedException
              the requesting user is not authorized to issue this request.
 
          Note
@@ -579,7 +577,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_member_data_field(self, parent_data_struct_guid: str, member_data_field_guid: str,
-                                              body: dict | DeleteRequestBody = None,
+                                              body: Optional[dict | DeleteRelationshipRequestBody] = None,
                                               cascade_delete: bool = False) -> None:
         """
         Detach a data class from a data structure. Request body is optional. Async version.
@@ -600,11 +598,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -612,7 +610,7 @@ class DataDesigner(Client2):
 
         Full sample body:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "cascadedDelete": false,
           "deleteMethod": "LOOK_FOR_LINEAGE",
           "externalSourceGUID": "add guid here",
@@ -628,12 +626,12 @@ class DataDesigner(Client2):
         url = (f"{self.data_designer_root}/data-structures/{parent_data_struct_guid}"
                f"/member-data-fields/{member_data_field_guid}/detach")
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Data field {member_data_field_guid} detached from data structure {parent_data_struct_guid}.")
 
     @dynamic_catch
     def detach_member_data_field(self, parent_data_struct_guid: str, member_data_field_guid: str,
-                                 body: dict = None | DeleteRequestBody, cascade_delete: bool = False) -> None:
+                                 body: dict = None | DeleteRelationshipRequestBody, cascade_delete: bool = False) -> None:
         """
         Detach a data class from a data structure. Request body is optional.
 
@@ -652,11 +650,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -664,7 +662,7 @@ class DataDesigner(Client2):
 
         Full sample body:
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "cascadedDelete": false,
           "deleteMethod": "LOOK_FOR_LINEAGE",
           "externalSourceGUID": "add guid here",
@@ -702,11 +700,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -715,7 +713,7 @@ class DataDesigner(Client2):
         Full sample body:
 
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "cascadedDelete": false,
           "deleteMethod": "LOOK_FOR_LINEAGE",
           "externalSourceGUID": "add guid here",
@@ -729,7 +727,7 @@ class DataDesigner(Client2):
 
         url = f"{self.data_designer_root}/data-structures/{data_struct_guid}/delete"
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete)
         logger.info(f"Data structure {data_struct_guid} deleted.")
 
     @dynamic_catch
@@ -752,11 +750,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -765,7 +763,7 @@ class DataDesigner(Client2):
         Full sample body:
 
         {
-          "class": "DeleteRequestBody",
+          "class": "DeleteRelationshipRequestBody",
           "cascadedDelete": false,
           "deleteMethod": "LOOK_FOR_LINEAGE",
           "externalSourceGUID": "add guid here",
@@ -781,7 +779,7 @@ class DataDesigner(Client2):
         loop.run_until_complete(self._async_delete_data_field(data_struct_guid, body, cascade_delete))
 
     @dynamic_catch
-    def find_all_data_structures(self, output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def find_all_data_structures(self, output_format: str = 'JSON', report_spec: str | dict = None) -> list | str:
         """Returns a list of all known data structures. Async version.
 
         Parameters
@@ -789,7 +787,7 @@ class DataDesigner(Client2):
 
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: dict, optional, default = None
+        report_spec: dict, optional, default = None
             - The desired output columns/field options.
         Returns
         -------
@@ -798,24 +796,38 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         return self.find_data_structures(search_string="*", output_format=output_format,
-                                         output_format_set=output_format_set)
+                                         report_spec=report_spec)
 
     @dynamic_catch
-    async def _async_find_data_structures(self, search_string: str, start_from: int = 0, page_size: int = 0,
-                                          starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                          body: dict | SearchStringRequestBody = None,
-                                          output_format: str = 'JSON',
-                                          output_format_set: str | dict = None) -> list | str:
+    async def _async_find_data_structures(self, search_string: str,
+                                          starts_with: bool = True, ends_with: bool = False,
+                                          ignore_case: bool = False,
+                                          anchor_domain: Optional[str] = None,
+                                          metadata_element_type: Optional[str] = None,
+                                          metadata_element_subtypes: Optional[list[str]] = None,
+                                          skip_relationships: Optional[list[str]] = None,
+                                          include_only_relationships: Optional[list[str]] = None,
+                                          skip_classified_elements: Optional[list[str]] = None,
+                                          include_only_classified_elements: Optional[list[str]] = None,
+                                          graph_query_depth: int = 3,
+                                          governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                                          effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                                          limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                                          sequencing_property: Optional[str] = None,
+                                          output_format: str = "JSON", report_spec: str | dict = None,
+                                          start_from: int = 0, page_size: int = 100,
+                                          property_names: Optional[list[str]] = None,
+                                          body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
         """ Find the list of data structure metadata elements that contain the search string.
             Async version.
 
@@ -823,20 +835,59 @@ class DataDesigner(Client2):
         ----------
         search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: dict|str, optional, default = None
-            - The desired output columns/field options.
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
+
         Returns
         -------
         [dict] | str
@@ -844,11 +895,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes:
@@ -874,37 +925,105 @@ class DataDesigner(Client2):
 
         url = f"{base_path(self, self.view_server)}/data-structures/by-search-string"
 
-        return await self._async_find_request(url, "DataStructure", self._generate_data_structure_output,
-                                              search_string, start_from=start_from, page_size=page_size,
+        return await self._async_find_request(url, "DataStructure", self._generate_data_structure_output, search_string,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
-                                              body=body, output_format=output_format,
-                                              output_format_set=output_format_set)
+                                              anchor_domain=anchor_domain,
+                                              metadata_element_type=metadata_element_type,
+                                              metadata_element_subtypes=metadata_element_subtypes,
+                                              skip_relationships=skip_relationships,
+                                              include_only_relationships=include_only_relationships,
+                                              skip_classified_elements=skip_classified_elements,
+                                              include_only_classified_elements=include_only_classified_elements,
+                                              graph_query_depth=graph_query_depth,
+                                              governance_zone_filter=governance_zone_filter,
+                                              as_of_time=as_of_time, effective_time=effective_time,
+                                              relationship_page_size=relationship_page_size,
+                                              limit_results_by_status=limit_results_by_status,
+                                              sequencing_order=sequencing_order,
+                                              sequencing_property=sequencing_property,
+                                              output_format=output_format, report_spec=report_spec,
+                                              start_from=start_from, page_size=page_size,
+                                              property_names=property_names, body=body)
 
     @dynamic_catch
-    def find_data_structures(self, search_string: str, start_from: int = 0, page_size: int = 0,
-                             starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                             body: dict | SearchStringRequestBody = None,
-                             output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def find_data_structures(self, search_string: str,
+                             starts_with: bool = True, ends_with: bool = False,
+                             ignore_case: bool = False,
+                             anchor_domain: Optional[str] = None,
+                             metadata_element_type: Optional[str] = None,
+                             metadata_element_subtypes: Optional[list[str]] = None,
+                             skip_relationships: Optional[list[str]] = None,
+                             include_only_relationships: Optional[list[str]] = None,
+                             skip_classified_elements: Optional[list[str]] = None,
+                             include_only_classified_elements: Optional[list[str]] = None,
+                             graph_query_depth: int = 3,
+                             governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                             effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                             limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                             sequencing_property: Optional[str] = None,
+                             output_format: str = "JSON", report_spec: str | dict = None,
+                             start_from: int = 0, page_size: int = 100,
+                             property_names: Optional[list[str]] = None,
+                             body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
         """ Find the list of data structure metadata elements that contain the search string.
 
         Parameters
         ----------
         search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: dict|str, optional, default = None
-            - The desired output columns/field options.
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
+
         Returns
         -------
         [dict] | str
@@ -912,11 +1031,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes:
@@ -942,22 +1061,39 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_data_structures(search_string, start_from, page_size, starts_with, ends_with, ignore_case,
-                                             body, output_format, output_format_set))
+            self._async_find_data_structures(search_string,
+                                             starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
+                                             anchor_domain=anchor_domain,
+                                             metadata_element_type=metadata_element_type,
+                                             metadata_element_subtypes=metadata_element_subtypes,
+                                             skip_relationships=skip_relationships,
+                                             include_only_relationships=include_only_relationships,
+                                             skip_classified_elements=skip_classified_elements,
+                                             include_only_classified_elements=include_only_classified_elements,
+                                             graph_query_depth=graph_query_depth,
+                                             governance_zone_filter=governance_zone_filter,
+                                             as_of_time=as_of_time, effective_time=effective_time,
+                                             relationship_page_size=relationship_page_size,
+                                             limit_results_by_status=limit_results_by_status,
+                                             sequencing_order=sequencing_order,
+                                             sequencing_property=sequencing_property,
+                                             output_format=output_format, report_spec=report_spec,
+                                             start_from=start_from, page_size=page_size,
+                                             property_names=property_names, body=body))
         return response
 
     @dynamic_catch
-    async def _async_get_data_structures_by_name(self, filter_string: str, classification_names: list[str] = None,
-                                                 body: dict | FilterRequestBody = None, start_from: int = 0,
+    async def _async_get_data_structures_by_name(self, filter_string: str, classification_names: Optional[list[str]] = None,
+                                                 body: Optional[dict | FilterRequestBody] = None, start_from: int = 0,
                                                  page_size: int = 0,
                                                  output_format: str = 'JSON',
-                                                 output_format_set: str | dict = None) -> list | str:
+                                                 report_spec: str | dict = None) -> list | str:
         """ Get the list of data structure metadata elements with a matching name to the search string filter.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties for the request.
@@ -967,7 +1103,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: str | dict, optional, default = None
+        report_spec: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -977,11 +1113,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -1005,21 +1141,21 @@ class DataDesigner(Client2):
                                                       filter_string=filter_string,
                                                       classification_names=classification_names,
                                                       start_from=start_from, page_size=page_size,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
 
         return response
 
     @dynamic_catch
-    def get_data_structures_by_name(self, filter: str, classification_names: list[str] = None,
-                                    body: dict | FilterRequestBody = None, start_from: int = 0,
+    def get_data_structures_by_name(self, filter_string: str, classification_names: Optional[list[str]] = None,
+                                    body: Optional[dict | FilterRequestBody] = None, start_from: int = 0,
                                     page_size: int = max_paging_size, output_format: str = 'JSON',
-                                    output_format_set: str | dict = None) -> list | str:
+                                    report_spec: str | dict = None) -> list | str:
         """ Get the list of data structure metadata elements with a matching name to the search string filter.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties for the request.
@@ -1029,7 +1165,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: str | dict, optional, default = None
+        report_spec: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1039,11 +1175,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
 
@@ -1051,15 +1187,15 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_structures_by_name(filter, classification_names, body, start_from, page_size,
-                                                    output_format, output_format_set))
+            self._async_get_data_structures_by_name(filter_string, classification_names, body, start_from, page_size,
+                                                    output_format, report_spec))
         return response
 
     @dynamic_catch
-    async def _async_get_data_structure_by_guid(self, guid: str, element_type: str = None,
-                                                body: dict | GetRequestBody = None,
+    async def _async_get_data_structure_by_guid(self, guid: str, element_type: Optional[str] = None,
+                                                body: Optional[dict | GetRequestBody] = None,
                                                 output_format: str = 'JSON',
-                                                output_format_set: str | dict = None) -> list | str:
+                                                report_spec: str | dict = None) -> list | str:
         """ Get the  data structure metadata elements for the specified GUID.
             Async version.
 
@@ -1073,7 +1209,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: str | dict, optional, default = None
+        report_spec: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1083,11 +1219,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -1110,14 +1246,14 @@ class DataDesigner(Client2):
 
         response = await self._async_get_guid_request(url, _type=type,
                                                       _gen_output=self._generate_data_structure_output,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
 
         return response
 
     @dynamic_catch
-    def get_data_structure_by_guid(self, guid: str, element_type: str = None, body: str = None,
-                                   output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def get_data_structure_by_guid(self, guid: str, element_type: Optional[str] = None, body: Optional[str] = None,
+                                   output_format: str = 'JSON', report_spec: str | dict = None) -> list | str:
         """ Get the data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -1130,7 +1266,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
          - one of "DICT", "MERMAID" or "JSON"
-        output_format_set: str | dict, optional, default = None
+        report_spec: str | dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -1140,11 +1276,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -1163,7 +1299,7 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_structure_by_guid(guid, element_type, body, output_format, output_format_set))
+            self._async_get_data_structure_by_guid(guid, element_type, body, output_format, report_spec))
         return response
 
     def get_data_memberships(self, data_get_fcn: callable, data_struct_guid: str) -> dict | None:
@@ -1276,33 +1412,29 @@ class DataDesigner(Client2):
             assigned_meanings_qnames.append(meaning['relatedElement']['properties']['qualifiedName'])
 
         # extract existing related data structure and data field elements
-        other_related_elements = el_struct.get("otherRelatedElements", None)
-        if other_related_elements:
-            for rel in other_related_elements:
+        part_of_data_struct = el_struct.get("partOfDataStructures", None)
+        if part_of_data_struct:
+            for rel in part_of_data_struct:
                 related_element = rel["relatedElement"]
-                type = related_element["elementHeader"]["type"]["typeName"]
                 guid = related_element["elementHeader"]["guid"]
                 qualified_name = related_element["properties"].get("qualifiedName", "") or ""
                 display_name = related_element["properties"].get("displayName", "") or ""
-                if type == "DataStructure":
-                    data_structure_guids.append(guid)
-                    data_structure_names.append(display_name)
-                    data_structure_qnames.append(qualified_name)
-
-                elif type == "DataField":
-                    parent_guids.append(guid)
-                    parent_names.append(display_name)
-                    parent_qnames.append(qualified_name)
+                data_structure_guids.append(guid)
+                data_structure_names.append(display_name)
+                data_structure_qnames.append(qualified_name)
+# Todo - check the logic here
+        # elif type == "DataField":
+        #     parent_guids.append(guid)
+        #     parent_names.append(display_name)
+        #     parent_qnames.append(qualified_name)
 
         member_of_collections = el_struct.get("memberOfCollections", {})
         for collection in member_of_collections:
-            c_type = collection["relatedElement"]["properties"].get("collectionType", "") or ""
+            type_name = collection["relatedElement"]["elementHeader"]["type"].get("typeName", "") or ""
             guid = collection["relatedElement"]["elementHeader"]["guid"]
-            name = collection["relatedElement"]["properties"].get("name", "") or ""
+            name = collection["relatedElement"]["properties"].get("displayName", "") or ""
             qualifiedName = collection['relatedElement']["properties"].get("qualifiedName", "") or ""
-            classifications = collection["relatedElement"]["elementHeader"]["classifications"]
-            for classification in classifications:
-                type_name = classification["type"]['typeName']
+            if type_name:
                 if type_name == "DataDictionary":
                     member_of_data_dicts_guids.append(guid)
                     member_of_data_dicts_names.append(name)
@@ -1312,11 +1444,12 @@ class DataDesigner(Client2):
                     member_of_data_spec_names.append(name)
                     member_of_data_spec_qnames.append(qualifiedName)
 
-        member_data_fields = el_struct.get("memberDataFields", {})
+        member_data_fields = el_struct.get("containsDataFields", {})
         for data_field in member_data_fields:
-            member_data_field_guids.append(data_field["elementHeader"]["guid"])
-            member_data_field_names.append(data_field["properties"]["displayName"])
-            member_data_field_qnames.append(data_field["properties"]["qualifiedName"])
+            rel_el = data_field.get("relatedElement",{})
+            member_data_field_guids.append(rel_el["elementHeader"]["guid"])
+            member_data_field_names.append(rel_el["properties"]["displayName"])
+            member_data_field_qnames.append(rel_el["properties"]["qualifiedName"])
 
         data_classes = el_struct.get("assignedDataClasses", {})
         for data_class in data_classes:
@@ -1345,7 +1478,7 @@ class DataDesigner(Client2):
 
             "data_structure_guids": data_structure_guids,
             "data_structure_names": data_structure_names,
-            "data_structure_qnames": data_structure_qnames,
+            "in_data_structure": data_structure_qnames,
 
             "assigned_meanings_guids": assigned_meanings_guids,
             "assigned_meanings_names": assigned_meanings_names,
@@ -1369,15 +1502,15 @@ class DataDesigner(Client2):
 
             "member_of_data_dicts_guids": member_of_data_dicts_guids,
             "member_of_data_dicts_names": member_of_data_dicts_names,
-            "member_of_data_dicts_qnames": member_of_data_dicts_qnames,
+            "in_data_dictionary": member_of_data_dicts_qnames,
 
             "member_of_data_spec_guids": member_of_data_spec_guids,
             "member_of_data_spec_names": member_of_data_spec_names,
-            "member_of_data_spec_qnames": member_of_data_spec_qnames,
+            "in_data_spec": member_of_data_spec_qnames,
 
             "member_data_field_guids": member_data_field_guids,
             "member_data_field_names": member_data_field_names,
-            "member_data_field_qnames": member_data_field_qnames,
+            "member_data_fields": member_data_field_qnames,
 
             "mermaid": mermaid,
             }
@@ -1419,11 +1552,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1531,11 +1664,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1646,11 +1779,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1719,11 +1852,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1791,11 +1924,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1864,11 +1997,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1916,7 +2049,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_link_nested_data_field(self, parent_data_field_guid: str, nested_data_field_guid: str,
-                                            body: dict | NewRelationshipRequestBody = None) -> None:
+                                            body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect a nested data field to a data field. Request body is optional. Async version.
 
@@ -1935,11 +2068,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -1974,7 +2107,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_nested_data_field(self, parent_data_field_guid: str, nested_data_field_guid: str,
-                               body: dict | NewRelationshipRequestBody = None) -> None:
+                               body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect a nested data class to a data class. Request body is optional.
 
@@ -1993,11 +2126,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2030,7 +2163,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_nested_data_field(self, parent_data_field_guid: str, nested_data_field_guid: str,
-                                              body: dict | DeleteRequestBody = None) -> None:
+                                              body: Optional[dict | DeleteRelationshipRequestBody] = None) -> None:
         """
         Detach a nested data class from a data class. Request body is optional. Async version.
 
@@ -2049,11 +2182,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2076,12 +2209,12 @@ class DataDesigner(Client2):
         url = (f"{base_path(self, self.view_server)}/data-fields/{parent_data_field_guid}"
                f"/member-data-fields/{nested_data_field_guid}/detach")
 
-        await self._async_delete_request(url, body)
+        await self._async_delete_relationship_request(url, body)
         logger.info(f"Data field {parent_data_field_guid} detached from data structure {nested_data_field_guid}.")
 
     @dynamic_catch
     def detach_nested_data_field(self, parent_data_field_guid: str, nested_data_field_guid: str,
-                                 body: dict | DeleteRequestBody = None) -> None:
+                                 body: Optional[dict | DeleteRelationshipRequestBody] = None) -> None:
         """
         Detach a nested data class from a data class. Request body is optional.
 
@@ -2100,11 +2233,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2128,7 +2261,7 @@ class DataDesigner(Client2):
             self._async_detach_nested_data_field(parent_data_field_guid, nested_data_field_guid, body))
 
     @dynamic_catch
-    async def _async_delete_data_field(self, data_field_guid: str, body: dict | DeleteRequestBody = None,
+    async def _async_delete_data_field(self, data_field_guid: str, body: Optional[dict | DeleteElementRequestBody] = None,
                                        cascade_delete: bool = False) -> None:
         """
         Delete a data class. Request body is optional. Async version.
@@ -2137,7 +2270,7 @@ class DataDesigner(Client2):
         ----------
         data_field_guid: str
             - the GUID of the data class to delete.
-        body: dict, optional
+        body: dict| DeleteElementRequestBody, optional
             - a dictionary containing additional properties.
         cascade: bool, optional
             - if True, then all child data fields will be deleted as well.
@@ -2149,11 +2282,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2162,7 +2295,7 @@ class DataDesigner(Client2):
         Full sample body:
 
        {
-          "class": "MetadataSourceRequestBody",
+          "class": "DeleteElementRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime": "{{$isoTimestamp}}",
@@ -2175,11 +2308,11 @@ class DataDesigner(Client2):
 
         url = f"{base_path(self, self.view_server)}/data-fields/{data_field_guid}/delete"
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete)
         logger.info(f"Data Field {data_field_guid} deleted.")
 
     @dynamic_catch
-    def delete_data_field(self, data_field_guid: str, body: dict | DeleteRequestBody = None,
+    def delete_data_field(self, data_field_guid: str, body: Optional[dict | DeleteElementRequestBody] = None,
                           cascade_delete: bool = False) -> None:
         """
         Delete a data class. Request body is optional.
@@ -2188,7 +2321,7 @@ class DataDesigner(Client2):
         ----------
         data_field_guid: str
             - the GUID of the data class the data class to delete.
-        body: dict, optional
+        body: dict | DeleteElementRequestBody, optional
             - a dictionary containing additional properties.
         cascade: bool, optional
             - if True, then all child data fields will be deleted as well.
@@ -2200,11 +2333,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2228,7 +2361,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_find_all_data_fields(self, output_format: str = 'JSON',
-                                          output_format_set: str | dict = None) -> list | str:
+                                          report_spec: str | dict = None) -> list | str:
         """Returns a list of all known data fields. Async version.
 
         Parameters
@@ -2239,7 +2372,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2249,20 +2382,20 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         return self.find_data_fields(search_string="*", output_format=output_format,
-                                     output_format_set=output_format_set)
+                                     report_spec=report_spec)
 
     @dynamic_catch
-    def find_all_data_fields(self, output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def find_all_data_fields(self, output_format: str = 'JSON', report_spec: str | dict = None) -> list | str:
         """ Returns a list of all known data fields.
 
         Parameters
@@ -2273,7 +2406,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2283,46 +2416,99 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_all_data_fields(output_format, output_format_set))
+            self._async_find_all_data_fields(output_format, report_spec))
         return response
 
     @dynamic_catch
-    async def _async_find_data_fields(self, search_string: str, start_from: int = 0, page_size: int = 0,
-                                      starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                      body: dict | SearchStringRequestBody = None,
-                                      output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    async def _async_find_data_fields(self, search_string: str,
+                                      starts_with: bool = True, ends_with: bool = False,
+                                      ignore_case: bool = False,
+                                      anchor_domain: Optional[str] = None,
+                                      metadata_element_type: Optional[str] = None,
+                                      metadata_element_subtypes: Optional[list[str]] = None,
+                                      skip_relationships: Optional[list[str]] = None,
+                                      include_only_relationships: Optional[list[str]] = None,
+                                      skip_classified_elements: Optional[list[str]] = None,
+                                      include_only_classified_elements: Optional[list[str]] = None,
+                                      graph_query_depth: int = 3,
+                                      governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                                      effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                                      limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                                      sequencing_property: Optional[str] = None,
+                                      output_format: str = "JSON", report_spec: str | dict = None,
+                                      start_from: int = 0, page_size: int = 100,
+                                      property_names: Optional[list[str]] = None,
+                                      body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
         """ Find the list of data class elements that contain the search string.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
-            - The desired output columns/field options.
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
 
         Returns
         -------
@@ -2331,48 +2517,115 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         url = f"{base_path(self, self.view_server)}/data-fields/by-search-string"
 
-        return await self._async_find_request(url, "DataField", self._generate_data_field_output,
-                                              search_string, start_from=start_from, page_size=page_size,
+        return await self._async_find_request(url, "DataField", self._generate_data_field_output, search_string,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
-                                              body=body, output_format=output_format,
-                                              output_format_set=output_format_set)
+                                              anchor_domain=anchor_domain,
+                                              metadata_element_type=metadata_element_type,
+                                              metadata_element_subtypes=metadata_element_subtypes,
+                                              skip_relationships=skip_relationships,
+                                              include_only_relationships=include_only_relationships,
+                                              skip_classified_elements=skip_classified_elements,
+                                              include_only_classified_elements=include_only_classified_elements,
+                                              graph_query_depth=graph_query_depth,
+                                              governance_zone_filter=governance_zone_filter,
+                                              as_of_time=as_of_time, effective_time=effective_time,
+                                              relationship_page_size=relationship_page_size,
+                                              limit_results_by_status=limit_results_by_status,
+                                              sequencing_order=sequencing_order,
+                                              sequencing_property=sequencing_property,
+                                              output_format=output_format, report_spec=report_spec,
+                                              start_from=start_from, page_size=page_size,
+                                              property_names=property_names, body=body)
 
     @dynamic_catch
-    def find_data_fields(self, search_string: str, start_from: int = 0, page_size: int = max_paging_size,
-                         starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                         body: dict | SearchStringRequestBody = None,
-                         output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def find_data_fields(self, search_string: str,
+                         starts_with: bool = True, ends_with: bool = False,
+                         ignore_case: bool = False,
+                         anchor_domain: Optional[str] = None,
+                         metadata_element_type: Optional[str] = None,
+                         metadata_element_subtypes: Optional[list[str]] = None,
+                         skip_relationships: Optional[list[str]] = None,
+                         include_only_relationships: Optional[list[str]] = None,
+                         skip_classified_elements: Optional[list[str]] = None,
+                         include_only_classified_elements: Optional[list[str]] = None,
+                         graph_query_depth: int = 3,
+                         governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                         effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                         limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                         sequencing_property: Optional[str] = None,
+                         output_format: str = "JSON", report_spec: str | dict = None,
+                         start_from: int = 0, page_size: int = 100,
+                         property_names: Optional[list[str]] = None,
+                         body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
         """ Retrieve the list of data fields elements that contain the search string filter.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
-            - The desired output columns/field options.
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
 
         Returns
         -------
@@ -2381,11 +2634,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
 
@@ -2393,22 +2646,39 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_data_fields(search_string, start_from, page_size, starts_with, ends_with, ignore_case,
-                                         body, output_format, output_format_set))
+            self._async_find_data_fields(search_string,
+                                         starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
+                                         anchor_domain=anchor_domain,
+                                         metadata_element_type=metadata_element_type,
+                                         metadata_element_subtypes=metadata_element_subtypes,
+                                         skip_relationships=skip_relationships,
+                                         include_only_relationships=include_only_relationships,
+                                         skip_classified_elements=skip_classified_elements,
+                                         include_only_classified_elements=include_only_classified_elements,
+                                         graph_query_depth=graph_query_depth,
+                                         governance_zone_filter=governance_zone_filter,
+                                         as_of_time=as_of_time, effective_time=effective_time,
+                                         relationship_page_size=relationship_page_size,
+                                         limit_results_by_status=limit_results_by_status,
+                                         sequencing_order=sequencing_order,
+                                         sequencing_property=sequencing_property,
+                                         output_format=output_format, report_spec=report_spec,
+                                         start_from=start_from, page_size=page_size,
+                                         property_names=property_names, body=body))
         return response
 
     @dynamic_catch
-    async def _async_get_data_fields_by_name(self, filter_string: str, classification_names: list[str] = None,
+    async def _async_get_data_fields_by_name(self, filter_string: str, classification_names: Optional[list[str]] = None,
                                              body: dict = None | FilterRequestBody, start_from: int = 0,
                                              page_size: int = 0,
                                              output_format: str = 'JSON',
-                                             output_format_set: str | dict = None) -> list | str:
+                                             report_spec: str | dict = None) -> list | str:
         """ Get the list of data class metadata elements with a matching name to the search string filter.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties to use in the request.
@@ -2418,7 +2688,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2428,11 +2698,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
         Notes
         -----
@@ -2457,21 +2727,21 @@ class DataDesigner(Client2):
                                                       filter_string=filter_string,
                                                       classification_names=classification_names,
                                                       start_from=start_from, page_size=page_size,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
 
         return response
 
     @dynamic_catch
-    def get_data_fields_by_name(self, filter_string: str, classification_names: list[str] = None, body: dict = None,
+    def get_data_fields_by_name(self, filter_string: str, classification_names: Optional[list[str]] = None, body: dict = None,
                                 start_from: int = 0,
                                 page_size: int = max_paging_size, output_format: str = 'JSON',
-                                output_format_set: str | dict = None) -> list | str:
+                                report_spec: str | dict = None) -> list | str:
         """ Get the list of data class elements with a matching name to the search string filter.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties to use in the request.
@@ -2481,7 +2751,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2491,11 +2761,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -2517,15 +2787,15 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_fields_by_name(filter, classification_names, body, start_from, page_size,
-                                                output_format, output_format_set))
+            self._async_get_data_fields_by_name(filter_string, classification_names, body, start_from, page_size,
+                                                output_format, report_spec))
         return response
 
     @dynamic_catch
-    async def _async_get_data_field_by_guid(self, guid: str, element_type: str = None,
-                                            body: dict | GetRequestBody = None,
+    async def _async_get_data_field_by_guid(self, guid: str, element_type: Optional[str] = None,
+                                            body: Optional[dict | GetRequestBody] = None,
                                             output_format: str = 'JSON',
-                                            output_format_set: str | dict = None) -> list | str:
+                                            report_spec: str | dict = None) -> list | str:
         """ Get the  data class elements for the specified GUID.
             Async version.
 
@@ -2537,7 +2807,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2547,11 +2817,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
 
@@ -2573,14 +2843,14 @@ class DataDesigner(Client2):
         type = element_type if element_type else "DataField"
         response = await self._async_get_guid_request(url, _type=type,
                                                       _gen_output=self._generate_data_field_output,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
 
         return response
 
     @dynamic_catch
-    def get_data_field_by_guid(self, guid: str, element_type: str = None, body: str | GetRequestBody = None,
-                               output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+    def get_data_field_by_guid(self, guid: str, element_type: Optional[str] = None, body: str | GetRequestBody = None,
+                               output_format: str = 'JSON', report_spec: str | dict = None) -> list | str:
         """ Get the  data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -2591,7 +2861,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -2601,11 +2871,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -2624,7 +2894,7 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(self._async_get_data_field_by_guid(guid, element_type,
-                                                                              body, output_format, output_format_set))
+                                                                              body, output_format, report_spec))
         return response
 
     ###
@@ -2650,11 +2920,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2772,11 +3042,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2896,11 +3166,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -2968,11 +3238,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3040,11 +3310,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3110,11 +3380,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3163,7 +3433,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_link_nested_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                            body: dict | NewRelationshipRequestBody = None) -> None:
+                                            body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect two data classes to show that one is used by the other when it is validating (typically a complex
         data item). Request body is optional. Async version.
@@ -3183,11 +3453,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3214,7 +3484,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_nested_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                               body: dict | NewRelationshipRequestBody = None) -> None:
+                               body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect a nested data class to a data class. Request body is optional.
 
@@ -3233,11 +3503,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3261,7 +3531,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_nested_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                              body: dict | DeleteRequestBody = None,
+                                              body: Optional[dict | DeleteRelationshipRequestBody] = None,
                                               cascade_delete: bool = False) -> None:
         """
         Detach two nested data classes from each other. Request body is optional. Async version.
@@ -3281,11 +3551,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3308,12 +3578,12 @@ class DataDesigner(Client2):
         url = (f"{base_path(self, self.view_server)}/data-classes/{parent_data_class_guid}"
                f"/nested-data-classes/{child_data_class_guid}/detach")
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Data Class {child_data_class_guid} detached from data structure {parent_data_class_guid}.")
 
     @dynamic_catch
     def detach_nested_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                 body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+                                 body: Optional[dict | DeleteRelationshipRequestBody] = None, cascade_delete: bool = False) -> None:
         """
         Detach two nested data classes from each other. Request body is optional.
 
@@ -3332,11 +3602,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3361,7 +3631,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_link_specialized_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                                 body: dict | NewRelationshipRequestBody = None, ) -> None:
+                                                 body: Optional[dict | NewRelationshipRequestBody] = None, ) -> None:
         """
         Connect two data classes to show that one provides a more specialist evaluation. Request body is optional.
         Async version.
@@ -3381,11 +3651,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3412,7 +3682,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_specialized_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                    body: dict | NewRelationshipRequestBody = None) -> None:
+                                    body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect two data classes to show that one provides a more specialist evaluation. Request body is optional.
 
@@ -3431,11 +3701,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3460,7 +3730,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_specialized_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                                   body: dict | DeleteRequestBody = None,
+                                                   body: Optional[dict | DeleteRelationshipRequestBody] = None,
                                                    cascade_delete: bool = False) -> None:
         """
         Detach two data classes from each other. Request body is optional. Async version.
@@ -3480,11 +3750,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3507,12 +3777,12 @@ class DataDesigner(Client2):
         url = (f"{base_path(self, self.view_server)}/data-classes/{parent_data_class_guid}"
                f"/specialized-data-classes/{child_data_class_guid}/detach")
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Data field {child_data_class_guid} detached from data structure {parent_data_class_guid}.")
 
     @dynamic_catch
     def detach_specialized_data_class(self, parent_data_class_guid: str, child_data_class_guid: str,
-                                      body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+                                      body: Optional[dict | DeleteRelationshipRequestBody] = None, cascade_delete: bool = False) -> None:
         """
         Detach two data classes from each other. Request body is optional.
 
@@ -3531,11 +3801,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3560,7 +3830,7 @@ class DataDesigner(Client2):
                                                       cascade_delete))
 
     @dynamic_catch
-    async def _async_delete_data_class(self, data_class_guid: str, body: dict | DeleteRequestBody = None,
+    async def _async_delete_data_class(self, data_class_guid: str, body: Optional[dict | DeleteElementRequestBody] = None,
                                        cascade_delete: bool = False) -> None:
         """
         Delete a data class. Request body is optional. Async version.
@@ -3581,11 +3851,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3607,13 +3877,13 @@ class DataDesigner(Client2):
 
         url = f"{base_path(self, self.view_server)}/data-classes/{data_class_guid}/delete"
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_element_request(url, body, cascade_delete)
         logger.info(f"Data structure {data_class_guid} deleted.")
 
     @dynamic_catch
     def delete_data_class(self,
                           data_class_guid: str,
-                          body: dict | DeleteRequestBody = None,
+                          body: Optional[dict | DeleteElementRequestBody] = None,
                           cascade_delete: bool = False) -> None:
         """
         Delete a data class. Request body is optional.
@@ -3634,11 +3904,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -3663,7 +3933,7 @@ class DataDesigner(Client2):
     @dynamic_catch
     async def _async_find_all_data_classes(self,
                                            output_format: str = 'JSON',
-                                           output_format_set: str | dict = None) -> list | str:
+                                           report_spec: str | dict = None) -> list | str:
         """ Returns a list of all data classes. Async version.
 
         Parameters
@@ -3674,7 +3944,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -3685,11 +3955,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
@@ -3697,11 +3967,11 @@ class DataDesigner(Client2):
         url = f"{base_path(self, self.view_server)}/data-classes/by-search-string"
 
         return self.find_data_classes(search_string="*", output_format=output_format,
-                                      output_format_set=output_format_set)
+                                      report_spec=report_spec)
 
     @dynamic_catch
     def find_all_data_classes(self,
-                              output_format: str = 'JSON', output_format_set: str | dict = None) -> list | str:
+                              output_format: str = 'JSON', report_spec: str | dict = None) -> list | str:
         """ Returns a list of all data classes.
 
         Parameters
@@ -3712,7 +3982,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -3722,47 +3992,99 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_all_data_classes(output_format, output_format_set))
+            self._async_find_all_data_classes(output_format, report_spec))
         return response
 
     @dynamic_catch
-    async def _async_find_data_classes(self, search_string: str, start_from: int = 0, page_size: int = max_paging_size,
-                                       starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                                       output_format: str = 'JSON', output_format_set: str | dict = None,
-                                       body: dict | SearchStringRequestBody = None) -> list | str:
+    async def _async_find_data_classes(self, search_string: str,
+                                       starts_with: bool = True, ends_with: bool = False,
+                                       ignore_case: bool = False,
+                                       anchor_domain: Optional[str] = None,
+                                       metadata_element_type: Optional[str] = None,
+                                       metadata_element_subtypes: Optional[list[str]] = None,
+                                       skip_relationships: Optional[list[str]] = None,
+                                       include_only_relationships: Optional[list[str]] = None,
+                                       skip_classified_elements: Optional[list[str]] = None,
+                                       include_only_classified_elements: Optional[list[str]] = None,
+                                       graph_query_depth: int = 3,
+                                       governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                                       effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                                       limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                                       sequencing_property: Optional[str] = None,
+                                       output_format: str = "JSON", report_spec: str | dict = None,
+                                       start_from: int = 0, page_size: int = 100,
+                                       property_names: Optional[list[str]] = None,
+                                       body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
         """ Find the list of data class elements that contain the search string.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
-            - The desired output columns/field options.
-
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
 
         Returns
         -------
@@ -3771,48 +4093,115 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         """
 
         url = f"{base_path(self, self.view_server)}/data-classes/by-search-string"
-        return await self._async_find_request(url, "DataClass", self._generate_data_class_output,
-                                              search_string, start_from=start_from, page_size=page_size,
+
+        return await self._async_find_request(url, "DataClass", self._generate_data_class_output, search_string,
                                               starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
-                                              body=body, output_format=output_format,
-                                              output_format_set=output_format_set)
+                                              anchor_domain=anchor_domain,
+                                              metadata_element_type=metadata_element_type,
+                                              metadata_element_subtypes=metadata_element_subtypes,
+                                              skip_relationships=skip_relationships,
+                                              include_only_relationships=include_only_relationships,
+                                              skip_classified_elements=skip_classified_elements,
+                                              include_only_classified_elements=include_only_classified_elements,
+                                              graph_query_depth=graph_query_depth,
+                                              governance_zone_filter=governance_zone_filter,
+                                              as_of_time=as_of_time, effective_time=effective_time,
+                                              relationship_page_size=relationship_page_size,
+                                              limit_results_by_status=limit_results_by_status,
+                                              sequencing_order=sequencing_order,
+                                              sequencing_property=sequencing_property,
+                                              output_format=output_format, report_spec=report_spec,
+                                              start_from=start_from, page_size=page_size,
+                                              property_names=property_names, body=body)
 
     @dynamic_catch
-    def find_data_classes(self, search_string: str, start_from: int = 0, page_size: int = max_paging_size,
-                          starts_with: bool = True, ends_with: bool = False, ignore_case: bool = True,
-                          output_format: str = 'JSON', output_format_set: str | dict = None,
-                          body: dict | SearchStringRequestBody = None) -> list | str:
-        """ Retrieve the list of data fields elements that contain the search string filter.
+    def find_data_classes(self, search_string: str,
+                          starts_with: bool = True, ends_with: bool = False,
+                          ignore_case: bool = False,
+                          anchor_domain: Optional[str] = None,
+                          metadata_element_type: Optional[str] = None,
+                          metadata_element_subtypes: Optional[list[str]] = None,
+                          skip_relationships: Optional[list[str]] = None,
+                          include_only_relationships: Optional[list[str]] = None,
+                          skip_classified_elements: Optional[list[str]] = None,
+                          include_only_classified_elements: Optional[list[str]] = None,
+                          graph_query_depth: int = 3,
+                          governance_zone_filter: Optional[list[str]] = None, as_of_time: Optional[str] = None,
+                          effective_time: Optional[str] = None, relationship_page_size: int = 0,
+                          limit_results_by_status: Optional[list[str]] = None, sequencing_order: Optional[str] = None,
+                          sequencing_property: Optional[str] = None,
+                          output_format: str = "JSON", report_spec: str | dict = None,
+                          start_from: int = 0, page_size: int = 100,
+                          property_names: Optional[list[str]] = None,
+                          body: Optional[dict | SearchStringRequestBody] = None) -> list | str:
+        """ Retrieve the list of data classes elements that contain the search string filter.
 
         Parameters
         ----------
-        filter: str
+        search_string: str
             - search string to filter on.
-        start_from: int, default = 0
-            - index of the list to start from (0 for start).
-        page_size
-            - maximum number of elements to return.
-        starts_with: bool, default = True
-            - if True, the search string filters from the beginning of the string.
-        ends_with: bool, default = False
-            - if True, the search string filters from the end of the string.
-        ignore_case: bool, default = True
-            - If True, the case of the search string is ignored.
-        output_format: str, default = "DICT"
-            - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
-            - The desired output columns/field options.
-
+        starts_with : bool, [default=True], optional
+            Starts with the supplied string.
+        ends_with : bool, [default=False], optional
+            Ends with the supplied string
+        ignore_case : bool, [default=False], optional
+            Ignore case when searching
+        anchor_domain: str, optional
+            The anchor domain to search in.
+        metadata_element_type: str, optional
+            The type of metadata element to search for.
+        metadata_element_subtypes: list[str], optional
+            The subtypes of metadata element to search for.
+        skip_relationships: list[str], optional
+            The types of relationships to skip.
+        include_only_relationships: list[str], optional
+            The types of relationships to include.
+        skip_classified_elements: list[str], optional
+            The types of classified elements to skip.
+        include_only_classified_elements: list[str], optional
+            The types of classified elements to include.
+        graph_query_depth: int, [default=3], optional
+            The depth of the graph query.
+        governance_zone_filter: list[str], optional
+            The governance zones to search in.
+        as_of_time: str, optional
+            The time to search as of.
+        effective_time: str, optional
+            The effective time to search at.
+        relationship_page_size: int, [default=0], optional
+            The page size for relationships.
+        limit_results_by_status: list[str], optional
+            The statuses to limit results by.
+        sequencing_order: str, optional
+            The order to sequence results by.
+        sequencing_property: str, optional
+            The property to sequence results by.
+        output_format: str, default = 'JSON'
+            Type of output to produce:
+                JSON - output standard json
+                MD - output standard markdown with no preamble
+                FORM - output markdown with a preamble for a form
+                REPORT - output markdown with a preamble for a report
+        report_spec: str | dict, optional
+            The report specification to use.
+        start_from: int, [default=0], optional
+            The page number to start from.
+        page_size: int, [default=100], optional
+            The number of items to return in a single page.
+        property_names: list[str], optional
+            The names of properties to search for.
+        body: dict, optional, default = None
+            - additional optional specifications for the search.
 
         Returns
         -------
@@ -3821,11 +4210,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
 
@@ -3833,22 +4222,39 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_data_classes(search_string, start_from, page_size, starts_with, ends_with, ignore_case,
-                                          output_format, output_format_set, body))
+            self._async_find_data_classes(search_string,
+                                          starts_with=starts_with, ends_with=ends_with, ignore_case=ignore_case,
+                                          anchor_domain=anchor_domain,
+                                          metadata_element_type=metadata_element_type,
+                                          metadata_element_subtypes=metadata_element_subtypes,
+                                          skip_relationships=skip_relationships,
+                                          include_only_relationships=include_only_relationships,
+                                          skip_classified_elements=skip_classified_elements,
+                                          include_only_classified_elements=include_only_classified_elements,
+                                          graph_query_depth=graph_query_depth,
+                                          governance_zone_filter=governance_zone_filter,
+                                          as_of_time=as_of_time, effective_time=effective_time,
+                                          relationship_page_size=relationship_page_size,
+                                          limit_results_by_status=limit_results_by_status,
+                                          sequencing_order=sequencing_order,
+                                          sequencing_property=sequencing_property,
+                                          output_format=output_format, report_spec=report_spec,
+                                          start_from=start_from, page_size=page_size,
+                                          property_names=property_names, body=body))
         return response
 
     @dynamic_catch
     async def _async_get_data_classes_by_name(self, filter_string: str, classification_names: list[str],
-                                              body: dict | FilterRequestBody = None, start_from: int = 0,
+                                              body: Optional[dict | FilterRequestBody] = None, start_from: int = 0,
                                               page_size: int = 0,
                                               output_format: str = 'JSON',
-                                              output_format_set: str | dict = None) -> list | str:
+                                              report_spec: str | dict = None) -> list | str:
         """ Get the list of data class metadata elements with a matching name to the search string filter.
             Async version.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties to use in the request.
@@ -3858,7 +4264,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -3868,11 +4274,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
         Notes
         -----
@@ -3897,21 +4303,21 @@ class DataDesigner(Client2):
                                                       filter_string=filter_string,
                                                       classification_names=classification_names,
                                                       start_from=start_from, page_size=page_size,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
 
         return response
 
     @dynamic_catch
-    def get_data_classes_by_name(self, filter_string: str, classification_names: list[str] = None,
-                                 body: dict | FilterRequestBody = None, start_from: int = 0,
+    def get_data_classes_by_name(self, filter_string: str, classification_names: Optional[list[str]] = None,
+                                 body: Optional[dict | FilterRequestBody] = None, start_from: int = 0,
                                  page_size: int = max_paging_size, output_format: str = 'JSON',
-                                 output_format_set: str | dict = None) -> list | str:
+                                 report_spec: str | dict = None) -> list | str:
         """ Get the list of data class elements with a matching name to the search string filter.
 
         Parameters
         ----------
-        filter: str
+        filter_string : str
             - search string to filter on.
         body: dict, optional
             - a dictionary containing additional properties to use in the request.
@@ -3921,7 +4327,7 @@ class DataDesigner(Client2):
             - maximum number of elements to return.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
 
@@ -3932,11 +4338,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -3958,15 +4364,15 @@ class DataDesigner(Client2):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_get_data_classes_by_name(filter_string, classification_names, body,
-                                                 start_from, page_size, output_format, output_format_set
+                                                 start_from, page_size, output_format, report_spec
                                                  ))
         return response
 
     @dynamic_catch
-    async def _async_get_data_class_by_guid(self, guid: str, element_type: str = None,
-                                            body: dict | GetRequestBody = None,
+    async def _async_get_data_class_by_guid(self, guid: str, element_type: Optional[str] = None,
+                                            body: Optional[dict | GetRequestBody] = None,
                                             output_format: str = 'JSON',
-                                            output_format_set: str | dict = None) -> list | str:
+                                            report_spec: str | dict = None) -> list | str:
         """ Get the  data class elements for the specified GUID.
             Async version.
 
@@ -3978,7 +4384,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -3988,11 +4394,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -4014,14 +4420,14 @@ class DataDesigner(Client2):
 
         response = await self._async_get_guid_request(url, _type=type,
                                                       _gen_output=self._generate_data_class_output,
-                                                      output_format=output_format, output_format_set=output_format_set,
+                                                      output_format=output_format, report_spec=report_spec,
                                                       body=body)
         return response
 
     @dynamic_catch
-    def get_data_class_by_guid(self, guid: str, element_type: str = None, body: dict | FilterRequestBody = None,
+    def get_data_class_by_guid(self, guid: str, element_type: Optional[str] = None, body: Optional[dict | FilterRequestBody] = None,
                                output_format: str = 'JSON',
-                               output_format_set: str | dict = None) -> list | str:
+                               report_spec: str | dict = None) -> list | str:
         """ Get the  data structure metadata element with the specified unique identifier..
 
         Parameters
@@ -4032,7 +4438,7 @@ class DataDesigner(Client2):
             - optional request body.
         output_format: str, default = "DICT"
             - output format of the data structure. Possible values: "DICT", "JSON", "MERMAID".
-        output_format_set: str|dict, optional, default = None
+        report_spec: str|dict, optional, default = None
             - The desired output columns/field options.
 
         Returns
@@ -4042,11 +4448,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Notes
@@ -4065,7 +4471,7 @@ class DataDesigner(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_data_class_by_guid(guid, element_type, body, output_format, output_format_set))
+            self._async_get_data_class_by_guid(guid, element_type, body, output_format, report_spec))
         return response
 
     ###
@@ -4075,7 +4481,7 @@ class DataDesigner(Client2):
     #
     @dynamic_catch
     async def _async_link_data_class_definition(self, data_definition_guid: str, data_class_guid: str,
-                                                body: dict | NewRelationshipRequestBody = None) -> None:
+                                                body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
          Connect an element that is part of a data design to a data class to show that the data class should be used as
          the specification for the data values when interpreting the data definition. Request body is optional.
@@ -4095,11 +4501,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4126,7 +4532,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_data_class_definition(self, data_definition_guid: str, data_class_guid: str,
-                                   body: dict | NewRelationshipRequestBody = None) -> None:
+                                   body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
          Connect an element that is part of a data design to a data class to show that the data class should be used as
          the specification for the data values when interpreting the data definition. Request body is optional.
@@ -4146,11 +4552,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4174,7 +4580,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_data_class_definition(self, data_definition_guid: str, data_class_guid: str,
-                                                  body: dict | DeleteRequestBody = None,
+                                                  body: Optional[dict | DeleteRelationshipRequestBody] = None,
                                                   cascade_delete: bool = False) -> None:
         """
         Detach a data definition from a data class. Request body is optional. Async version.
@@ -4194,11 +4600,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4221,12 +4627,12 @@ class DataDesigner(Client2):
         url = (f"{base_path(self, self.view_server)}/data-definitions/{data_definition_guid}"
                f"/data-class-definition/{data_class_guid}/detach")
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Data class {data_class_guid} detached from data definition {data_definition_guid}.")
 
     @dynamic_catch
     def detach_data_class_definition(self, data_definition_guid: str, data_class_guid: str,
-                                     body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+                                     body: Optional[dict | DeleteRelationshipRequestBody] = None, cascade_delete: bool = False) -> None:
         """
         Detach a data definition from a data class. Request body is optional.
 
@@ -4245,11 +4651,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4275,7 +4681,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_link_semantic_definition(self, data_definition_guid: str, glossary_term_guid: str,
-                                              body: dict | NewRelationshipRequestBody = None) -> None:
+                                              body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect an element that is part of a data design to a glossary term to show that the term should be used as
         the semantic definition for the data values when interpreting the data definition. Request body is optional.
@@ -4296,11 +4702,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4327,7 +4733,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     def link_semantic_definition(self, data_definition_guid: str, glossary_term_guid: str,
-                                 body: dict | NewRelationshipRequestBody = None) -> None:
+                                 body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
         Connect an element that is part of a data design to a glossary term to show that the term should be used as
         the semantic definition for the data values when interpreting the data definition. Request body is optional.
@@ -4348,11 +4754,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4376,7 +4782,7 @@ class DataDesigner(Client2):
 
     @dynamic_catch
     async def _async_detach_semantic_definition(self, data_definition_guid: str, glossary_term_guid: str,
-                                                body: dict | DeleteRequestBody = None,
+                                                body: Optional[dict | DeleteRelationshipRequestBody] = None,
                                                 cascade_delete: bool = False) -> None:
         """
         Detach a data definition from a glossary term. Request body is optional. Async version.
@@ -4396,11 +4802,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4422,12 +4828,12 @@ class DataDesigner(Client2):
 
         url = (f"{base_path(self, self.view_server)}/data-definitions/{data_definition_guid}"
                f"/semantic-definition/{glossary_term_guid}/detach")
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Data definition {data_definition_guid} detached from term {glossary_term_guid}.")
 
     @dynamic_catch
     def detach_semantic_definition(self, data_definition_guid: str, glossary_term_guid: str,
-                                   body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+                                   body: Optional[dict | DeleteRelationshipRequestBody] = None, cascade_delete: bool = False) -> None:
         """
         Detach a data definition from a glossary term. Request body is optional.
 
@@ -4446,11 +4852,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4477,7 +4883,7 @@ class DataDesigner(Client2):
 
 
     async def _async_link_certification_type_to_data_structure(self, certification_type_guid: str,
-                                                               data_structure_guid: str, body: dict | NewRelationshipRequestBody = None) -> None:
+                                                               data_structure_guid: str, body: Optional[dict | NewRelationshipRequestBody] = None) -> None:
         """
          Connect a certification type to a data structure to guide the survey action service (that checks the data
          quality of a data resource as part of certifying it with the supplied certification type) to the definition
@@ -4501,11 +4907,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4554,11 +4960,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4582,7 +4988,7 @@ class DataDesigner(Client2):
             self._async_link_certification_type_to_data_structure(certification_type_guid, data_structure_guid, body))
 
     async def _async_detach_certification_type_from_data_structure(self, certification_type_guid: str,
-                                                                   data_structure_guid: str, body: dict | DeleteRequestBody = None, cascade_delete: bool = False) -> None:
+                                                                   data_structure_guid: str, body: Optional[dict | DeleteRelationshipRequestBody] = None, cascade_delete: bool = False) -> None:
         """
         Detach a data structure from a certification type. Request body is optional. Async version.
 
@@ -4601,11 +5007,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4627,12 +5033,12 @@ class DataDesigner(Client2):
         url = (f"{base_path(self, self.view_server)}/certification-stypes/{certification_type_guid}"
                f"/data-structure-definition/{data_structure_guid}/detach")
 
-        await self._async_delete_request(url, body, cascade_delete)
+        await self._async_delete_relationship_request(url, body, cascade_delete)
         logger.info(f"Certification type {certification_type_guid} detached from data structure {data_structure_guid}.")
 
 
     def detach_certification_type_from_data_structure(self, certification_type_guid: str, data_structure_guid: str,
-                                                      body: dict | DeleteRequestBody= None, cascade_delete: bool = False) -> None:
+                                                      body: dict | DeleteRelationshipRequestBody= None, cascade_delete: bool = False) -> None:
         """
         Detach a data structure from a certification type. Request body is optional.
 
@@ -4651,11 +5057,11 @@ class DataDesigner(Client2):
 
         Raises
         ------
-        InvalidParameterException
+        PyegeriaInvalidParameterException
             one of the parameters is null or invalid or
-        PropertyServerException
+        PyegeriaAPIException
             There is a problem adding the element properties to the metadata repository or
-        UserNotAuthorizedException
+        PyegeriaUnauthorizedException
             the requesting user is not authorized to issue this request.
 
         Note
@@ -4682,120 +5088,163 @@ class DataDesigner(Client2):
 
 
 
-    def _extract_data_structure_properties(self, element: dict) -> dict:
-        """
-        Extract common properties from a data structure element.
-
-        Args:
-            element (dict): The data structure element
-
-        Returns:
-            dict: Dictionary of extracted properties
-        """
-        props = _extract_referenceable_properties(element)
-
-        props['properties'] = element.get('properties', {})
-
-        props['namespace'] = props['properties'].get("namespace", "") or ""
-
-        classification_names = []
-        for c in props['classifications']:
-            classification_names.append(c.get("classificationName", None))
-        props['classifications'] = classification_names
-
-        # Now lets get the related elements
-        associated_elements = self.get_data_rel_elements_dict(element)
-        props['data_specs'] = associated_elements.get("member_of_data_spec_qnames", [])
-
-        # data_structures = associated_elements.get("member_of_data_struct_qnames", [])
-        props['assigned_meanings'] = associated_elements.get("assigned_meanings_qnames", [])
-        props['parent_names'] = associated_elements.get("parent_qnames", [])
-        props['member_data_fields'] = associated_elements.get("member_data_field_qnames", [])
-
-        props['mermaid'] = element.get('mermaidGraph', "") or ""
-
-        return props
-
-    def _extract_data_class_properties(self, element: dict) -> dict:
-        """
-        Extract common properties from a data class element.
-
-        Args:
-            element (dict): The data class element
-
-        Returns:
-            dict: Dictionary of extracted properties
-        """
-        props = _extract_referenceable_properties(element)
-        properties = element.get('properties', {})
-        props['properties'] = properties
-
-        classification_names = []
-        for c in props['classifications']:
-            classification_names.append(c.get("classificationName", None))
-        props['classifications'] = classification_names
-
-        props['namespace'] = props['properties'].get("namespace", "") or ""
-
-        props['data_type'] = properties.get('dataType', "") or ""
-        props['match_property_names'] = properties.get('matchPropertyNames', []) or []
-        props['match_threshold'] = properties.get('matchThreshold', 0)
-        props['allow_duplicate_values'] = properties.get('allowDuplicateValues', False)
-        props['is_case_sensitive'] = properties.get('isCaseSensitive', False)
-        props['is_nullable'] = properties.get('isNullable', False)
-
-        # Now lets get the related elements
-        associated_elements = self.get_data_rel_elements_dict(element)
-        props['data_dictionaries'] = associated_elements.get("member_of_data_dicts_qnames", [])
-        props['assigned_meanings'] = associated_elements.get("assigned_meanings_qnames", [])
-        props['parent_names'] = associated_elements.get("parent_qnames", [])
-        props['nested_data_classes'] = associated_elements.get("nested_data_class_qnames", [])
-        props['specialized_data_classes'] = associated_elements.get("specialized_data_class_qnames", [])
-        props['mermaid'] = element.get('mermaidGraph', "") or ""
-
-        return props
-
-    def _extract_data_field_properties(self, element: dict) -> dict:
-        """
-        Extract common properties from a data field element.
-
-        Args:
-            element (dict): The data field element
-
-        Returns:
-            dict: Dictionary of extracted properties
-        """
-        props = _extract_referenceable_properties(element)
-
-        props['properties'] = element.get('properties', {})
-        props['namespace'] = props['properties'].get("namespace", "") or ""
-        properties = element.get('properties', {})
-
-        classification_names = []
-        for c in props['classifications']:
-            classification_names.append(c.get("classificationName", None))
-        props['classifications'] = classification_names
-
-        props['is_nullable'] = properties.get('isNullable', False)
-        props['data_type'] = properties.get('dataType', "") or ""
-        props['minimum_length'] = properties.get('minimumLength', 0)
-        props['length'] = properties.get('length', 0)
-        props['precision'] = properties.get('precision', 0)
-        props['ordered_values'] = properties.get('orderedValues', False)
-        props['sort_order'] = properties.get('sortOrder', "") or ""
-
-        # Now lets get the related elements
-        associated_elements = self.get_data_rel_elements_dict(element)
-        props['data_dictionaries'] = associated_elements.get("member_of_data_dicts_qnames", [])
-        props['data_structures'] = associated_elements.get("data_structure_qnames", [])
-        props['assigned_meanings'] = associated_elements.get("assigned_meanings_qnames", [])
-        props['parent_names'] = associated_elements.get("parent_qnames", [])
-        props['data_class'] = associated_elements.get("data_class_qnames", [])
-        props['mermaid'] = element.get('mermaidGraph', "") or ""
-
-        return props
-
-    def _generate_basic_structured_output(self, elements: dict, filter: str, output_format: str,
+    def _extract_data_structure_properties(self, element: dict, columns_struct: dict) -> dict:
+        """Extractor for Data Structure elements with related overlay.
+
+        Pattern:
+        - Populate common columns via populate_common_columns.
+        - Derive related properties using get_data_rel_elements_dict from the element body.
+        - Overlay values into matching columns' 'value' fields, handling formats as list or dict.
+        - Return the enriched columns_struct.
+        """
+        col_data = populate_common_columns(element, columns_struct)
+
+        try:
+            related_map = self.get_data_rel_elements_dict(element)
+        except Exception:
+            related_map = {}
+
+        if isinstance(related_map, dict) and related_map:
+            try:
+                formats = col_data.get("formats") if isinstance(col_data, dict) else None
+                if isinstance(formats, list):
+                    targets = formats
+                elif isinstance(formats, dict):
+                    inner = formats.get("formats") if isinstance(formats.get("formats"), (dict, list)) else None
+                    if isinstance(inner, list):
+                        targets = inner
+                    elif isinstance(inner, dict):
+                        targets = [inner]
+                    else:
+                        targets = [formats]
+                else:
+                    targets = []
+
+                if targets:
+                    for fmt in targets:
+                        cols = fmt.get("attributes", []) if isinstance(fmt, dict) else []
+                        for col in cols:
+                            key = col.get("key") if isinstance(col, dict) else None
+                            if key and key in related_map:
+                                col["value"] = related_map.get(key)
+                else:
+                    cols = col_data.get("attributes", []) if isinstance(col_data, dict) else []
+                    for col in cols:
+                        key = col.get("key") if isinstance(col, dict) else None
+                        if key and key in related_map:
+                            col["value"] = related_map.get(key)
+            except Exception:
+                pass
+
+        return col_data
+
+
+    def _extract_data_class_properties(self, element: dict,columns_struct: dict) -> dict:
+        """Extractor for Data Class elements with related overlay, mirroring Data Field pattern."""
+        col_data = populate_common_columns(element, columns_struct)
+
+        try:
+            related_map = self.get_data_rel_elements_dict(element)
+        except Exception:
+            related_map = {}
+
+        if isinstance(related_map, dict) and related_map:
+            try:
+                formats = col_data.get("formats") if isinstance(col_data, dict) else None
+                if isinstance(formats, list):
+                    targets = formats
+                elif isinstance(formats, dict):
+                    inner = formats.get("formats") if isinstance(formats.get("formats"), (dict, list)) else None
+                    if isinstance(inner, list):
+                        targets = inner
+                    elif isinstance(inner, dict):
+                        targets = [inner]
+                    else:
+                        targets = [formats]
+                else:
+                    targets = []
+
+                if targets:
+                    for fmt in targets:
+                        cols = fmt.get("attributes", []) if isinstance(fmt, dict) else []
+                        for col in cols:
+                            key = col.get("key") if isinstance(col, dict) else None
+                            if key and key in related_map:
+                                col["value"] = related_map.get(key)
+                else:
+                    cols = col_data.get("attributes", []) if isinstance(col_data, dict) else []
+                    for col in cols:
+                        key = col.get("key") if isinstance(col, dict) else None
+                        if key and key in related_map:
+                            col["value"] = related_map.get(key)
+            except Exception:
+                pass
+
+        return col_data
+
+    def _extract_data_field_properties(self, element: dict, columns_struct: dict) -> dict:
+        """Extractor for Data Field elements.
+        
+        Steps:
+        - Populate base/referenceable/common properties into columns_struct via populate_common_columns.
+        - Derive related properties using get_data_rel_elements_dict from the element body.
+        - For each column in columns_struct, if its 'key' matches a key from the related dict, set its 'value'.
+        - Return the enriched columns_struct.
+        """
+        # 1) Populate common columns first (header, properties, basic relationships, mermaid)
+        col_data = populate_common_columns(element, columns_struct)
+        
+        # 2) Build a map of related properties/elements from the body. The Data Designer methods
+        #    return a body that may include keys like assignedMeanings, otherRelatedElements,
+        #    memberOfCollections, memberDataFields, assignedDataClasses, nestedDataClasses, etc.
+        try:
+            related_map = self.get_data_rel_elements_dict(element)
+        except Exception:
+            related_map = {}
+        
+        if isinstance(related_map, dict) and related_map:
+            # 3) Walk the configured columns and overlay values when the key matches an entry from related_map
+            try:
+                formats = col_data.get("formats") if isinstance(col_data, dict) else None
+                if isinstance(formats, list):
+                    targets = formats
+                elif isinstance(formats, dict):
+                    # Handle dict variant. It may be a single format dict or a wrapper containing 'formats'.
+                    # Examples seen:
+                    #   { 'attributes': [...] }
+                    #   { 'types': 'ALL', 'attributes': [...] }
+                    #   { 'formats': { 'attributes': [...] } }
+                    inner = formats.get("formats") if isinstance(formats.get("formats"), dict | list) else None
+                    if isinstance(inner, list):
+                        targets = inner
+                    elif isinstance(inner, dict):
+                        targets = [inner]
+                    else:
+                        targets = [formats]
+                else:
+                    targets = []
+        
+                if targets:
+                    for fmt in targets:
+                        cols = fmt.get("attributes", []) if isinstance(fmt, dict) else []
+                        for col in cols:
+                            key = col.get("key") if isinstance(col, dict) else None
+                            if key and key in related_map:
+                                col["value"] = related_map.get(key)
+                else:
+                    # If attributes are on the top-level (non-standard), attempt to handle gracefully
+                    cols = col_data.get("attributes", []) if isinstance(col_data, dict) else []
+                    for col in cols:
+                        key = col.get("key") if isinstance(col, dict) else None
+                        if key and key in related_map:
+                            col["value"] = related_map.get(key)
+            except Exception:
+                # Do not fail rendering due to overlay issues; keep the base columns
+                pass
+        
+        return col_data
+
+    def _generate_basic_structured_output(self, elements: dict, filter_string: str, type_name: str = None ,output_format: str = 'DICT',
                                           columns_struct: dict = None) -> str | list:
         """
         Generate output in the specified format for the given elements.
@@ -4837,9 +5286,9 @@ class DataDesigner(Client2):
                                    columns_struct,
                                    )
 
-    def _generate_data_structure_output(self, elements: dict | list[dict], filter: str = None,
+    def _generate_data_structure_output(self, elements: dict | list[dict], filter_string: Optional[str] = None, type: Optional[str] = None,
                                         output_format: str = "DICT",
-                                        output_format_set: str | dict = None) -> str | list:
+                                        report_spec: str | dict = None) -> str | list:
         """
         Generate output for data structures in the specified format.
 
@@ -4852,14 +5301,14 @@ class DataDesigner(Client2):
             Formatted output as string or list of dictionaries
         """
         entity_type = "Data Structure"
-        if output_format_set is None:
-            output_format_set = select_output_format_set(entity_type, output_format)
-
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            if isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec is None:
+            report_spec = select_report_spec(entity_type, output_format)
+
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            elif isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
         else:
             output_formats = None
         logger.trace(f"Executing _generate_data_structure_output for {entity_type}: {output_formats}")
@@ -4872,8 +5321,8 @@ class DataDesigner(Client2):
                                output_formats,
                                )
 
-    def _generate_data_class_output(self, elements: dict | list[dict], filter: str = None, output_format: str = "DICT",
-                                    output_format_set: str | dict = None) -> str | list:
+    def _generate_data_class_output(self, elements: dict | list[dict], filter_string: Optional[str] = None, type: Optional[str] = None, output_format: str = "DICT",
+                                    report_spec: str | dict = None) -> str | list:
         """
         Generate output for data classes in the specified format.
 
@@ -4881,20 +5330,20 @@ class DataDesigner(Client2):
             elements: Dictionary or list of dictionaries containing data class elements
             filter: The search string used to find the elements
             output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
-            output_format_set: Optional output format set
+            report_spec: Optional output format set
                 - Option column/attribute selection and definition.
         Returns:
             Formatted output as either a string or list of dictionaries
         """
         entity_type = "Data Class"
-        if output_format_set is None:
-            output_format_set = select_output_format_set(entity_type, output_format)
-
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            if isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec is None:
+            report_spec = select_report_spec(entity_type, output_format)
+
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            if isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
         else:
             output_formats = None
         logger.trace(f"Executing _generate_data_class_output for {entity_type}: {output_formats}")
@@ -4907,8 +5356,8 @@ class DataDesigner(Client2):
                                output_formats,
                                )
 
-    def _generate_data_field_output(self, elements: dict | list[dict], filter: str = None, output_format: str = "DICT",
-                                    output_format_set: str | dict = None) -> str | list:
+    def _generate_data_field_output(self, elements: dict | list[dict], filter_string: Optional[str] = None, type: Optional[str] = None, output_format: str = "DICT",
+                                    report_spec: str | dict = None) -> str | list:
         """
         Generate output for data fields in the specified format.
 
@@ -4916,21 +5365,21 @@ class DataDesigner(Client2):
             elements: Dictionary or list of dictionaries containing data field elements
             filter: The search string used to find the elements
             output_format: The desired output format (MD, FORM, REPORT, LIST, DICT, MERMAID, HTML)
-            output_format_set: str|dict, Optional, default = None
+            report_spec: str|dict, Optional, default = None
             - Option column/attribute selection and definition.
 
         Returns:
             Formatted output as a string or list of dictionaries
         """
-        entity_type = "Data Field"
-        if output_format_set is None:
-            output_format_set = select_output_format_set(entity_type, output_format)
+        entity_type = "Data-Fields"
+        if report_spec is None:
+            report_spec = select_report_spec(entity_type, output_format)
 
-        if output_format_set:
-            if isinstance(output_format_set, str):
-                output_formats = select_output_format_set(output_format_set, output_format)
-            if isinstance(output_format_set, dict):
-                output_formats = get_output_format_type_match(output_format_set, output_format)
+        if report_spec:
+            if isinstance(report_spec, str):
+                output_formats = select_report_spec(report_spec, output_format)
+            if isinstance(report_spec, dict):
+                output_formats = get_report_spec_match(report_spec, output_format)
         else:
             output_formats = None
         logger.trace(f"Executing _generate_data_field_output for {entity_type}: {output_formats}")
@@ -4943,6 +5392,12 @@ class DataDesigner(Client2):
                                output_formats,
                                )
 
+    def _extract_additional_data_struct_properties(self, element, columns_struct):
+        return None
+    def _extract_additional_data_field_properties(self, element, columns_struct):
+        return None
+    def _extract_additional_data_class_properties(self, element, columns_struct):
+        return None
 
 if __name__ == "__main__":
     print("Data Designer")