diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
index 739d78cee76e..9382a58f55f0 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md
@@ -11,8 +11,9 @@
 
 **Breaking Changes**
 
-- Delete methods now take positional only argument as id.
+- Delete methods now take positional only argument as id
 - `update_subscription_key` and `update_api_key` are merged into one method `update_key`
+- Removed `DataFeedOptions` and moved all its properties to the `DataFeed` model
 
 - Deprecated:
   - `HttpRequestDataFeed`
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
index ce6f5ce6f029..326b046d1bfc 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
@@ -20,7 +20,7 @@ pip install azure-ai-metricsadvisor --pre
 
 ### Prerequisites
 
-* Python 2.7, or 3.5 or later is required to use this package.
+* Python 2.7, or 3.6 or later is required to use this package.
 * You need an [Azure subscription][azure_sub], and a [Metrics Advisor serivce][ma_service] to use this package.
 
 ### Authenticate the client
@@ -124,7 +124,6 @@ from azure.ai.metricsadvisor.models import (
         DataFeedSchema,
         DataFeedMetric,
         DataFeedDimension,
-        DataFeedOptions,
         DataFeedRollupSettings,
         DataFeedMissingDataPointFillSettings
     )
@@ -159,18 +158,16 @@ data_feed = client.create_data_feed(
         timestamp_column="Timestamp"
     ),
     ingestion_settings=datetime.datetime(2019, 10, 1),
-    options=DataFeedOptions(
-        data_feed_description="cost/revenue data feed",
-        rollup_settings=DataFeedRollupSettings(
-            rollup_type="AutoRollup",
-            rollup_method="Sum",
-            rollup_identification_value="__CUSTOM_SUM__"
-        ),
-        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-            fill_type="SmartFilling"
-        ),
-        access_mode="Private"
-    )
+    data_feed_description="cost/revenue data feed",
+    rollup_settings=DataFeedRollupSettings(
+        rollup_type="AutoRollup",
+        rollup_method="Sum",
+        rollup_identification_value="__CUSTOM_SUM__"
+    ),
+    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+        fill_type="SmartFilling"
+    ),
+    access_mode="Private"
 )
 
 return data_feed
@@ -463,7 +460,7 @@ hook = client.create_hook(
 
 ### Async APIs
 
-This library includes a complete async API supported on Python 3.5+. To use it, you must
+This library includes a complete async API supported on Python 3.6+. To use it, you must
 first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/).
 See
 [azure-core documentation][azure_core_docs]
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py
index 4c3a35dbcedf..fe3447cfcc7b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py
@@ -108,7 +108,13 @@ def convert_to_generated_data_feed_type(
         granularity,
         schema,
         ingestion_settings,
-        options
+        admin_emails=None,
+        data_feed_description=None,
+        missing_data_point_fill_settings=None,
+        rollup_settings=None,
+        viewer_emails=None,
+        access_mode=None,
+        action_link_template=None
 ):
     """Convert input to data feed generated model type
 
@@ -129,8 +135,19 @@ def convert_to_generated_data_feed_type(
     :type schema: ~azure.ai.metricsadvisor.models.DataFeedSchema
     :param ingestion_settings: The data feed ingestions settings
     :type ingestion_settings: ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings
-    :param options: Data feed options.
-    :type options: ~azure.ai.metricsadvisor.models.DataFeedOptions
+    :param list[str] admin_emails: Data feed administrator emails.
+    :param str data_feed_description: Data feed description.
+    :param missing_data_point_fill_settings: The fill missing point type and value.
+    :type missing_data_point_fill_settings:
+        ~azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings
+    :param rollup_settings: The rollup settings.
+    :type rollup_settings:
+        ~azure.ai.metricsadvisor.models.DataFeedRollupSettings
+    :param list[str] viewer_emails: Data feed viewer emails.
+    :param access_mode: Data feed access mode. Possible values include:
+        "Private", "Public". Default value: "Private".
+    :type access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode
+    :param str action_link_template: action link for alert.
     :rtype: Union[AzureApplicationInsightsDataFeed, AzureBlobDataFeed, AzureCosmosDBDataFeed,
         AzureDataExplorerDataFeed, AzureDataLakeStorageGen2DataFeed, AzureTableDataFeed, AzureLogAnalyticsDataFeed,
         InfluxDBDataFeed, MySqlDataFeed, PostgreSqlDataFeed, SQLServerDataFeed, MongoDBDataFeed,
@@ -168,22 +185,22 @@ def convert_to_generated_data_feed_type(
         min_retry_interval_in_seconds=ingestion_settings.ingestion_retry_delay,
         start_offset_in_seconds=ingestion_settings.ingestion_start_offset,
         stop_retry_after_in_seconds=ingestion_settings.stop_retry_after,
-        data_feed_description=options.data_feed_description if options else None,
-        need_rollup=DataFeedRollupType._to_generated(options.rollup_settings.rollup_type)
-        if options and options.rollup_settings else None,
-        roll_up_method=options.rollup_settings.rollup_method if options and options.rollup_settings else None,
-        roll_up_columns=options.rollup_settings.auto_rollup_group_by_column_names
-        if options and options.rollup_settings else None,
-        all_up_identification=options.rollup_settings.rollup_identification_value
-        if options and options.rollup_settings else None,
-        fill_missing_point_type=options.missing_data_point_fill_settings.fill_type
-        if options and options.missing_data_point_fill_settings else None,
-        fill_missing_point_value=options.missing_data_point_fill_settings.custom_fill_value
-        if options and options.missing_data_point_fill_settings else None,
-        viewers=options.viewer_emails if options else None,
-        view_mode=options.access_mode if options else None,
-        admins=options.admin_emails if options else None,
-        action_link_template=options.action_link_template if options else None
+        data_feed_description=data_feed_description,
+        need_rollup=DataFeedRollupType._to_generated(rollup_settings.rollup_type)
+        if rollup_settings else None,
+        roll_up_method=rollup_settings.rollup_method if rollup_settings else None,
+        roll_up_columns=rollup_settings.auto_rollup_group_by_column_names
+        if rollup_settings else None,
+        all_up_identification=rollup_settings.rollup_identification_value
+        if rollup_settings else None,
+        fill_missing_point_type=missing_data_point_fill_settings.fill_type
+        if missing_data_point_fill_settings else None,
+        fill_missing_point_value=missing_data_point_fill_settings.custom_fill_value
+        if missing_data_point_fill_settings else None,
+        viewers=viewer_emails,
+        view_mode=access_mode,
+        admins=admin_emails,
+        action_link_template=action_link_template
     )
 
 def convert_to_sub_feedback(feedback):
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
index 1c998691ec7a..88cd58c539c5 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py
@@ -295,8 +295,19 @@ def create_data_feed(
         :param ingestion_settings: The data feed ingestions settings. Can be passed as a datetime to use for the
             ingestion begin time or as a DataFeedIngestionSettings object if additional configuration is needed.
         :type ingestion_settings: Union[~datetime.datetime, ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings]
-        :keyword options: Data feed options.
-        :paramtype options: ~azure.ai.metricsadvisor.models.DataFeedOptions
+        :keyword list[str] admin_emails: Data feed administrator emails.
+        :keyword str data_feed_description: Data feed description.
+        :keyword missing_data_point_fill_settings: The fill missing point type and value.
+        :paramtype missing_data_point_fill_settings:
+            ~azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings
+        :keyword rollup_settings: The rollup settings.
+        :paramtype rollup_settings:
+            ~azure.ai.metricsadvisor.models.DataFeedRollupSettings
+        :keyword list[str] viewer_emails: Data feed viewer emails.
+        :keyword access_mode: Data feed access mode. Possible values include:
+            "Private", "Public". Default value: "Private".
+        :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode
+        :keyword str action_link_template: action link for alert.
         :return: DataFeed
         :rtype: ~azure.ai.metricsadvisor.models.DataFeed
         :raises ~azure.core.exceptions.HttpResponseError:
@@ -311,7 +322,13 @@ def create_data_feed(
                 :caption: Create a data feed
         """
 
-        options = kwargs.pop("options", None)
+        admin_emails = kwargs.pop('admin_emails', None)
+        data_feed_description = kwargs.pop('data_feed_description', None)
+        missing_data_point_fill_settings = kwargs.pop('missing_data_point_fill_settings', None)
+        rollup_settings = kwargs.pop('rollup_settings', None)
+        viewer_emails = kwargs.pop('viewer_emails', None)
+        access_mode = kwargs.pop('access_mode', "Private")
+        action_link_template = kwargs.pop('action_link_template', None)
         data_feed_type = DATA_FEED[source.data_source_type]
         data_feed_detail = convert_to_generated_data_feed_type(
             generated_feed_type=data_feed_type,
@@ -320,7 +337,13 @@ def create_data_feed(
             granularity=granularity,
             schema=schema,
             ingestion_settings=ingestion_settings,
-            options=options
+            admin_emails=admin_emails,
+            data_feed_description=data_feed_description,
+            missing_data_point_fill_settings=missing_data_point_fill_settings,
+            rollup_settings=rollup_settings,
+            viewer_emails=viewer_emails,
+            access_mode=access_mode,
+            action_link_template=action_link_template
         )
 
         response_headers = self._client.create_data_feed(  # type: ignore
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
index 01c935c5441d..863398b5e38c 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py
@@ -194,8 +194,19 @@ async def create_data_feed(
         :param ingestion_settings: The data feed ingestions settings. Can be passed as a datetime to use for the
             ingestion begin time or as a DataFeedIngestionSettings object if additional configuration is needed.
         :type ingestion_settings: Union[~datetime.datetime, ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings]
-        :keyword options: Data feed options.
-        :paramtype options: ~azure.ai.metricsadvisor.models.DataFeedOptions
+        :keyword list[str] admin_emails: Data feed administrator emails.
+        :keyword str data_feed_description: Data feed description.
+        :keyword missing_data_point_fill_settings: The fill missing point type and value.
+        :paramtype missing_data_point_fill_settings:
+            ~azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings
+        :keyword rollup_settings: The rollup settings.
+        :paramtype rollup_settings:
+            ~azure.ai.metricsadvisor.models.DataFeedRollupSettings
+        :keyword list[str] viewer_emails: Data feed viewer emails.
+        :keyword access_mode: Data feed access mode. Possible values include:
+            "Private", "Public". Default value: "Private".
+        :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode
+        :keyword str action_link_template: action link for alert.
         :return: DataFeed
         :rtype: ~azure.ai.metricsadvisor.models.DataFeed
         :raises ~azure.core.exceptions.HttpResponseError:
@@ -210,7 +221,13 @@ async def create_data_feed(
                 :caption: Create a data feed
         """
 
-        options = kwargs.pop("options", None)
+        admin_emails = kwargs.pop('admin_emails', None)
+        data_feed_description = kwargs.pop('data_feed_description', None)
+        missing_data_point_fill_settings = kwargs.pop('missing_data_point_fill_settings', None)
+        rollup_settings = kwargs.pop('rollup_settings', None)
+        viewer_emails = kwargs.pop('viewer_emails', None)
+        access_mode = kwargs.pop('access_mode', "Private")
+        action_link_template = kwargs.pop('action_link_template', None)
         data_feed_type = DATA_FEED[source.data_source_type]
         data_feed_detail = convert_to_generated_data_feed_type(
             generated_feed_type=data_feed_type,
@@ -219,7 +236,13 @@ async def create_data_feed(
             granularity=granularity,
             schema=schema,
             ingestion_settings=ingestion_settings,
-            options=options
+            admin_emails=admin_emails,
+            data_feed_description=data_feed_description,
+            missing_data_point_fill_settings=missing_data_point_fill_settings,
+            rollup_settings=rollup_settings,
+            viewer_emails=viewer_emails,
+            access_mode=access_mode,
+            action_link_template=action_link_template
         )
 
         response_headers = await self._client.create_data_feed(
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
index 9e7862ca8516..240a5e4e8661 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/__init__.py
@@ -65,7 +65,6 @@
     MetricAnomalyAlertConfigurationsOperator,
     DataFeedGranularity,
     DataFeedIngestionSettings,
-    DataFeedOptions,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
     DataFeedSchema,
@@ -140,7 +139,6 @@
     "DataFeedStatus",
     "DataFeedGranularity",
     "DataFeedIngestionSettings",
-    "DataFeedOptions",
     "DataFeedMissingDataPointFillSettings",
     "DataFeedRollupSettings",
     "DataFeedSchema",
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py
index 1d6dfa8e85f9..ed8d0f3a9b56 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py
@@ -247,45 +247,6 @@ def __repr__(self):
                 )[:1024]
 
 
-class DataFeedOptions(object):
-    """Data feed options.
-
-    :keyword list[str] admin_emails: Data feed administrator emails.
-    :keyword str data_feed_description: Data feed description.
-    :keyword missing_data_point_fill_settings: The fill missing point type and value.
-    :paramtype missing_data_point_fill_settings:
-        ~azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings
-    :keyword rollup_settings: The rollup settings.
-    :paramtype rollup_settings:
-        ~azure.ai.metricsadvisor.models.DataFeedRollupSettings
-    :keyword list[str] viewer_emails: Data feed viewer emails.
-    :keyword access_mode: Data feed access mode. Possible values include:
-        "Private", "Public". Default value: "Private".
-    :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode
-    :keyword str action_link_template: action link for alert.
-    """
-    def __init__(self, **kwargs):
-        self.admin_emails = kwargs.get('admin_emails', None)
-        self.data_feed_description = kwargs.get('data_feed_description', None)
-        self.missing_data_point_fill_settings = kwargs.get('missing_data_point_fill_settings', None)
-        self.rollup_settings = kwargs.get('rollup_settings', None)
-        self.viewer_emails = kwargs.get('viewer_emails', None)
-        self.access_mode = kwargs.get('access_mode', "Private")
-        self.action_link_template = kwargs.get('action_link_template', None)
-
-    def __repr__(self):
-        return "DataFeedOptions(admin_emails={}, data_feed_description={}, missing_data_point_fill_settings={}, " \
-               "rollup_settings={}, viewer_emails={}, access_mode={}, action_link_template={})".format(
-                    self.admin_emails,
-                    self.data_feed_description,
-                    repr(self.missing_data_point_fill_settings),
-                    repr(self.rollup_settings),
-                    self.viewer_emails,
-                    self.access_mode,
-                    self.action_link_template
-                )[:1024]
-
-
 class DataFeedMissingDataPointFillSettings(object):
     """Data feed missing data point fill settings
 
@@ -372,8 +333,6 @@ class DataFeed(object):  # pylint:disable=too-many-instance-attributes
     :ivar bool is_admin: Whether the query user is one of data feed administrators or not.
     :ivar dict metric_ids: metric name and metric id dict
     :ivar str name: Data feed name.
-    :ivar options: Data feed options
-    :vartype options: ~azure.ai.metricsadvisor.models.DataFeedOptions
     :ivar schema: Data feed schema
     :vartype schema: ~azure.ai.metricsadvisor.models.DataFeedSchema
     :ivar source: Data feed source.
@@ -384,6 +343,19 @@ class DataFeed(object):  # pylint:disable=too-many-instance-attributes
     :ivar status: Data feed status. Possible values include: "Active", "Paused".
         Default value: "Active".
     :vartype status: str or ~azure.ai.metricsadvisor.models.DataFeedStatus
+    :ivar list[str] admin_emails: Data feed administrator emails.
+    :ivar str data_feed_description: Data feed description.
+    :ivar missing_data_point_fill_settings: The fill missing point type and value.
+    :vartype missing_data_point_fill_settings:
+        ~azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings
+    :ivar rollup_settings: The rollup settings.
+    :vartype rollup_settings:
+        ~azure.ai.metricsadvisor.models.DataFeedRollupSettings
+    :ivar list[str] viewer_emails: Data feed viewer emails.
+    :ivar access_mode: Data feed access mode. Possible values include:
+        "Private", "Public". Default value: "Private".
+    :vartype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode
+    :ivar str action_link_template: action link for alert.
     """
     def __init__(
         self, name,  # type: str
@@ -403,24 +375,38 @@ def __init__(
         self.created_time = kwargs.get('created_time', None)
         self.is_admin = kwargs.get('is_admin', None)
         self.metric_ids = kwargs.get('metric_ids', None)
-        self.options = kwargs.get('options', None)
         self.status = kwargs.get('status', None)
+        self.admin_emails = kwargs.get('admin_emails', None)
+        self.data_feed_description = kwargs.get('data_feed_description', None)
+        self.missing_data_point_fill_settings = kwargs.get('missing_data_point_fill_settings', None)
+        self.rollup_settings = kwargs.get('rollup_settings', None)
+        self.viewer_emails = kwargs.get('viewer_emails', None)
+        self.access_mode = kwargs.get('access_mode', "Private")
+        self.action_link_template = kwargs.get('action_link_template', None)
 
     def __repr__(self):
         return "DataFeed(created_time={}, granularity={}, id={}, ingestion_settings={}, is_admin={}, " \
-                "metric_ids={}, name={}, options={}, schema={}, source={}, status={})".format(
-                    self.created_time,
-                    repr(self.granularity),
-                    self.id,
-                    repr(self.ingestion_settings),
-                    self.is_admin,
-                    self.metric_ids,
-                    self.name,
-                    repr(self.options),
-                    repr(self.schema),
-                    repr(self.source),
-                    self.status
-                )[:1024]
+                "metric_ids={}, name={}, schema={}, source={}, status={}, admin_emails={}, " \
+               "data_feed_description={}, missing_data_point_fill_settings={}, " \
+               "rollup_settings={}, viewer_emails={}, access_mode={}, action_link_template={})".format(
+            self.created_time,
+            repr(self.granularity),
+            self.id,
+            repr(self.ingestion_settings),
+            self.is_admin,
+            self.metric_ids,
+            self.name,
+            repr(self.schema),
+            repr(self.source),
+            self.status,
+            self.admin_emails,
+            self.data_feed_description,
+            repr(self.missing_data_point_fill_settings),
+            repr(self.rollup_settings),
+            self.viewer_emails,
+            self.access_mode,
+            self.action_link_template
+        )[:1024]
 
     @classmethod
     def _from_generated(cls, data_feed):
@@ -438,23 +424,21 @@ def _from_generated(cls, data_feed):
             is_admin=data_feed.is_admin,
             metric_ids={metric.metric_name: metric.metric_id for metric in data_feed.metrics},
             name=data_feed.data_feed_name,
-            options=DataFeedOptions(
-                admin_emails=data_feed.admins,
-                data_feed_description=data_feed.data_feed_description,
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type=data_feed.fill_missing_point_type,
-                    custom_fill_value=data_feed.fill_missing_point_value
-                ),
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_identification_value=data_feed.all_up_identification,
-                    rollup_type=DataFeedRollupType._from_generated(data_feed.need_rollup),
-                    auto_rollup_group_by_column_names=data_feed.roll_up_columns,
-                    rollup_method=data_feed.roll_up_method
-                ),
-                viewer_emails=data_feed.viewers,
-                access_mode=data_feed.view_mode,
-                action_link_template=data_feed.action_link_template
+            admin_emails=data_feed.admins,
+            data_feed_description=data_feed.data_feed_description,
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type=data_feed.fill_missing_point_type,
+                custom_fill_value=data_feed.fill_missing_point_value
+            ),
+            rollup_settings=DataFeedRollupSettings(
+                rollup_identification_value=data_feed.all_up_identification,
+                rollup_type=DataFeedRollupType._from_generated(data_feed.need_rollup),
+                auto_rollup_group_by_column_names=data_feed.roll_up_columns,
+                rollup_method=data_feed.roll_up_method
             ),
+            viewer_emails=data_feed.viewers,
+            access_mode=data_feed.view_mode,
+            action_link_template=data_feed.action_link_template,
             schema=DataFeedSchema(
                 dimensions=[DataFeedDimension._from_generated(dim) for dim in data_feed.dimension],
                 metrics=[DataFeedMetric._from_generated(metric) for metric in data_feed.metrics],
@@ -490,34 +474,34 @@ def _to_generated_patch(self, data_source_feed_type, kwargs):
             stop_retry_after_in_seconds=kwargs.pop("stopRetryAfterInSeconds", None)
             or self.ingestion_settings.stop_retry_after,
             data_feed_description=kwargs.pop("dataFeedDescription", None)
-            or self.options.data_feed_description if self.options else None,
+            or self.data_feed_description,
             need_rollup=rollup_type
-            or DataFeedRollupType._to_generated(self.options.rollup_settings.rollup_type)
-            if self.options and self.options.rollup_settings else None,
+            or DataFeedRollupType._to_generated(self.rollup_settings.rollup_type)
+            if self.rollup_settings else None,
             roll_up_method=kwargs.pop("rollUpMethod", None)
-            or self.options.rollup_settings.rollup_method
-            if self.options and self.options.rollup_settings else None,
+            or self.rollup_settings.rollup_method
+            if self.rollup_settings else None,
             roll_up_columns=kwargs.pop("rollUpColumns", None)
-            or self.options.rollup_settings.auto_rollup_group_by_column_names
-            if self.options and self.options.rollup_settings else None,
+            or self.rollup_settings.auto_rollup_group_by_column_names
+            if self.rollup_settings else None,
             all_up_identification=kwargs.pop("allUpIdentification", None)
-            or self.options.rollup_settings.rollup_identification_value
-            if self.options and self.options.rollup_settings else None,
+            or self.rollup_settings.rollup_identification_value
+            if self.rollup_settings else None,
             fill_missing_point_type=kwargs.pop("fillMissingPointType", None)
-            or self.options.missing_data_point_fill_settings.fill_type
-            if self.options and self.options.missing_data_point_fill_settings else None,
+            or self.missing_data_point_fill_settings.fill_type
+            if self.missing_data_point_fill_settings else None,
             fill_missing_point_value=kwargs.pop("fillMissingPointValue", None)
-            or self.options.missing_data_point_fill_settings.custom_fill_value
-            if self.options and self.options.missing_data_point_fill_settings else None,
+            or self.missing_data_point_fill_settings.custom_fill_value
+            if self.missing_data_point_fill_settings else None,
             viewers=kwargs.pop("viewers", None)
-            or self.options.viewer_emails if self.options else None,
+            or self.viewer_emails,
             view_mode=kwargs.pop("viewMode", None)
-            or self.options.access_mode if self.options else None,
+            or self.access_mode,
             admins=kwargs.pop("admins", None)
-            or self.options.admin_emails if self.options else None,
+            or self.admin_emails,
             status=kwargs.pop("status", None) or self.status,
             action_link_template=kwargs.pop("actionLinkTemplate", None)
-            or self.options.action_link_template if self.options else None,
+            or self.action_link_template,
             authentication_type=authentication_type,
             credential_id=credential_id
         )
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py
index 2dcbbb55476d..261b723db45e 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py
@@ -39,7 +39,6 @@ async def sample_create_data_feed_async():
         DataFeedSchema,
         DataFeedMetric,
         DataFeedDimension,
-        DataFeedOptions,
         DataFeedRollupSettings,
         DataFeedMissingDataPointFillSettings,
     )
@@ -72,18 +71,16 @@ async def sample_create_data_feed_async():
                 timestamp_column="Timestamp"
             ),
             ingestion_settings=datetime.datetime(2019, 10, 1),
-            options=DataFeedOptions(
-                data_feed_description="cost/revenue data feed",
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_type="AutoRollup",
-                    rollup_method="Sum",
-                    rollup_identification_value="__CUSTOM_SUM__"
-                ),
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type="SmartFilling"
-                ),
-                access_mode="Private"
-            )
+            data_feed_description="cost/revenue data feed",
+            rollup_settings=DataFeedRollupSettings(
+                rollup_type="AutoRollup",
+                rollup_method="Sum",
+                rollup_identification_value="__CUSTOM_SUM__"
+            ),
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type="SmartFilling"
+            ),
+            access_mode="Private"
         )
 
         return data_feed
@@ -116,11 +113,11 @@ async def sample_get_data_feed_async(data_feed_id):
         print("Data feed dimensions: {}".format([dimension.name for dimension in data_feed.schema.dimensions]))
         print("Data feed timestamp column: {}".format(data_feed.schema.timestamp_column))
         print("Ingestion data starting on: {}".format(data_feed.ingestion_settings.ingestion_begin_time))
-        print("Data feed description: {}".format(data_feed.options.data_feed_description))
-        print("Data feed rollup type: {}".format(data_feed.options.rollup_settings.rollup_type))
-        print("Data feed rollup method: {}".format(data_feed.options.rollup_settings.rollup_method))
-        print("Data feed fill setting: {}".format(data_feed.options.missing_data_point_fill_settings.fill_type))
-        print("Data feed access mode: {}".format(data_feed.options.access_mode))
+        print("Data feed description: {}".format(data_feed.data_feed_description))
+        print("Data feed rollup type: {}".format(data_feed.rollup_settings.rollup_type))
+        print("Data feed rollup method: {}".format(data_feed.rollup_settings.rollup_method))
+        print("Data feed fill setting: {}".format(data_feed.missing_data_point_fill_settings.fill_type))
+        print("Data feed access mode: {}".format(data_feed.access_mode))
     # [END get_data_feed_async]
 
 
@@ -172,7 +169,7 @@ async def sample_update_data_feed_async(data_feed):
 
     # update data feed on the data feed itself or by using available keyword arguments
     data_feed.name = "updated name"
-    data_feed.options.data_feed_description = "updated description for data feed"
+    data_feed.data_feed_description = "updated description for data feed"
 
     async with client:
         updated = await client.update_data_feed(
@@ -182,11 +179,11 @@ async def sample_update_data_feed_async(data_feed):
             custom_fill_value=1
         )
         print("Updated name: {}".format(updated.name))
-        print("Updated description: {}".format(updated.options.data_feed_description))
-        print("Updated access mode: {}".format(updated.options.access_mode))
+        print("Updated description: {}".format(updated.data_feed_description))
+        print("Updated access mode: {}".format(updated.access_mode))
         print("Updated fill setting, value: {}, {}".format(
-            updated.options.missing_data_point_fill_settings.fill_type,
-            updated.options.missing_data_point_fill_settings.custom_fill_value,
+            updated.missing_data_point_fill_settings.fill_type,
+            updated.missing_data_point_fill_settings.custom_fill_value,
         ))
     # [END update_data_feed_async]
 
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py
index a08b6b7b3c03..ded66955ff38 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py
@@ -37,7 +37,6 @@ def sample_create_data_feed():
         DataFeedSchema,
         DataFeedMetric,
         DataFeedDimension,
-        DataFeedOptions,
         DataFeedRollupSettings,
         DataFeedMissingDataPointFillSettings,
     )
@@ -70,18 +69,16 @@ def sample_create_data_feed():
             timestamp_column="Timestamp"
         ),
         ingestion_settings=datetime.datetime(2019, 10, 1),
-        options=DataFeedOptions(
-            data_feed_description="cost/revenue data feed",
-            rollup_settings=DataFeedRollupSettings(
-                rollup_type="AutoRollup",
-                rollup_method="Sum",
-                rollup_identification_value="__CUSTOM_SUM__"
-            ),
-            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                fill_type="SmartFilling"
-            ),
-            access_mode="Private"
-        )
+        data_feed_description="cost/revenue data feed",
+        rollup_settings=DataFeedRollupSettings(
+            rollup_type="AutoRollup",
+            rollup_method="Sum",
+            rollup_identification_value="__CUSTOM_SUM__"
+        ),
+        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+            fill_type="SmartFilling"
+        ),
+        access_mode="Private"
     )
 
     return data_feed
@@ -112,11 +109,11 @@ def sample_get_data_feed(data_feed_id):
     print("Data feed dimensions: {}".format([dimension.name for dimension in data_feed.schema.dimensions]))
     print("Data feed timestamp column: {}".format(data_feed.schema.timestamp_column))
     print("Ingestion data starting on: {}".format(data_feed.ingestion_settings.ingestion_begin_time))
-    print("Data feed description: {}".format(data_feed.options.data_feed_description))
-    print("Data feed rollup type: {}".format(data_feed.options.rollup_settings.rollup_type))
-    print("Data feed rollup method: {}".format(data_feed.options.rollup_settings.rollup_method))
-    print("Data feed fill setting: {}".format(data_feed.options.missing_data_point_fill_settings.fill_type))
-    print("Data feed access mode: {}".format(data_feed.options.access_mode))
+    print("Data feed description: {}".format(data_feed.data_feed_description))
+    print("Data feed rollup type: {}".format(data_feed.rollup_settings.rollup_type))
+    print("Data feed rollup method: {}".format(data_feed.rollup_settings.rollup_method))
+    print("Data feed fill setting: {}".format(data_feed.missing_data_point_fill_settings.fill_type))
+    print("Data feed access mode: {}".format(data_feed.access_mode))
     # [END get_data_feed]
 
 
@@ -165,7 +162,7 @@ def sample_update_data_feed(data_feed):
 
     # update data feed on the data feed itself or by using available keyword arguments
     data_feed.name = "updated name"
-    data_feed.options.data_feed_description = "updated description for data feed"
+    data_feed.data_feed_description = "updated description for data feed"
 
     updated = client.update_data_feed(
         data_feed,
@@ -174,11 +171,11 @@ def sample_update_data_feed(data_feed):
         custom_fill_value=1
     )
     print("Updated name: {}".format(updated.name))
-    print("Updated description: {}".format(updated.options.data_feed_description))
-    print("Updated access mode: {}".format(updated.options.access_mode))
+    print("Updated description: {}".format(updated.data_feed_description))
+    print("Updated access mode: {}".format(updated.access_mode))
     print("Updated fill setting, value: {}, {}".format(
-        updated.options.missing_data_point_fill_settings.fill_type,
-        updated.options.missing_data_point_fill_settings.custom_fill_value,
+        updated.missing_data_point_fill_settings.fill_type,
+        updated.missing_data_point_fill_settings.custom_fill_value,
     ))
     # [END update_data_feed]
 
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py
index 1f0719ac84b3..8f7c727f62e3 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py
@@ -31,7 +31,6 @@
     DataFeedIngestionSettings,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
-    DataFeedOptions,
     MetricAlertConfiguration,
     MetricAnomalyAlertScope,
     MetricAnomalyAlertConditions,
@@ -230,21 +229,18 @@ async def _create_data_feed_for_update(self, name):
                 ingestion_start_offset=-1,
                 stop_retry_after=-1,
             ),
-            options=DataFeedOptions(
-                admin_emails=["yournamehere@microsoft.com"],
-                data_feed_description="my first data feed",
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type="SmartFilling"
-                ),
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_type="NoRollup",
-                    rollup_method="None",
-                ),
-                viewer_emails=["viewers"],
-                access_mode="Private",
-                action_link_template="action link template"
-            )
-
+            admin_emails=["yournamehere@microsoft.com"],
+            data_feed_description="my first data feed",
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type="SmartFilling"
+            ),
+            rollup_settings=DataFeedRollupSettings(
+                rollup_type="NoRollup",
+                rollup_method="None",
+            ),
+            viewer_emails=["viewers"],
+            access_mode="Private",
+            action_link_template="action link template"
         )
 
     async def _create_alert_config_for_update(self, name):
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py
index ab4d4e3ad0e6..586de0c4590c 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py
@@ -31,7 +31,6 @@
     DataFeedIngestionSettings,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
-    DataFeedOptions,
     MetricAlertConfiguration,
     MetricAnomalyAlertScope,
     MetricAnomalyAlertConditions,
@@ -228,21 +227,18 @@ async def _create_data_feed_for_update(self, name):
                 ingestion_start_offset=-1,
                 stop_retry_after=-1,
             ),
-            options=DataFeedOptions(
-                admin_emails=["yournamehere@microsoft.com"],
-                data_feed_description="my first data feed",
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type="SmartFilling"
-                ),
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_type="NoRollup",
-                    rollup_method="None",
-                ),
-                viewer_emails=["viewers"],
-                access_mode="Private",
-                action_link_template="action link template"
-            )
-
+            admin_emails=["yournamehere@microsoft.com"],
+            data_feed_description="my first data feed",
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type="SmartFilling"
+            ),
+            rollup_settings=DataFeedRollupSettings(
+                rollup_type="NoRollup",
+                rollup_method="None",
+            ),
+            viewer_emails=["viewers"],
+            access_mode="Private",
+            action_link_template="action link template"
         )
 
     async def _create_alert_config_for_update(self, name):
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py
index f8bf6c83f4bc..c881debcdd66 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py
@@ -21,7 +21,6 @@
     DataFeedSchema,
     DataFeedIngestionSettings,
     DataFeedGranularity,
-    DataFeedOptions,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
     AzureApplicationInsightsDataFeedSource,
@@ -99,21 +98,18 @@ async def test_create_data_feed_from_sql_server(self):
                         ingestion_start_offset=-1,
                         stop_retry_after=-1,
                     ),
-                    options=DataFeedOptions(
-                        admin_emails=["yournamehere@microsoft.com"],
-                        data_feed_description="my first data feed",
-                        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                            fill_type="SmartFilling"
-                        ),
-                        rollup_settings=DataFeedRollupSettings(
-                            rollup_type="NoRollup",
-                            rollup_method="None",
-                        ),
-                        viewer_emails=["viewers"],
-                        access_mode="Private",
-                        action_link_template="action link template"
-                    )
-
+                    admin_emails=["yournamehere@microsoft.com"],
+                    data_feed_description="my first data feed",
+                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                        fill_type="SmartFilling"
+                    ),
+                    rollup_settings=DataFeedRollupSettings(
+                        rollup_type="NoRollup",
+                        rollup_method="None",
+                    ),
+                    viewer_emails=["viewers"],
+                    access_mode="Private",
+                    action_link_template="action link template"
                 )
                 self.assertIsNotNone(data_feed.id)
                 self.assertIsNotNone(data_feed.created_time)
@@ -138,14 +134,14 @@ async def test_create_data_feed_from_sql_server(self):
                 self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
                 self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-                self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-                self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_type, "NoRollup")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_method, "None")
-                self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-                self.assertEqual(data_feed.options.access_mode, "Private")
-                self.assertEqual(data_feed.options.action_link_template, "action link template")
+                self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+                self.assertEqual(data_feed.data_feed_description, "my first data feed")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling")
+                self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup")
+                self.assertEqual(data_feed.rollup_settings.rollup_method, "None")
+                self.assertEqual(data_feed.viewer_emails, ["viewers"])
+                self.assertEqual(data_feed.access_mode, "Private")
+                self.assertEqual(data_feed.action_link_template, "action link template")
                 self.assertEqual(data_feed.status, "Active")
                 self.assertTrue(data_feed.is_admin)
                 self.assertIsNotNone(data_feed.metric_ids)
@@ -190,23 +186,20 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
                         ingestion_start_offset=-1,
                         stop_retry_after=-1,
                     ),
-                    options=DataFeedOptions(
-                        admin_emails=["yournamehere@microsoft.com"],
-                        data_feed_description="my first data feed",
-                        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                            fill_type="CustomValue",
-                            custom_fill_value=10
-                        ),
-                        rollup_settings=DataFeedRollupSettings(
-                            rollup_type="AlreadyRollup",
-                            rollup_method="Sum",
-                            rollup_identification_value="sumrollup"
-                        ),
-                        viewer_emails=["viewers"],
-                        access_mode="Private",
-                        action_link_template="action link template"
-                    )
-
+                    admin_emails=["yournamehere@microsoft.com"],
+                    data_feed_description="my first data feed",
+                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                        fill_type="CustomValue",
+                        custom_fill_value=10
+                    ),
+                    rollup_settings=DataFeedRollupSettings(
+                        rollup_type="AlreadyRollup",
+                        rollup_method="Sum",
+                        rollup_identification_value="sumrollup"
+                    ),
+                    viewer_emails=["viewers"],
+                    access_mode="Private",
+                    action_link_template="action link template"
                 )
                 self.assertIsNotNone(data_feed.id)
                 self.assertIsNotNone(data_feed.created_time)
@@ -231,16 +224,16 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
                 self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
                 self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-                self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-                self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.custom_fill_value, 10)
-                self.assertEqual(data_feed.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-                self.assertEqual(data_feed.options.access_mode, "Private")
-                self.assertEqual(data_feed.options.action_link_template, "action link template")
+                self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+                self.assertEqual(data_feed.data_feed_description, "my first data feed")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10)
+                self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(data_feed.viewer_emails, ["viewers"])
+                self.assertEqual(data_feed.access_mode, "Private")
+                self.assertEqual(data_feed.action_link_template, "action link template")
                 self.assertEqual(data_feed.status, "Active")
                 self.assertTrue(data_feed.is_admin)
                 self.assertIsNotNone(data_feed.metric_ids)
@@ -733,30 +726,30 @@ async def test_update_data_feed_with_model(self):
             data_feed = await self._create_data_feed_for_update("update")
             try:
                 data_feed.name = "update"
-                data_feed.options.data_feed_description = "updated"
+                data_feed.data_feed_description = "updated"
                 data_feed.schema.timestamp_column = "time"
                 data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 10)
                 data_feed.ingestion_settings.ingestion_start_offset = 1
                 data_feed.ingestion_settings.data_source_request_concurrency = 1
                 data_feed.ingestion_settings.ingestion_retry_delay = 1
                 data_feed.ingestion_settings.stop_retry_after = 1
-                data_feed.options.rollup_settings.rollup_type = "AlreadyRollup"
-                data_feed.options.rollup_settings.rollup_method = "Sum"
-                data_feed.options.rollup_settings.rollup_identification_value = "sumrollup"
-                data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-                data_feed.options.missing_data_point_fill_settings.fill_type = "CustomValue"
-                data_feed.options.missing_data_point_fill_settings.custom_fill_value = 2
-                data_feed.options.access_mode = "Public"
-                data_feed.options.viewer_emails = ["updated"]
+                data_feed.rollup_settings.rollup_type = "AlreadyRollup"
+                data_feed.rollup_settings.rollup_method = "Sum"
+                data_feed.rollup_settings.rollup_identification_value = "sumrollup"
+                data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+                data_feed.missing_data_point_fill_settings.fill_type = "CustomValue"
+                data_feed.missing_data_point_fill_settings.custom_fill_value = 2
+                data_feed.access_mode = "Public"
+                data_feed.viewer_emails = ["updated"]
                 data_feed.status = "Paused"
-                data_feed.options.action_link_template = "updated"
+                data_feed.action_link_template = "updated"
                 data_feed.source.connection_string = "updated"
                 data_feed.source.query = "get data"
 
                 await self.admin_client.update_data_feed(data_feed)
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                self.assertEqual(updated.options.data_feed_description, "updated")
+                self.assertEqual(updated.data_feed_description, "updated")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -764,15 +757,15 @@ async def test_update_data_feed_with_model(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -810,7 +803,7 @@ async def test_update_data_feed_with_kwargs(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                self.assertEqual(updated.options.data_feed_description, "updated")
+                self.assertEqual(updated.data_feed_description, "updated")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -818,15 +811,15 @@ async def test_update_data_feed_with_kwargs(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -838,23 +831,23 @@ async def test_update_data_feed_with_model_and_kwargs(self):
             data_feed = await self._create_data_feed_for_update("update")
             try:
                 data_feed.name = "updateMe"
-                data_feed.options.data_feed_description = "updateMe"
+                data_feed.data_feed_description = "updateMe"
                 data_feed.schema.timestamp_column = "don't update me"
                 data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 22)
                 data_feed.ingestion_settings.ingestion_start_offset = 2
                 data_feed.ingestion_settings.data_source_request_concurrency = 2
                 data_feed.ingestion_settings.ingestion_retry_delay = 2
                 data_feed.ingestion_settings.stop_retry_after = 2
-                data_feed.options.rollup_settings.rollup_type = "don't update me"
-                data_feed.options.rollup_settings.rollup_method = "don't update me"
-                data_feed.options.rollup_settings.rollup_identification_value = "don't update me"
-                data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-                data_feed.options.missing_data_point_fill_settings.fill_type = "don't update me"
-                data_feed.options.missing_data_point_fill_settings.custom_fill_value = 4
-                data_feed.options.access_mode = "don't update me"
-                data_feed.options.viewer_emails = ["don't update me"]
+                data_feed.rollup_settings.rollup_type = "don't update me"
+                data_feed.rollup_settings.rollup_method = "don't update me"
+                data_feed.rollup_settings.rollup_identification_value = "don't update me"
+                data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+                data_feed.missing_data_point_fill_settings.fill_type = "don't update me"
+                data_feed.missing_data_point_fill_settings.custom_fill_value = 4
+                data_feed.access_mode = "don't update me"
+                data_feed.viewer_emails = ["don't update me"]
                 data_feed.status = "don't update me"
-                data_feed.options.action_link_template = "don't update me"
+                data_feed.action_link_template = "don't update me"
                 data_feed.source.connection_string = "don't update me"
                 data_feed.source.query = "don't update me"
 
@@ -883,7 +876,7 @@ async def test_update_data_feed_with_model_and_kwargs(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "updateMe")
-                self.assertEqual(updated.options.data_feed_description, "updateMe")
+                self.assertEqual(updated.data_feed_description, "updateMe")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -891,15 +884,15 @@ async def test_update_data_feed_with_model_and_kwargs(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -933,7 +926,7 @@ async def test_update_data_feed_by_reseting_properties(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                # self.assertEqual(updated.options.data_feed_description, "")  # doesn't currently clear
+                # self.assertEqual(updated.data_feed_description, "")  # doesn't currently clear
                 # self.assertEqual(updated.schema.timestamp_column, "")  # doesn't currently clear
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2019, 10, 1, tzinfo=tzutc()))
@@ -941,15 +934,15 @@ async def test_update_data_feed_by_reseting_properties(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, -1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "None")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None)
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0)
-                self.assertEqual(updated.options.access_mode, "Private")
-                # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear
+                self.assertEqual(updated.rollup_settings.rollup_type, "NoRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "None")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, None)
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0)
+                self.assertEqual(updated.access_mode, "Private")
+                # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear
                 self.assertEqual(updated.status, "Active")
-                # self.assertEqual(updated.options.action_link_template, "updated")  # doesn't currently clear
+                # self.assertEqual(updated.action_link_template, "updated")  # doesn't currently clear
 
             finally:
                 await self.admin_client.delete_data_feed(data_feed.id)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py
index 45a7d9fda831..7c24e7387956 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py
@@ -21,7 +21,6 @@
     DataFeedSchema,
     DataFeedIngestionSettings,
     DataFeedGranularity,
-    DataFeedOptions,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
     AzureApplicationInsightsDataFeedSource,
@@ -99,21 +98,18 @@ async def test_create_data_feed_from_sql_server(self):
                         ingestion_start_offset=-1,
                         stop_retry_after=-1,
                     ),
-                    options=DataFeedOptions(
-                        admin_emails=["yournamehere@microsoft.com"],
-                        data_feed_description="my first data feed",
-                        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                            fill_type="SmartFilling"
-                        ),
-                        rollup_settings=DataFeedRollupSettings(
-                            rollup_type="NoRollup",
-                            rollup_method="None",
-                        ),
-                        viewer_emails=["viewers"],
-                        access_mode="Private",
-                        action_link_template="action link template"
-                    )
-
+                    admin_emails=["yournamehere@microsoft.com"],
+                    data_feed_description="my first data feed",
+                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                        fill_type="SmartFilling"
+                    ),
+                    rollup_settings=DataFeedRollupSettings(
+                        rollup_type="NoRollup",
+                        rollup_method="None",
+                    ),
+                    viewer_emails=["viewers"],
+                    access_mode="Private",
+                    action_link_template="action link template"
                 )
                 self.assertIsNotNone(data_feed.id)
                 self.assertIsNotNone(data_feed.created_time)
@@ -138,14 +134,14 @@ async def test_create_data_feed_from_sql_server(self):
                 self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
                 self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-                self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-                self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_type, "NoRollup")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_method, "None")
-                self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-                self.assertEqual(data_feed.options.access_mode, "Private")
-                self.assertEqual(data_feed.options.action_link_template, "action link template")
+                self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+                self.assertEqual(data_feed.data_feed_description, "my first data feed")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling")
+                self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup")
+                self.assertEqual(data_feed.rollup_settings.rollup_method, "None")
+                self.assertEqual(data_feed.viewer_emails, ["viewers"])
+                self.assertEqual(data_feed.access_mode, "Private")
+                self.assertEqual(data_feed.action_link_template, "action link template")
                 self.assertEqual(data_feed.status, "Active")
                 self.assertTrue(data_feed.is_admin)
                 self.assertIsNotNone(data_feed.metric_ids)
@@ -190,23 +186,20 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
                         ingestion_start_offset=-1,
                         stop_retry_after=-1,
                     ),
-                    options=DataFeedOptions(
-                        admin_emails=["yournamehere@microsoft.com"],
-                        data_feed_description="my first data feed",
-                        missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                            fill_type="CustomValue",
-                            custom_fill_value=10
-                        ),
-                        rollup_settings=DataFeedRollupSettings(
-                            rollup_type="AlreadyRollup",
-                            rollup_method="Sum",
-                            rollup_identification_value="sumrollup"
-                        ),
-                        viewer_emails=["viewers"],
-                        access_mode="Private",
-                        action_link_template="action link template"
-                    )
-
+                    admin_emails=["yournamehere@microsoft.com"],
+                    data_feed_description="my first data feed",
+                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                        fill_type="CustomValue",
+                        custom_fill_value=10
+                    ),
+                    rollup_settings=DataFeedRollupSettings(
+                        rollup_type="AlreadyRollup",
+                        rollup_method="Sum",
+                        rollup_identification_value="sumrollup"
+                    ),
+                    viewer_emails=["viewers"],
+                    access_mode="Private",
+                    action_link_template="action link template"
                 )
                 self.assertIsNotNone(data_feed.id)
                 self.assertIsNotNone(data_feed.created_time)
@@ -231,16 +224,16 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
                 self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
                 self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-                self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-                self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(data_feed.options.missing_data_point_fill_settings.custom_fill_value, 10)
-                self.assertEqual(data_feed.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(data_feed.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-                self.assertEqual(data_feed.options.access_mode, "Private")
-                self.assertEqual(data_feed.options.action_link_template, "action link template")
+                self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+                self.assertEqual(data_feed.data_feed_description, "my first data feed")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10)
+                self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(data_feed.viewer_emails, ["viewers"])
+                self.assertEqual(data_feed.access_mode, "Private")
+                self.assertEqual(data_feed.action_link_template, "action link template")
                 self.assertEqual(data_feed.status, "Active")
                 self.assertTrue(data_feed.is_admin)
                 self.assertIsNotNone(data_feed.metric_ids)
@@ -733,30 +726,30 @@ async def test_update_data_feed_with_model(self):
             data_feed = await self._create_data_feed_for_update("update")
             try:
                 data_feed.name = "update"
-                data_feed.options.data_feed_description = "updated"
+                data_feed.data_feed_description = "updated"
                 data_feed.schema.timestamp_column = "time"
                 data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 10)
                 data_feed.ingestion_settings.ingestion_start_offset = 1
                 data_feed.ingestion_settings.data_source_request_concurrency = 1
                 data_feed.ingestion_settings.ingestion_retry_delay = 1
                 data_feed.ingestion_settings.stop_retry_after = 1
-                data_feed.options.rollup_settings.rollup_type = "AlreadyRollup"
-                data_feed.options.rollup_settings.rollup_method = "Sum"
-                data_feed.options.rollup_settings.rollup_identification_value = "sumrollup"
-                data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-                data_feed.options.missing_data_point_fill_settings.fill_type = "CustomValue"
-                data_feed.options.missing_data_point_fill_settings.custom_fill_value = 2
-                data_feed.options.access_mode = "Public"
-                data_feed.options.viewer_emails = ["updated"]
+                data_feed.rollup_settings.rollup_type = "AlreadyRollup"
+                data_feed.rollup_settings.rollup_method = "Sum"
+                data_feed.rollup_settings.rollup_identification_value = "sumrollup"
+                data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+                data_feed.missing_data_point_fill_settings.fill_type = "CustomValue"
+                data_feed.missing_data_point_fill_settings.custom_fill_value = 2
+                data_feed.access_mode = "Public"
+                data_feed.viewer_emails = ["updated"]
                 data_feed.status = "Paused"
-                data_feed.options.action_link_template = "updated"
+                data_feed.action_link_template = "updated"
                 data_feed.source.connection_string = "updated"
                 data_feed.source.query = "get data"
 
                 await self.admin_client.update_data_feed(data_feed)
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                self.assertEqual(updated.options.data_feed_description, "updated")
+                self.assertEqual(updated.data_feed_description, "updated")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -764,15 +757,15 @@ async def test_update_data_feed_with_model(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -810,7 +803,7 @@ async def test_update_data_feed_with_kwargs(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                self.assertEqual(updated.options.data_feed_description, "updated")
+                self.assertEqual(updated.data_feed_description, "updated")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -818,15 +811,15 @@ async def test_update_data_feed_with_kwargs(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -838,23 +831,23 @@ async def test_update_data_feed_with_model_and_kwargs(self):
             data_feed = await self._create_data_feed_for_update("update")
             try:
                 data_feed.name = "updateMe"
-                data_feed.options.data_feed_description = "updateMe"
+                data_feed.data_feed_description = "updateMe"
                 data_feed.schema.timestamp_column = "don't update me"
                 data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 22)
                 data_feed.ingestion_settings.ingestion_start_offset = 2
                 data_feed.ingestion_settings.data_source_request_concurrency = 2
                 data_feed.ingestion_settings.ingestion_retry_delay = 2
                 data_feed.ingestion_settings.stop_retry_after = 2
-                data_feed.options.rollup_settings.rollup_type = "don't update me"
-                data_feed.options.rollup_settings.rollup_method = "don't update me"
-                data_feed.options.rollup_settings.rollup_identification_value = "don't update me"
-                data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-                data_feed.options.missing_data_point_fill_settings.fill_type = "don't update me"
-                data_feed.options.missing_data_point_fill_settings.custom_fill_value = 4
-                data_feed.options.access_mode = "don't update me"
-                data_feed.options.viewer_emails = ["don't update me"]
+                data_feed.rollup_settings.rollup_type = "don't update me"
+                data_feed.rollup_settings.rollup_method = "don't update me"
+                data_feed.rollup_settings.rollup_identification_value = "don't update me"
+                data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+                data_feed.missing_data_point_fill_settings.fill_type = "don't update me"
+                data_feed.missing_data_point_fill_settings.custom_fill_value = 4
+                data_feed.access_mode = "don't update me"
+                data_feed.viewer_emails = ["don't update me"]
                 data_feed.status = "don't update me"
-                data_feed.options.action_link_template = "don't update me"
+                data_feed.action_link_template = "don't update me"
                 data_feed.source.connection_string = "don't update me"
                 data_feed.source.query = "don't update me"
 
@@ -883,7 +876,7 @@ async def test_update_data_feed_with_model_and_kwargs(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "updateMe")
-                self.assertEqual(updated.options.data_feed_description, "updateMe")
+                self.assertEqual(updated.data_feed_description, "updateMe")
                 self.assertEqual(updated.schema.timestamp_column, "time")
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -891,15 +884,15 @@ async def test_update_data_feed_with_model_and_kwargs(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-                self.assertEqual(updated.options.access_mode, "Public")
-                self.assertEqual(updated.options.viewer_emails, ["updated"])
+                self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+                self.assertEqual(updated.access_mode, "Public")
+                self.assertEqual(updated.viewer_emails, ["updated"])
                 self.assertEqual(updated.status, "Paused")
-                self.assertEqual(updated.options.action_link_template, "updated")
+                self.assertEqual(updated.action_link_template, "updated")
                 self.assertEqual(updated.source.query, "get data")
 
             finally:
@@ -933,7 +926,7 @@ async def test_update_data_feed_by_reseting_properties(self):
                 )
                 updated = await self.admin_client.get_data_feed(data_feed.id)
                 self.assertEqual(updated.name, "update")
-                # self.assertEqual(updated.options.data_feed_description, "")  # doesn't currently clear
+                # self.assertEqual(updated.data_feed_description, "")  # doesn't currently clear
                 # self.assertEqual(updated.schema.timestamp_column, "")  # doesn't currently clear
                 self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                                  datetime.datetime(2019, 10, 1, tzinfo=tzutc()))
@@ -941,15 +934,15 @@ async def test_update_data_feed_by_reseting_properties(self):
                 self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0)
                 self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1)
                 self.assertEqual(updated.ingestion_settings.stop_retry_after, -1)
-                self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup")
-                self.assertEqual(updated.options.rollup_settings.rollup_method, "None")
-                self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None)
-                self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-                self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0)
-                self.assertEqual(updated.options.access_mode, "Private")
-                # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear
+                self.assertEqual(updated.rollup_settings.rollup_type, "NoRollup")
+                self.assertEqual(updated.rollup_settings.rollup_method, "None")
+                self.assertEqual(updated.rollup_settings.rollup_identification_value, None)
+                self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling")
+                self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0)
+                self.assertEqual(updated.access_mode, "Private")
+                # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear
                 self.assertEqual(updated.status, "Active")
-                # self.assertEqual(updated.options.action_link_template, "updated")  # doesn't currently clear
+                # self.assertEqual(updated.action_link_template, "updated")  # doesn't currently clear
 
             finally:
                 await self.admin_client.delete_data_feed(data_feed.id)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py
index 7383dbc45ba6..1f59889461ef 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py
@@ -26,7 +26,6 @@
     DataFeedIngestionSettings,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
-    DataFeedOptions,
     MetricAlertConfiguration,
     MetricAnomalyAlertScope,
     MetricAnomalyAlertConditions,
@@ -223,23 +222,21 @@ def _create_data_feed_for_update(self, name):
                 ingestion_start_offset=-1,
                 stop_retry_after=-1,
             ),
-            options=DataFeedOptions(
-                admin_emails=["yournamehere@microsoft.com"],
-                data_feed_description="my first data feed",
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type="SmartFilling"
-                ),
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_type="NoRollup",
-                    rollup_method="None",
-                ),
-                viewer_emails=["viewers"],
-                access_mode="Private",
-                action_link_template="action link template"
-            )
-
+            admin_emails=["yournamehere@microsoft.com"],
+            data_feed_description="my first data feed",
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type="SmartFilling"
+            ),
+            rollup_settings=DataFeedRollupSettings(
+                rollup_type="NoRollup",
+                rollup_method="None",
+            ),
+            viewer_emails=["viewers"],
+            access_mode="Private",
+            action_link_template="action link template"
         )
 
+
     def _create_alert_config_for_update(self, name):
         detection_config, data_feed = self._create_data_feed_and_detection_config(name)
         alert_config_name = create_random_name(name)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py
index 9e4249765cb9..3c7cbee47757 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py
@@ -26,7 +26,6 @@
     DataFeedIngestionSettings,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
-    DataFeedOptions,
     MetricAlertConfiguration,
     MetricAnomalyAlertScope,
     MetricAnomalyAlertConditions,
@@ -225,23 +224,21 @@ def _create_data_feed_for_update(self, name):
                 ingestion_start_offset=-1,
                 stop_retry_after=-1,
             ),
-            options=DataFeedOptions(
-                admin_emails=["yournamehere@microsoft.com"],
-                data_feed_description="my first data feed",
-                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                    fill_type="SmartFilling"
-                ),
-                rollup_settings=DataFeedRollupSettings(
-                    rollup_type="NoRollup",
-                    rollup_method="None",
-                ),
-                viewer_emails=["viewers"],
-                access_mode="Private",
-                action_link_template="action link template"
-            )
-
+            admin_emails=["yournamehere@microsoft.com"],
+            data_feed_description="my first data feed",
+            missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                fill_type="SmartFilling"
+            ),
+            rollup_settings=DataFeedRollupSettings(
+                rollup_type="NoRollup",
+                rollup_method="None",
+            ),
+            viewer_emails=["viewers"],
+            access_mode="Private",
+            action_link_template="action link template"
         )
 
+
     def _create_alert_config_for_update(self, name):
         detection_config, data_feed = self._create_data_feed_and_detection_config(name)
         alert_config_name = create_random_name(name)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py
index 9cf86fa320df..31d1c5c07b2a 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py
@@ -21,7 +21,6 @@
     DataFeedSchema,
     DataFeedIngestionSettings,
     DataFeedGranularity,
-    DataFeedOptions,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
     AzureApplicationInsightsDataFeedSource,
@@ -95,21 +94,18 @@ def test_create_data_feed_from_sql_server(self):
                     ingestion_start_offset=-1,
                     stop_retry_after=-1,
                 ),
-                options=DataFeedOptions(
-                    admin_emails=["yournamehere@microsoft.com"],
-                    data_feed_description="my first data feed",
-                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                        fill_type="SmartFilling"
-                    ),
-                    rollup_settings=DataFeedRollupSettings(
-                        rollup_type="NoRollup",
-                        rollup_method="None",
-                    ),
-                    viewer_emails=["viewers"],
-                    access_mode="Private",
-                    action_link_template="action link template"
-                )
-
+                admin_emails=["yournamehere@microsoft.com"],
+                data_feed_description="my first data feed",
+                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                    fill_type="SmartFilling"
+                ),
+                rollup_settings=DataFeedRollupSettings(
+                    rollup_type="NoRollup",
+                    rollup_method="None",
+                ),
+                viewer_emails=["viewers"],
+                access_mode="Private",
+                action_link_template="action link template"
             )
             self.assertIsNotNone(data_feed.id)
             self.assertIsNotNone(data_feed.created_time)
@@ -134,14 +130,14 @@ def test_create_data_feed_from_sql_server(self):
             self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
             self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-            self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-            self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_type, "NoRollup")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_method, "None")
-            self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-            self.assertEqual(data_feed.options.access_mode, "Private")
-            self.assertEqual(data_feed.options.action_link_template, "action link template")
+            self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+            self.assertEqual(data_feed.data_feed_description, "my first data feed")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling")
+            self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup")
+            self.assertEqual(data_feed.rollup_settings.rollup_method, "None")
+            self.assertEqual(data_feed.viewer_emails, ["viewers"])
+            self.assertEqual(data_feed.access_mode, "Private")
+            self.assertEqual(data_feed.action_link_template, "action link template")
             self.assertEqual(data_feed.status, "Active")
             self.assertTrue(data_feed.is_admin)
             self.assertIsNotNone(data_feed.metric_ids)
@@ -184,23 +180,20 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
                     ingestion_start_offset=-1,
                     stop_retry_after=-1,
                 ),
-                options=DataFeedOptions(
-                    admin_emails=["yournamehere@microsoft.com"],
-                    data_feed_description="my first data feed",
-                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                        fill_type="CustomValue",
-                        custom_fill_value=10
-                    ),
-                    rollup_settings=DataFeedRollupSettings(
-                        rollup_type="AlreadyRollup",
-                        rollup_method="Sum",
-                        rollup_identification_value="sumrollup"
-                    ),
-                    viewer_emails=["viewers"],
-                    access_mode="Private",
-                    action_link_template="action link template"
-                )
-
+                admin_emails=["yournamehere@microsoft.com"],
+                data_feed_description="my first data feed",
+                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                    fill_type="CustomValue",
+                    custom_fill_value=10
+                ),
+                rollup_settings=DataFeedRollupSettings(
+                    rollup_type="AlreadyRollup",
+                    rollup_method="Sum",
+                    rollup_identification_value="sumrollup"
+                ),
+                viewer_emails=["viewers"],
+                access_mode="Private",
+                action_link_template="action link template"
             )
             self.assertIsNotNone(data_feed.id)
             self.assertIsNotNone(data_feed.created_time)
@@ -225,16 +218,16 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
             self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
             self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-            self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-            self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.custom_fill_value, 10)
-            self.assertEqual(data_feed.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-            self.assertEqual(data_feed.options.access_mode, "Private")
-            self.assertEqual(data_feed.options.action_link_template, "action link template")
+            self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+            self.assertEqual(data_feed.data_feed_description, "my first data feed")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10)
+            self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(data_feed.viewer_emails, ["viewers"])
+            self.assertEqual(data_feed.access_mode, "Private")
+            self.assertEqual(data_feed.action_link_template, "action link template")
             self.assertEqual(data_feed.status, "Active")
             self.assertTrue(data_feed.is_admin)
             self.assertIsNotNone(data_feed.metric_ids)
@@ -675,30 +668,30 @@ def test_update_data_feed_with_model(self):
         data_feed = self._create_data_feed_for_update("update")
         try:
             data_feed.name = "update"
-            data_feed.options.data_feed_description = "updated"
+            data_feed.data_feed_description = "updated"
             data_feed.schema.timestamp_column = "time"
             data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 10)
             data_feed.ingestion_settings.ingestion_start_offset = 1
             data_feed.ingestion_settings.data_source_request_concurrency = 1
             data_feed.ingestion_settings.ingestion_retry_delay = 1
             data_feed.ingestion_settings.stop_retry_after = 1
-            data_feed.options.rollup_settings.rollup_type = "AlreadyRollup"
-            data_feed.options.rollup_settings.rollup_method = "Sum"
-            data_feed.options.rollup_settings.rollup_identification_value = "sumrollup"
-            data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-            data_feed.options.missing_data_point_fill_settings.fill_type = "CustomValue"
-            data_feed.options.missing_data_point_fill_settings.custom_fill_value = 2
-            data_feed.options.access_mode = "Public"
-            data_feed.options.viewer_emails = ["updated"]
+            data_feed.rollup_settings.rollup_type = "AlreadyRollup"
+            data_feed.rollup_settings.rollup_method = "Sum"
+            data_feed.rollup_settings.rollup_identification_value = "sumrollup"
+            data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+            data_feed.missing_data_point_fill_settings.fill_type = "CustomValue"
+            data_feed.missing_data_point_fill_settings.custom_fill_value = 2
+            data_feed.access_mode = "Public"
+            data_feed.viewer_emails = ["updated"]
             data_feed.status = "Paused"
-            data_feed.options.action_link_template = "updated"
+            data_feed.action_link_template = "updated"
             data_feed.source.connection_string = "updated"
             data_feed.source.query = "get data"
 
             self.admin_client.update_data_feed(data_feed)
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            self.assertEqual(updated.options.data_feed_description, "updated")
+            self.assertEqual(updated.data_feed_description, "updated")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -706,15 +699,15 @@ def test_update_data_feed_with_model(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -751,7 +744,7 @@ def test_update_data_feed_with_kwargs(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            self.assertEqual(updated.options.data_feed_description, "updated")
+            self.assertEqual(updated.data_feed_description, "updated")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -759,15 +752,15 @@ def test_update_data_feed_with_kwargs(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -778,23 +771,23 @@ def test_update_data_feed_with_model_and_kwargs(self):
         data_feed = self._create_data_feed_for_update("update")
         try:
             data_feed.name = "updateMe"
-            data_feed.options.data_feed_description = "updateMe"
+            data_feed.data_feed_description = "updateMe"
             data_feed.schema.timestamp_column = "don't update me"
             data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 22)
             data_feed.ingestion_settings.ingestion_start_offset = 2
             data_feed.ingestion_settings.data_source_request_concurrency = 2
             data_feed.ingestion_settings.ingestion_retry_delay = 2
             data_feed.ingestion_settings.stop_retry_after = 2
-            data_feed.options.rollup_settings.rollup_type = "don't update me"
-            data_feed.options.rollup_settings.rollup_method = "don't update me"
-            data_feed.options.rollup_settings.rollup_identification_value = "don't update me"
-            data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-            data_feed.options.missing_data_point_fill_settings.fill_type = "don't update me"
-            data_feed.options.missing_data_point_fill_settings.custom_fill_value = 4
-            data_feed.options.access_mode = "don't update me"
-            data_feed.options.viewer_emails = ["don't update me"]
+            data_feed.rollup_settings.rollup_type = "don't update me"
+            data_feed.rollup_settings.rollup_method = "don't update me"
+            data_feed.rollup_settings.rollup_identification_value = "don't update me"
+            data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+            data_feed.missing_data_point_fill_settings.fill_type = "don't update me"
+            data_feed.missing_data_point_fill_settings.custom_fill_value = 4
+            data_feed.access_mode = "don't update me"
+            data_feed.viewer_emails = ["don't update me"]
             data_feed.status = "don't update me"
-            data_feed.options.action_link_template = "don't update me"
+            data_feed.action_link_template = "don't update me"
             data_feed.source.connection_string = "don't update me"
             data_feed.source.query = "don't update me"
 
@@ -823,7 +816,7 @@ def test_update_data_feed_with_model_and_kwargs(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "updateMe")
-            self.assertEqual(updated.options.data_feed_description, "updateMe")
+            self.assertEqual(updated.data_feed_description, "updateMe")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -831,15 +824,15 @@ def test_update_data_feed_with_model_and_kwargs(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -872,7 +865,7 @@ def test_update_data_feed_by_reseting_properties(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            # self.assertEqual(updated.options.data_feed_description, "")  # doesn't currently clear
+            # self.assertEqual(updated.data_feed_description, "")  # doesn't currently clear
             # self.assertEqual(updated.schema.timestamp_column, "")  # doesn't currently clear
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2019, 10, 1, tzinfo=tzutc()))
@@ -880,15 +873,15 @@ def test_update_data_feed_by_reseting_properties(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, -1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "None")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None)
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0)
-            self.assertEqual(updated.options.access_mode, "Private")
-            # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear
+            self.assertEqual(updated.rollup_settings.rollup_type, "NoRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "None")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, None)
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0)
+            self.assertEqual(updated.access_mode, "Private")
+            # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear
             self.assertEqual(updated.status, "Active")
-            # self.assertEqual(updated.options.action_link_template, "updated")  # doesn't currently clear
+            # self.assertEqual(updated.action_link_template, "updated")  # doesn't currently clear
 
         finally:
             self.admin_client.delete_data_feed(data_feed.id)
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py
index 8da48c70dfa2..09bed2116835 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py
@@ -21,7 +21,6 @@
     DataFeedSchema,
     DataFeedIngestionSettings,
     DataFeedGranularity,
-    DataFeedOptions,
     DataFeedMissingDataPointFillSettings,
     DataFeedRollupSettings,
     AzureApplicationInsightsDataFeedSource,
@@ -95,22 +94,20 @@ def test_create_data_feed_from_sql_server(self):
                     ingestion_start_offset=-1,
                     stop_retry_after=-1,
                 ),
-                options=DataFeedOptions(
-                    admin_emails=["yournamehere@microsoft.com"],
-                    data_feed_description="my first data feed",
-                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                        fill_type="SmartFilling"
-                    ),
-                    rollup_settings=DataFeedRollupSettings(
-                        rollup_type="NoRollup",
-                        rollup_method="None",
-                    ),
-                    viewer_emails=["viewers"],
-                    access_mode="Private",
-                    action_link_template="action link template"
-                )
-
+                admin_emails=["yournamehere@microsoft.com"],
+                data_feed_description="my first data feed",
+                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                    fill_type="SmartFilling"
+                ),
+                rollup_settings=DataFeedRollupSettings(
+                    rollup_type="NoRollup",
+                    rollup_method="None",
+                ),
+                viewer_emails=["viewers"],
+                access_mode="Private",
+                action_link_template="action link template"
             )
+
             self.assertIsNotNone(data_feed.id)
             self.assertIsNotNone(data_feed.created_time)
             self.assertIsNotNone(data_feed.name)
@@ -134,14 +131,14 @@ def test_create_data_feed_from_sql_server(self):
             self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
             self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-            self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-            self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_type, "NoRollup")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_method, "None")
-            self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-            self.assertEqual(data_feed.options.access_mode, "Private")
-            self.assertEqual(data_feed.options.action_link_template, "action link template")
+            self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+            self.assertEqual(data_feed.data_feed_description, "my first data feed")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling")
+            self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup")
+            self.assertEqual(data_feed.rollup_settings.rollup_method, "None")
+            self.assertEqual(data_feed.viewer_emails, ["viewers"])
+            self.assertEqual(data_feed.access_mode, "Private")
+            self.assertEqual(data_feed.action_link_template, "action link template")
             self.assertEqual(data_feed.status, "Active")
             self.assertTrue(data_feed.is_admin)
             self.assertIsNotNone(data_feed.metric_ids)
@@ -184,23 +181,20 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
                     ingestion_start_offset=-1,
                     stop_retry_after=-1,
                 ),
-                options=DataFeedOptions(
-                    admin_emails=["yournamehere@microsoft.com"],
-                    data_feed_description="my first data feed",
-                    missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
-                        fill_type="CustomValue",
-                        custom_fill_value=10
-                    ),
-                    rollup_settings=DataFeedRollupSettings(
-                        rollup_type="AlreadyRollup",
-                        rollup_method="Sum",
-                        rollup_identification_value="sumrollup"
-                    ),
-                    viewer_emails=["viewers"],
-                    access_mode="Private",
-                    action_link_template="action link template"
-                )
-
+                admin_emails=["yournamehere@microsoft.com"],
+                data_feed_description="my first data feed",
+                missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings(
+                    fill_type="CustomValue",
+                    custom_fill_value=10
+                ),
+                rollup_settings=DataFeedRollupSettings(
+                    rollup_type="AlreadyRollup",
+                    rollup_method="Sum",
+                    rollup_identification_value="sumrollup"
+                ),
+                viewer_emails=["viewers"],
+                access_mode="Private",
+                action_link_template="action link template"
             )
             self.assertIsNotNone(data_feed.id)
             self.assertIsNotNone(data_feed.created_time)
@@ -225,16 +219,16 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
             self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1)
             self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1)
-            self.assertIn("yournamehere@microsoft.com", data_feed.options.admin_emails)
-            self.assertEqual(data_feed.options.data_feed_description, "my first data feed")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(data_feed.options.missing_data_point_fill_settings.custom_fill_value, 10)
-            self.assertEqual(data_feed.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(data_feed.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(data_feed.options.viewer_emails, ["viewers"])
-            self.assertEqual(data_feed.options.access_mode, "Private")
-            self.assertEqual(data_feed.options.action_link_template, "action link template")
+            self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails)
+            self.assertEqual(data_feed.data_feed_description, "my first data feed")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10)
+            self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(data_feed.viewer_emails, ["viewers"])
+            self.assertEqual(data_feed.access_mode, "Private")
+            self.assertEqual(data_feed.action_link_template, "action link template")
             self.assertEqual(data_feed.status, "Active")
             self.assertTrue(data_feed.is_admin)
             self.assertIsNotNone(data_feed.metric_ids)
@@ -675,30 +669,30 @@ def test_update_data_feed_with_model(self):
         data_feed = self._create_data_feed_for_update("update")
         try:
             data_feed.name = "update"
-            data_feed.options.data_feed_description = "updated"
+            data_feed.data_feed_description = "updated"
             data_feed.schema.timestamp_column = "time"
             data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 10)
             data_feed.ingestion_settings.ingestion_start_offset = 1
             data_feed.ingestion_settings.data_source_request_concurrency = 1
             data_feed.ingestion_settings.ingestion_retry_delay = 1
             data_feed.ingestion_settings.stop_retry_after = 1
-            data_feed.options.rollup_settings.rollup_type = "AlreadyRollup"
-            data_feed.options.rollup_settings.rollup_method = "Sum"
-            data_feed.options.rollup_settings.rollup_identification_value = "sumrollup"
-            data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-            data_feed.options.missing_data_point_fill_settings.fill_type = "CustomValue"
-            data_feed.options.missing_data_point_fill_settings.custom_fill_value = 2
-            data_feed.options.access_mode = "Public"
-            data_feed.options.viewer_emails = ["updated"]
+            data_feed.rollup_settings.rollup_type = "AlreadyRollup"
+            data_feed.rollup_settings.rollup_method = "Sum"
+            data_feed.rollup_settings.rollup_identification_value = "sumrollup"
+            data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+            data_feed.missing_data_point_fill_settings.fill_type = "CustomValue"
+            data_feed.missing_data_point_fill_settings.custom_fill_value = 2
+            data_feed.access_mode = "Public"
+            data_feed.viewer_emails = ["updated"]
             data_feed.status = "Paused"
-            data_feed.options.action_link_template = "updated"
+            data_feed.action_link_template = "updated"
             data_feed.source.connection_string = "updated"
             data_feed.source.query = "get data"
 
             self.admin_client.update_data_feed(data_feed)
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            self.assertEqual(updated.options.data_feed_description, "updated")
+            self.assertEqual(updated.data_feed_description, "updated")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -706,15 +700,15 @@ def test_update_data_feed_with_model(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -751,7 +745,7 @@ def test_update_data_feed_with_kwargs(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            self.assertEqual(updated.options.data_feed_description, "updated")
+            self.assertEqual(updated.data_feed_description, "updated")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -759,15 +753,15 @@ def test_update_data_feed_with_kwargs(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -778,23 +772,23 @@ def test_update_data_feed_with_model_and_kwargs(self):
         data_feed = self._create_data_feed_for_update("update")
         try:
             data_feed.name = "updateMe"
-            data_feed.options.data_feed_description = "updateMe"
+            data_feed.data_feed_description = "updateMe"
             data_feed.schema.timestamp_column = "don't update me"
             data_feed.ingestion_settings.ingestion_begin_time = datetime.datetime(2020, 12, 22)
             data_feed.ingestion_settings.ingestion_start_offset = 2
             data_feed.ingestion_settings.data_source_request_concurrency = 2
             data_feed.ingestion_settings.ingestion_retry_delay = 2
             data_feed.ingestion_settings.stop_retry_after = 2
-            data_feed.options.rollup_settings.rollup_type = "don't update me"
-            data_feed.options.rollup_settings.rollup_method = "don't update me"
-            data_feed.options.rollup_settings.rollup_identification_value = "don't update me"
-            data_feed.options.rollup_settings.auto_rollup_group_by_column_names = []
-            data_feed.options.missing_data_point_fill_settings.fill_type = "don't update me"
-            data_feed.options.missing_data_point_fill_settings.custom_fill_value = 4
-            data_feed.options.access_mode = "don't update me"
-            data_feed.options.viewer_emails = ["don't update me"]
+            data_feed.rollup_settings.rollup_type = "don't update me"
+            data_feed.rollup_settings.rollup_method = "don't update me"
+            data_feed.rollup_settings.rollup_identification_value = "don't update me"
+            data_feed.rollup_settings.auto_rollup_group_by_column_names = []
+            data_feed.missing_data_point_fill_settings.fill_type = "don't update me"
+            data_feed.missing_data_point_fill_settings.custom_fill_value = 4
+            data_feed.access_mode = "don't update me"
+            data_feed.viewer_emails = ["don't update me"]
             data_feed.status = "don't update me"
-            data_feed.options.action_link_template = "don't update me"
+            data_feed.action_link_template = "don't update me"
             data_feed.source.connection_string = "don't update me"
             data_feed.source.query = "don't update me"
 
@@ -823,7 +817,7 @@ def test_update_data_feed_with_model_and_kwargs(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "updateMe")
-            self.assertEqual(updated.options.data_feed_description, "updateMe")
+            self.assertEqual(updated.data_feed_description, "updateMe")
             self.assertEqual(updated.schema.timestamp_column, "time")
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2020, 12, 10, tzinfo=tzutc()))
@@ -831,15 +825,15 @@ def test_update_data_feed_with_model_and_kwargs(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 1)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, 1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, 1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "AlreadyRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "Sum")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, "sumrollup")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "CustomValue")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 2)
-            self.assertEqual(updated.options.access_mode, "Public")
-            self.assertEqual(updated.options.viewer_emails, ["updated"])
+            self.assertEqual(updated.rollup_settings.rollup_type, "AlreadyRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "Sum")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, "sumrollup")
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2)
+            self.assertEqual(updated.access_mode, "Public")
+            self.assertEqual(updated.viewer_emails, ["updated"])
             self.assertEqual(updated.status, "Paused")
-            self.assertEqual(updated.options.action_link_template, "updated")
+            self.assertEqual(updated.action_link_template, "updated")
             self.assertEqual(updated.source.query, "get data")
 
         finally:
@@ -872,7 +866,7 @@ def test_update_data_feed_by_reseting_properties(self):
             )
             updated = self.admin_client.get_data_feed(data_feed.id)
             self.assertEqual(updated.name, "update")
-            # self.assertEqual(updated.options.data_feed_description, "")  # doesn't currently clear
+            # self.assertEqual(updated.data_feed_description, "")  # doesn't currently clear
             # self.assertEqual(updated.schema.timestamp_column, "")  # doesn't currently clear
             self.assertEqual(updated.ingestion_settings.ingestion_begin_time,
                              datetime.datetime(2019, 10, 1, tzinfo=tzutc()))
@@ -880,15 +874,15 @@ def test_update_data_feed_by_reseting_properties(self):
             self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0)
             self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1)
             self.assertEqual(updated.ingestion_settings.stop_retry_after, -1)
-            self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup")
-            self.assertEqual(updated.options.rollup_settings.rollup_method, "None")
-            self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None)
-            self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling")
-            self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0)
-            self.assertEqual(updated.options.access_mode, "Private")
-            # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear
+            self.assertEqual(updated.rollup_settings.rollup_type, "NoRollup")
+            self.assertEqual(updated.rollup_settings.rollup_method, "None")
+            self.assertEqual(updated.rollup_settings.rollup_identification_value, None)
+            self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling")
+            self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0)
+            self.assertEqual(updated.access_mode, "Private")
+            # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear
             self.assertEqual(updated.status, "Active")
-            # self.assertEqual(updated.options.action_link_template, "updated")  # doesn't currently clear
+            # self.assertEqual(updated.action_link_template, "updated")  # doesn't currently clear
 
         finally:
             self.admin_client.delete_data_feed(data_feed.id)