diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7ab4cd3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/workspace.xml
+/.idea/inspectionProfiles/profiles_settings.xml
+/.idea
+.idea
+.DS_Store
diff --git a/README.md b/README.md
index ffa7b29..3519715 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,19 @@
-# sample-code-python
\ No newline at end of file
+# Python Sample Code 
+
+## About
+
+This repository includes code samples to use EnOS™ APIs in Python. To learn more about EnOS™ APIs, see [EnOS API Documentation](https://support.envisioniot.com/docs/api/en/2.4.0/overview.html).
+
+
+## Prerequisites
+
+Before using the code samples, complete the tasks described in [Using Python SDK](https://support.envisioniot.com/docs/api/en/2.4.0/gettingstarted.html#using-python-sdk).
+
+
+## Using the Code Samples
+
+You need to replace the [environment variables](environment_variables.md) with the actual values you want to use. 
+
+## Release Notes
+
+2022/12/30
\ No newline at end of file
diff --git a/alert/alertApp.py b/alert/alertApp.py
new file mode 100644
index 0000000..dfe1c70
--- /dev/null
+++ b/alert/alertApp.py
@@ -0,0 +1,798 @@
+#Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+
+Severity_ID = "Python_Severity_ID"
+Type_ID = "Python_Type_ID"
+Type_ID_Child = "Python_Type_ID_Child"
+Content_ID = "Python_Content_ID"
+Rule_ID = "Python_Rule_ID"
+
+def alertGeneral(accessKey, secretKey, orgId, url):
+
+    '''
+    1. Alert Severity
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_severity.html
+    '''
+    # CreateAlertSeverity_py.createAlertSeverity(accessKey, secretKey, orgId, url)
+
+    # DeleteAlertSeverity_py.deleteAlertSeverity(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Severity with pagination'''
+    # SearchAlertSeverity_py.searchAlertSeverity(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Severity with expression using severityId'''
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "severityId ='" + Severity_ID + "'")
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "severityId in ('" + Severity_ID + "')")
+
+    '''Search Alert Severity with expression using tags'''
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "tags.SeverityKey1 = 'SeverityValue1'")
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "severityId = 'Severity_ID' and tags.SeverityKey1 = 'SeverityValue1'")
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "severityId = 'Severity_ID' or tags.SeverityKey1 = 'SeverityValue1'")
+    # SearchAlertSeverity_py.searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, "tags.SeverityKey1 = 'SeverityValue1' or tags.NewSeverityKey1 = 'NewSeverityValue1'")
+
+    # UpdateAlertSeverity_py.updateAlertSeverity(accessKey, secretKey, orgId, url)
+
+    '''
+    2. Alert Type
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_type.html
+    '''
+    # CreateAlertType_py.createAlertType(accessKey, secretKey, orgId, url)
+    # CreateAlertType_py.createAlertType_addParent(accessKey, secretKey, orgId, url)
+
+    # DeleteAlertType_py.deleteAlertType(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Type with pagination'''
+    # SearchAlertType_py.searchAlertType(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Type with expression using typeId'''
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "typeId ='" + Type_ID + "'")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "typeId in ('" + Type_ID + "')")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "typeId = 'Python_Type_ID' or typeId = 'Python_Type_ID_Child'")
+
+    '''Search Alert Type with expression using parent typeId'''
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "parentTypeId ='" + Type_ID + "'")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "parentTypeId in ('" + Type_ID + "')")
+
+    '''Search Alert Type with expression using tags'''
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "tags.TypeKey1 = 'TypeValue1'")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "typeId = 'Type_ID' and tags.TypeKey1 = 'TypeValue1'")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "typeId = 'Python_Type_ID' or tags.TypeKey1 = 'TypeValue1'")
+    # SearchAlertType_py.searchAlertType_Expression(accessKey, secretKey, orgId, url, "tags.TypeKey1 = 'TypeValue1' or tags.NewTypeKey1 = 'NewTypeValue1'")
+
+    # UpdateAlertType_py.updateAlertType(accessKey, secretKey, orgId, url)
+    # UpdateAlertType_py.updateAlertType_withParent(accessKey,secretKey, orgId, url)
+
+    '''
+    3. Alert Content
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_content.html
+    '''
+    # CreateAlertContent_py.createAlertContent(accessKey, secretKey, orgId, url)
+
+    # GetAlertContent_py.getAlertContent(accessKey, secretKey, orgId, url)
+
+    # DeleteAlertContent_py.deleteAlertContent(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Content with pagination'''
+    # SearchAlertContent_py.searchAlertContent(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Content with model ID'''
+    # SearchAlertContent_py.searchAlertContent_modelId(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Content with alert Type ID'''
+    # SearchAlertContent_py.searchAlertContent_alertTypeId(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Content with sub Alert Type ID'''
+    # SearchAlertContent_py.searchAlertContent_subAlertTypeId(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Content with expression using content ID'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentId ='" + Content_ID + "'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentId in ('" + Content_ID + "')")
+
+    '''Search Alert Content with expression using model ID'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "modelId ='" + ModelId + "'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "modelId in ('" + ModelId + "')")
+
+    '''Search Alert Content with expression using alert Type ID'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "alertTypeId ='" + Type_ID + "'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "alertTypeId in ('" + Type_ID + "')")
+
+    '''Search Alert Content with expression using sub Alert Type ID'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "subAlertTypeId ='" + Type_ID + "'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "subAlertTypeId in ('" + Type_ID + "')")
+
+    '''Search Alert Content with expression using contentDesc'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc like 'Default_Contents'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.default like 'Default_Contents'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.default like 'Default'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.en_US like 'Contents'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.zh_CN like '内容'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.zh_CN like '内'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.ja_JP like 'コンテンツ'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.ja_JP like 'ンツ'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.es_ES like 'Contenido'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentDesc.es_ES like 'Conten'")
+
+    '''Search Alert Content with expression using tags'''
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "tags.ContentKey1 = 'ContentValue1'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "tags.NewContentKey1 = 'NewContentValue1'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "tags.ContentKey1 = 'ContentValue1' or  tags.NewContentKey1 = 'NewContentValue1'")
+    # SearchAlertContent_py.searchAlertContent_Expression(accessKey, secretKey, orgId, url, "contentId = 'Python_Content_ID' and tags.ContentKey1 = 'ContentValue1'")
+
+    # UpdateAlertContent_py.updateAlertContent(accessKey, secretKey, orgId, url)
+
+    '''
+    4. Alert Rule
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_rule.html
+    '''
+    # CreateAlertRule_py.createAlertRule(accessKey, secretKey, orgId, url)
+
+    # CreateAlertRule_py.createAlertRule_measurepointIdCondition(accessKey, secretKey, orgId, url, "Python_Rule_ID1", "Int_MeasurementPoint", "${Int_MeasurementPoint} < 100")
+    # CreateAlertRule_py.createAlertRule_measurepointIdCondition(accessKey, secretKey, orgId, url, "Python_Rule_ID2", "Int_MeasurementPoint", "(${Int_MeasurementPoint} < 100) and (${Int_MeasurementPoint} > 50)")
+    # CreateAlertRule_py.createAlertRule_measurepointIdCondition(accessKey, secretKey, orgId, url, "Python_Rule_ID3", "Int_MeasurementPoint", "(${Int_MeasurementPoint} < 100) and (${Int_MeasurementPoint} > 50) and (${Int_MeasurementPoint} = 25)")
+    # CreateAlertRule_py.createAlertRule_measurepointIdCondition(accessKey, secretKey, orgId, url, "Python_Rule_ID4", "Int_MeasurementPoint", "(${Int_MeasurementPoint} < 100) and ((${Int_MeasurementPoint} > 50) and (${Int_MeasurementPoint} = 25))")
+    # CreateAlertRule_py.createAlertRule_deviceStatusCondition(accessKey, secretKey, orgId, url, "Python_Rule_ID5", "${Int_MeasurementPoint} < 100")
+    # CreateAlertRule_py.createAlertRule_scope(accessKey, secretKey, orgId, url, "Python_Rule_ID6", "LlrLCZqt", "AvxV8hkR")
+
+    # SearchAlertRule_py.searchAlertRule(accessKey, secretKey, orgId, url)
+    # SearchAlertRule_py.searchAlertRule_modelId(accessKey, secretKey, orgId, url)
+    # SearchAlertRule_py.searchAlertRule_measurepointId(accessKey, secretKey, orgId, url)
+
+    '''Search Alert Rule with expression using rule ID'''
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "ruleId ='" + Rule_ID + "'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "ruleId in ('" + Rule_ID + "')")
+
+    '''Search Alert Rule with expression using model ID'''
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "modelId ='" + ModelId + "'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "modelId in ('" + ModelId + "')")
+
+    '''Search Alert Rule with expression using measure point ID'''
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "measurepointId  = 'Int_MeasurementPoint'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "measurepointId  in ('Int_MeasurementPoint')")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "measurepointId  is null")
+
+    '''Search Alert Rule with expression using device status'''
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "deviceStatus ='offline'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline')")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "deviceStatus is null")
+
+    '''Search Alert Rule with expression using tags'''
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "tags.RuleKey1 = 'RuleValue1'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "tags.NewRuleKey1 = 'NewRuleValue1'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "tags.RuleKey1 = 'RuleValue1' or  tags.NewRuleKey1 = 'NewRuleValue1'")
+    # SearchAlertRule_py.searchAlertRule_Expression(accessKey, secretKey, orgId, url, "ruleId = 'Python_Rule_ID' and tags.RuleKey1 = 'RuleValue1'")
+
+    # UpdateAlertRule_py.updateAlertRule_measurepointId(accessKey, secretKey, orgId, url)
+    # UpdateAlertRule_py.updateAlertRule_deviceStatus(accessKey, secretKey, orgId, url)
+
+    # DeleteAlertRule_py.deleteAlertRule(accessKey, secretKey, orgId, url)
+    # for i in range(6):
+    #     print("Python_Rule_ID" + str(i+1))
+    #     DeleteAlertRule_py.deleteAlertRule_ruleId(accessKey, secretKey, orgId, url, "Python_Rule_ID" + str(i+1))
+
+    '''
+    5. Alert Record - Old Version
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_alert_record_old.html
+    '''
+
+    '''
+    5.1 Active Alert Record
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_active_alert.html
+    '''
+    # alertId_measurepointId = CreateActiveAlert_py.createActiveAlert_measurepointId(accessKey, secretKey, orgId, url)
+    # alertId_deviceStatus = CreateActiveAlert_py.createActiveAlert_deviceStatus(accessKey, secretKey, orgId, url)
+
+    # alertId_measurepointIdBatch = CreateActiveAlertBatch_py.createActiveAlertBatch_measurepointId(accessKey, secretKey, orgId, url)
+    # alertId_deviceStatusBatch = CreateActiveAlertBatch_py.createActiveAlertBatch_deviceStatus(accessKey, secretKey, orgId, url)
+    # alertId_mixBatch = CreateActiveAlertBatch_py.createActiveAlertBatch_mix(accessKey,secretKey, orgId, url)
+
+    # DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, "202202170473a2db0b15bd8ea731577f5b3a9098")
+    # DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, alertId_measurepointId)
+    # DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, alertId_deviceStatus)
+
+    # for id in alertId_measurepointIdBatch:
+    #     DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, id)
+
+    # for id in alertId_deviceStatusBatch:
+    #     DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, id)
+
+    # for id in alertId_mixBatch:
+    #     DeleteActiveAlert_py.deleteActiveAlert(accessKey, secretKey, orgId, url, id)
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "contentId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "assetId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "modelId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "measurepointId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "severityId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "typeId")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, "subTypeId")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, "2020-12-31 12:00:00", "2021-12-31 12:00:00")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, "2020-12-31 12:00:00")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, endTime = "2022-12-31 12:00:00")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus = 'offline'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus != 'offline'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId = 'Python_Demo_Model'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId in ('Python_Demo_Model','demo_lift_model')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId != 'Python_Demo_Model'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId = 'AvxV8hkR'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId in ('AvxV8hkR','0EbRVlqx')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId != 'AvxV8hkR'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId = 'Int_MeasurementPoint'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId in ('Int_MeasurementPoint','temp')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId != 'Int_MeasurementPoint'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'AA_severityId'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ('AA_severityId','Warning')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'AA_severityId'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'AA_typeId'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ('AA_typeId','type')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'AA_typeId'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId = 'AA_subTypeId'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId in ('AA_subTypeId','subtype')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId != 'AA_subTypeId'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'AA_contentId'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ('AA_contentId','contentId 1')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'AA_contentId'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 3")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in (3, 1)")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 3")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId = '20220216bda8a9d8e1594910e3296da7e3e8281f'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId in ('20220216bda8a9d8e1594910e3296da7e3e8281f','20220118243abcea80961167d6b876a87a116977')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId != '20220216bda8a9d8e1594910e3296da7e3e8281f'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId = '100765'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId in ('100765','100754')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId != '100765'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetPath like 'assetIdx'")
+
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 = 'ActiveAlertValue1'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 in ('ActiveAlertValue1','tag')")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 != 'ActiveAlertValue10'")
+    # AggregateActiveAlerts_py.aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tag.ActiveAlertKey1)")
+
+    '''Search Active Alerts with pagination'''
+    # SearchActiveAlerts_py.searchActiveAlerts(accessKey, secretKey, orgId, url)
+
+    '''Search Active Alerts with model ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_modelId(accessKey, secretKey, orgId, url)
+
+    '''Search Active Alerts with asset ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_assetId(accessKey, secretKey, orgId, url)
+
+    '''Search Active Alerts with measurepoint ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_measurepointId(accessKey, secretKey, orgId, url)
+
+    '''Search Active Alerts with startOccurTime and endOccurTime'''
+    # SearchActiveAlerts_py.searchActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, "2020-12-31 12:00:00", "2021-12-31 12:00:00")
+    # SearchActiveAlerts_py.searchActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, "2020-12-31 12:00:00")
+    # SearchActiveAlerts_py.searchActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, endTime = "2022-12-31 12:00:00")
+
+    '''Search Active Alerts with expression using deviceStatus'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus = 'offline'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline', 'online')")
+
+    '''Search Active Alerts with expression using model ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId = 'Python_Demo_Model'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId in ('Python_Demo_Model','demo_lift_model')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "modelId != 'Python_Demo_Model'")
+
+    '''Search Active Alerts with expression using asset ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId = 'AvxV8hkR'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId in ('AvxV8hkR','0EbRVlqx')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetId != 'AvxV8hkR'")
+
+    '''Search Active Alerts with expression using measurepoint ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId = 'Int_MeasurementPoint'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId in ('Int_MeasurementPoint','temp')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId != 'Int_MeasurementPoint'")
+
+    '''Search Active Alerts with expression using severity ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'AA_severityId'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ('AA_severityId','Warning')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'AA_severityId'")
+
+    '''Search Active Alerts with expression using type ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'AA_typeId'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ('AA_typeId','type')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'AA_typeId'")
+
+    '''Search Active Alerts with expression using subtype ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId = 'AA_subTypeId'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId in ('AA_subTypeId','subtype')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId != 'AA_subTypeId'")
+
+    '''Search Active Alerts with expression using content ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'AA_contentId'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ('AA_contentId','contentId 1')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'AA_contentId'")
+
+    '''Search Active Alerts with expression using event type'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 3")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in (3, 1)")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 3")
+
+    '''Search Active Alerts with expression using event ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId = '20220216bda8a9d8e1594910e3296da7e3e8281f'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId in ('20220216bda8a9d8e1594910e3296da7e3e8281f','20220118243abcea80961167d6b876a87a116977')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId != '20220216bda8a9d8e1594910e3296da7e3e8281f'")
+
+    '''Search Active Alerts with expression using tree ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "treeId = 'LlrLCZqt'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "treeId in ('LlrLCZqt','U22GDyrC')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "treeId != 'LlrLCZqt'")
+
+    '''Search Active Alerts with expression using hitRule ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId = '100765'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId in ('100765','100754')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId != '100765'")
+
+    '''Search Active Alerts with expression using asset path'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "assetPath like 'assetIdx'")
+
+    '''Search Active Alerts with expression using tag'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 = 'ActiveAlertValue1'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 in ('ActiveAlertValue1','tag')")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "tag.ActiveAlertKey1 != 'ActiveAlertValue10'")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tag.ActiveAlertKey1)")
+
+    '''Search Active Alerts with scope using tree ID and asset ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt")
+    # SearchActiveAlerts_py.searchActiveAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", "AvxV8hkR", True)
+    # SearchActiveAlerts_py.searchActiveAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", includeDerivative=True)
+
+    '''Search Active Alerts with Root Alert using event ID'''
+    # SearchActiveAlerts_py.searchActiveAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220216bda8a9d8e1594910e3296da7e3e8281f")
+    # SearchActiveAlerts_py.searchActiveAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220216bda8a9d8e1594910e3296da7e3e8281f", "LlrLCZqt")
+
+    # close_eventId = CreateActiveAlert_py.createActiveAlert_measurepointId(accessKey, secretKey, orgId, url)
+    # CloseActiveAlert_py.closeActiveAlert(accessKey, secretKey, orgId, url, close_eventId)
+
+    '''
+    5.2 History Alert Record
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_history_alert.html
+    '''
+
+    # CreateHistoryAlert_py.createHistoryAlert_measurepointId(accessKey, secretKey, orgId, url)
+    # CreateHistoryAlert_py.createHistoryAlert_deviceStatus(accessKey, secretKey, orgId, url)
+
+    # CreateHistoryAlertBatch_py.createHistoryAlertBatch_measurepointId(accessKey, secretKey, orgId, url)
+
+    # CreateHistoryAlertBatch_py.createHistoryAlertBatch_deviceStatus(accessKey, secretKey, orgId, url)
+
+    # CreateHistoryAlertBatch_py.createHistoryAlertBatch_mix(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with pagination'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with model ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_modelId(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with asset ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_assetId(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with measurepoint ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_measurepointId(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with recoverStartTime and recoverEndTime'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_recoverTime(accessKey, secretKey, orgId, url)
+
+    '''Search History Alerts with Expression using deviceStatus'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus = 'offline'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline', 'online')")
+
+    '''Search History Alerts with Expression using model ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId = 'Python_Demo_Model'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId in ('Python_Demo_Model','demo_lift_model')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId != 'Python_Demo_Model'")
+
+    '''Search History Alerts with Expression using asset ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId = 'AvxV8hkR'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId in ('AvxV8hkR','32CDx7FU')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId != 'AvxV8hkR'")
+
+    '''Search History Alerts with Expression using measurepoint ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId = 'Int_MeasurementPoint'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId in ('Int_MeasurementPoint','temp')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId != 'Int_MeasurementPoint'")
+
+    '''Search History Alerts with Expression using severity ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'HA_severityId'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ('HA_severityId','AA_severityId')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'HA_severityId'")
+
+    '''Search History Alerts with Expression using type ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'HA_typeId'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ('HA_typeId','AA_typeId')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'HA_typeId'")
+
+    '''Search History Alerts with Expression using subtype ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId = 'HA_subTypeId'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId in ('HA_subTypeId','AA_subTypeId')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId != 'HA_subTypeId'")
+
+    '''Search History Alerts with Expression using content ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'HA_contentId'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ('HA_contentId','AA_contentId')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'HA_contentId'")
+
+    '''Search History Alerts with Expression using event type'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 3")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in (3, 1)")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 3")
+
+    '''Search History Alerts with Expression using event ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId = '20220217251d703a8813bea81be069bb720871fe'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId in ('20220217251d703a8813bea81be069bb720871fe','202202174f4d5ca18aedf6c03275b5fb5531978b')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId != '20220217251d703a8813bea81be069bb720871fe'")
+
+    '''Search History Alerts with Expression using tree ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId = 'LlrLCZqt'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId in ('LlrLCZqt','U22GDyrC')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId != 'LlrLCZqt'")
+
+    '''Search History Alerts with Expression using hitrule ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId = '100765'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId in ('100765','100754')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId != '100765'")
+
+    '''Search History Alerts with Expression using asset path'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetPath like 'assetIdx'")
+
+    '''Search History Alerts with Expression using tag'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 = 'HistoryAlertValue1'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 in ('HistoryAlertValue1','tag')")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 != 'HistoryAlertValue10'")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tag.HistoryAlertKey1)")
+
+    '''Search History Alerts with Scope using treeID and asset ID'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", "AvxV8hkR", True)
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", includeDerivative=True)
+
+    '''Search History Alerts with RootAlert'''
+    # SearchHistoryAlerts_py.searchHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220217251d703a8813bea81be069bb720871fe")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220217251d703a8813bea81be069bb720871fe", "LlrLCZqt")
+
+    '''Incomplete'''
+    '''Scroll History Alerts'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts(accessKey, secretKey, orgId, url)
+
+    '''Scroll History Alerts with model ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_modelId(accessKey, secretKey, orgId, url)
+
+    '''Scroll History Alerts with asset ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_assetId(accessKey, secretKey, orgId, url)
+
+    '''Scroll History Alerts with measurepoint ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_measurepointsId(accessKey, secretKey, orgId, url)
+
+    '''Scroll History Alerts with recoverStartTime and recoverEndTime'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_recoverTime(accessKey, secretKey, orgId, url)
+
+    '''Scroll History Alerts with Expression using deviceStatus'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus = 'offline'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "deviceStatus in ('offline', 'online')")
+
+    '''Scroll History Alerts with Expression using model ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId = 'Python_Demo_Model'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId in ('Python_Demo_Model','demo_lift_model')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "modelId != 'Python_Demo_Model'")
+
+    '''Scroll History Alerts with Expression using asset ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId = 'AvxV8hkR'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId in ('AvxV8hkR','32CDx7FU')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetId != 'AvxV8hkR'")
+
+    '''Scroll History Alerts with Expression using measurepoint ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId = 'Int_MeasurementPoint'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId in ('Int_MeasurementPoint','temp')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "measurepointId != 'Int_MeasurementPoint'")
+
+    '''Scroll History Alerts with Expression using severity ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'HA_severityId'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ('HA_severityId','AA_severityId')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'HA_severityId'")
+
+    '''Scroll History Alerts with Expression using type ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'HA_typeId'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ('HA_typeId','AA_typeId')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'HA_typeId'")
+
+    '''Scroll History Alerts with Expression using subtype ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId = 'HA_subTypeId'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId in ('HA_subTypeId','AA_subTypeId')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "subTypeId != 'HA_subTypeId'")
+
+    '''Scroll History Alerts with Expression using content ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'HA_contentId'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ('HA_contentId','AA_contentId')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'HA_contentId'")
+
+    '''Scroll History Alerts with Expression using event type'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 3")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in (3, 1)")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 3")
+
+    '''Scroll History Alerts with Expression using event ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId = '20220217251d703a8813bea81be069bb720871fe'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId in ('20220217251d703a8813bea81be069bb720871fe','202202174f4d5ca18aedf6c03275b5fb5531978b')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId != '20220217251d703a8813bea81be069bb720871fe'")
+
+    '''Scroll History Alerts with Expression using tree ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId = 'LlrLCZqt'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId in ('LlrLCZqt','U22GDyrC')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "treeId != 'LlrLCZqt'")
+
+    '''Scroll History Alerts with Expression using hitrule ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId = '100765'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId in ('100765','100754')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "hitRuleId != '100765'")
+
+    '''Scroll History Alerts with Expression using asset path'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "assetPath like 'assetIdx'")
+
+    '''Scroll History Alerts with Expression using tag'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 = 'HistoryAlertValue1'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 in ('HistoryAlertValue1','tag')")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "tag.HistoryAlertKey1 != 'HistoryAlertValue10'")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tag.HistoryAlertKey1)")
+
+    '''Scroll History Alerts with Scope using treeID and asset ID'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", "AvxV8hkR", True)
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_Scope(accessKey, secretKey, orgId, url, "LlrLCZqt", includeDerivative=True)
+
+    '''Scroll History Alerts with RootAlert'''
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220217251d703a8813bea81be069bb720871fe")
+    # ScrollHistoryAlerts_py.scrollHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, "20220217251d703a8813bea81be069bb720871fe", "LlrLCZqt")
+
+
+    '''
+    5.3 Alert Tags
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_alert_tag.html
+    '''
+    # UpdateActiveAlertTags_py.updateActiveAlertTags(accessKey, secretKey, orgId, url, "2022021779042097cd896fa6b16b56f8f96df9a4")
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey,secretKey, orgId, url, "eventId = '2022021779042097cd896fa6b16b56f8f96df9a4'")
+
+    # UpdateHistoryAlertTags_py.updateHistoryAlertTags(accessKey, secretKey, orgId, url, "2022021702889da0ba242c4555de1cf79235e615")
+    # SearchHistoryAlerts_py.searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, "eventId = '2022021702889da0ba242c4555de1cf79235e615'")
+
+    # eventId_list = ["2022021779042097cd896fa6b16b56f8f96df9a4", "20220217b3dc06039e038602cef608b5ff2c7a72", "20220217ad40a5469adee2ba27cc01b9fb76e2aa"]
+    # BatchUpdateActiveAlertTags_py.batchUpdateActiveAlertTags(accessKey, secretKey, orgId, url, eventId_list)
+    # SearchActiveAlerts_py.searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, "eventId in " + str(tuple(eventId_list)))
+
+    '''
+    6. Alert Record - New Version
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/index_alert_record_new.html
+    '''
+
+    '''
+    6.1 History & Active Alert Records
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/index_alert_tag.html
+    '''
+    # CreateAlert_py.createAlert_ActiveAlert(accessKey, secretKey, orgId, url)
+    # CreateAlert_py.createAlert_HistoryAlert(accessKey, secretKey, orgId, url)
+
+    # BatchCreateAlerts_py.batchCreateAlert_ActiveAlert(accessKey, secretKey, orgId, url)
+    # BatchCreateAlerts_py.batchCreateAlert_HistoryAlert(accessKey, secretKey, orgId, url)
+    # BatchCreateAlerts_py.batchCreateAlert_mix(accessKey, secretKey, orgId, url)
+
+    '''Search Alerts with pagination'''
+    # SearchAlerts_py.searchAlerts(accessKey, secretKey, orgId, url)
+
+    '''Search Alerts with instance ID'''
+    # SearchAlerts_py.searchAlerts_instanceId(accessKey, secretKey, orgId, url)
+
+    '''Search Alerts with metric ID'''
+    # SearchAlerts_py.searchAlerts_metricId(accessKey, secretKey, orgId, url)
+
+    '''Search Alerts with startRecoverTime and endRecoverTime'''
+    # SearchAlerts_py.searchAlerts_recoverTime(accessKey, secretKey, orgId, url)
+
+    '''Search Alerts with active status(Active or History Alerts)'''
+    # Active Alert
+    # SearchAlerts_py.searchAlerts_active(accessKey, secretKey, orgId, url, "true")
+    # History Alert
+    # SearchAlerts_py.searchAlerts_active(accessKey, secretKey, orgId, url, "false")
+    # Both Active and History Alert
+    # SearchAlerts_py.searchAlerts_active(accessKey, secretKey, orgId, url, "null")
+
+    '''Search Alerts with expression using instance ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId = 'AvxV8hkR'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId in ( 'AvxV8hkR', 'ActiveAlert_instanceId')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId != 'AvxV8hkR'")
+
+    '''Search Alerts with expression using metric ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricId = 'Int_MeasurementPoint'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricId in ( 'Int_MeasurementPoint', 'ActiveAlert_metricId')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricId != 'Int_MeasurementPoint'")
+
+    '''Search Alerts with expression using severity ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'AA_newver_severityId'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ( 'AA_newver_severityId', 'HA_newver_severityId')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'AA_newver_severityId'")
+
+    '''Search Alerts with expression using type ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'AA_newver_typeId'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ( 'AA_newver_typeId', 'HA_newver_typeId 1')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'AA_newver_typeId 1'")
+
+    '''Search Alerts with expression using parent type ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId = 'parentTypeId'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId in ( 'parentTypeId', 'parentTypeId1')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId != 'parentTypeId'")
+
+    '''Search Alerts with expression using content ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'AA_newver_contentId'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ( 'AA_newver_contentId', 'yourContentId 1')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'AA_newver_contentId'")
+
+    '''Search Alerts with expression using rule ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId = 'AA_newver_ruleId'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId in ( 'AA_newver_ruleId', 'HA_newver_ruleId')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId != 'AA_newver_ruleId'")
+
+    '''Search Alerts with expression using event type'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 2")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in ( 2, 3)")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 2")
+
+    '''Search Alerts with expression using alert ID'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "alertId = '20220218c6636aac668c34de07e9a4f494a3f06f'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "alertId in ( '20220218c6636aac668c34de07e9a4f494a3f06f', '202202183b7c8f7dd021ebd35f873dd196994460')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "alertId != '20220218c6636aac668c34de07e9a4f494a3f06f'")
+
+    '''Search Alerts with expression using metric tags'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 = 'ActiveAlertMetricTagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 in ( 'ActiveAlertMetricTagValue1', 'ActiveAlertMetricTagValue2')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 != 'Alert ActiveAlertMetricTagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 like 'ActiveAlertMetricTagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "exists(metricTags.ActiveAlertMetricTagKey1)")
+
+    '''Search Alerts with expression using rule tags'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 = 'ActiveAlertRuletagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 in ( 'ActiveAlertRuletagValue1', 'ActiveAlertRuletagValue2')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 != 'ActiveAlertRuletagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 like 'ActiveAlertRuletagValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "exists(ruleTags.ActiveAlertRuletagKey1)")
+
+    '''Search Alerts with expression using tags'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 = 'ActiveAlert_newverValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 in ( 'ActiveAlert_newverValue1', 'ActiveAlert_newverValue2')")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 != 'ActiveAlert_newverValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 like 'ActiveAlert_newverValue1'")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tags.ActiveAlert_newverKey1)")
+
+    '''Search Alerts with expression using inhibited'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited = true")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited = false")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited != true")
+
+    '''Search Alerts with expression using maskedBy'''
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "maskedBy = 'test' ")
+
+    # CloseAlert_py.closeActiveAlert(accessKey, secretKey, orgId, url, "202202182d6ec4d749637cbbc5b73ff54d77ee1b")
+
+    '''Incomplete'''
+    '''Scroll Alerts'''
+    # ScrollAlerts_py.scrollAlerts(accessKey, secretKey, orgId, url)
+
+    '''Scroll Alerts with instance ID'''
+    # ScrollAlerts_py.scrollAlerts_instanceId(accessKey, secretKey, orgId, url)
+
+    '''Scroll Alerts with metric ID'''
+    # ScrollAlerts_py.scrollAlerts_metricId(accessKey, secretKey, orgId, url)
+
+    '''Scroll Alerts with startRecoverTime and endRecoverTime'''
+    # ScrollAlerts_py.scrollAlerts_recoverTime(accessKey, secretKey, orgId, url)
+
+    '''Scroll Alerts with active status(Active or History Alerts)'''
+    # Active Alert
+    # ScrollAlerts_py.scrollAlerts_active(accessKey, secretKey, orgId, url, "true")
+    # History Alert
+    # ScrollAlerts_py.scrollAlerts_active(accessKey, secretKey, orgId, url, "false")
+    # Both Active and History Alert
+    # ScrollAlerts_py.scrollAlerts_active(accessKey, secretKey, orgId, url, "null")
+
+    '''Scroll Alerts with expression using instance ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId = 'AvxV8hkR'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId in ( 'AvxV8hkR', 'ActiveAlert_instanceId')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "instanceId != 'AvxV8hkR'")
+
+    '''Scroll Alerts with expression using metric ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricId = 'Int_MeasurementPoint'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricId in ( 'Int_MeasurementPoint', 'ActiveAlert_metricId')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricId != 'Int_MeasurementPoint'")
+
+    '''Scroll Alerts with expression using severity ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "severityId = 'AA_newver_severityId'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "severityId in ( 'AA_newver_severityId', 'HA_newver_severityId')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "severityId != 'AA_newver_severityId'")
+
+    '''Scroll Alerts with expression using type ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "typeId = 'AA_newver_typeId'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "typeId in ( 'AA_newver_typeId', 'HA_newver_typeId 1')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "typeId != 'AA_newver_typeId 1'")
+
+    '''Scroll Alerts with expression using parent type ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId = 'parentTypeId'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId in ( 'parentTypeId', 'parentTypeId1')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "parentTypeId != 'parentTypeId'")
+
+    '''Scroll Alerts with expression using content ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "contentId = 'AA_newver_contentId'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "contentId in ( 'AA_newver_contentId', 'yourContentId 1')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "contentId != 'AA_newver_contentId'")
+
+    '''Scroll Alerts with expression using rule ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId = 'AA_newver_ruleId'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId in ( 'AA_newver_ruleId', 'HA_newver_ruleId')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleId != 'AA_newver_ruleId'")
+
+    '''Scroll Alerts with expression using event type'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "eventType = 2")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "eventType in ( 2, 3)")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "eventType != 2")
+
+    '''Scroll Alerts with expression using alert ID'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "alertId = '20220218c6636aac668c34de07e9a4f494a3f06f'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "alertId in ( '20220218c6636aac668c34de07e9a4f494a3f06f', '202202183b7c8f7dd021ebd35f873dd196994460')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "alertId != '20220218c6636aac668c34de07e9a4f494a3f06f'")
+
+    '''Scroll Alerts with expression using metric tags'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 = 'ActiveAlertMetricTagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 in ( 'ActiveAlertMetricTagValue1', 'ActiveAlertMetricTagValue2')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 != 'Alert ActiveAlertMetricTagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "metricTags.ActiveAlertMetricTagKey1 like 'ActiveAlertMetricTagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "exists(metricTags.ActiveAlertMetricTagKey1)")
+
+    '''Scroll Alerts with expression using rule tags'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 = 'ActiveAlertRuletagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 in ( 'ActiveAlertRuletagValue1', 'ActiveAlertRuletagValue2')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 != 'ActiveAlertRuletagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "ruleTags.ActiveAlertRuletagKey1 like 'ActiveAlertRuletagValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "exists(ruleTags.ActiveAlertRuletagKey1)")
+
+    '''Scroll Alerts with expression using tags'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 = 'ActiveAlert_newverValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 in ( 'ActiveAlert_newverValue1', 'ActiveAlert_newverValue2')")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 != 'ActiveAlert_newverValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "tags.ActiveAlert_newverKey1 like 'ActiveAlert_newverValue1'")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "exists(tags.ActiveAlert_newverKey1)")
+
+    '''Scroll Alerts with expression using inhibited'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited = true")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited = false")
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "inhibited != true")
+
+    '''Scroll Alerts with expression using maskedBy'''
+    # ScrollAlerts_py.scrollAlerts_Expression(accessKey, secretKey, orgId, url, "maskedBy = 'test' ")
+
+    '''
+    6.2 Alert Tags
+    https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/index_alert_tag.html
+    '''
+    # UpdateAlertTags_py.updateAlertTags(accessKey, secretKey, orgId, url, "20220218da6bbf975612b3714ab75970306e60b8")
+    # SearchAlerts_py.searchAlerts_Expression(accessKey,secretKey, orgId, url, "alertId = '20220218da6bbf975612b3714ab75970306e60b8'")
+
+    # alertId_list = ["20220218a4c5b2ba6d1be54336ba602dd46c805f", "202202188208c33af535209da6f97b0aef839428", "20220218c6636aac668c34de07e9a4f494a3f06f"]
+    # BatchUpdateAlertTags_py.batchUpdateAlertTags(accessKey, secretKey, orgId, url, alertId_list)
+    # SearchAlerts_py.searchAlerts_Expression(accessKey, secretKey, orgId, url, "alertId in " + str(tuple(alertId_list)))
+
+
+
+
+
diff --git a/alert/content/createAlertContent.py b/alert/content/createAlertContent.py
new file mode 100644
index 0000000..70499b0
--- /dev/null
+++ b/alert/content/createAlertContent.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAlertContent
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Create a new alert content
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_alert_content.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createAlertContent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertContent": {"contentId": "Python_Content_ID",
+                           "contentDesc": {"defaultValue": "Default_Contents",
+                                           "i18nValue": {"en_US": "Contents",
+                                                         "zh_CN": "内容",
+                                                         "ja_JP":"コンテンツ",
+                                                         "es_ES":"Contenido"}},
+                           "tags": {"ContentKey1": "ContentValue1",
+                                    "ContentKey2": "ContentValue2",
+                                    "ContentKey3": "ContentValue3"},
+                           "modelId": "Python_Demo_Model",
+                           "alertTypeId": "Python_Type_ID"}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/content/deleteAlertContent.py b/alert/content/deleteAlertContent.py
new file mode 100644
index 0000000..2303b97
--- /dev/null
+++ b/alert/content/deleteAlertContent.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAlertContent
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Delete an alert content. It cannot be deleted if it is used by other rules
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/delete_alert_content.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteAlertContent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "delete", "orgId": orgId, "alertContentId": "Python_Content_ID"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/content/getAlertContent.py b/alert/content/getAlertContent.py
new file mode 100644
index 0000000..10cb85c
--- /dev/null
+++ b/alert/content/getAlertContent.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAlertContent
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Get an alert content based on orgId and contentId
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/get_alert_content.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getAlertContent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "get", "orgId": orgId, "contentId": "Python_Content_ID"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/content/searchAlertContent.py b/alert/content/searchAlertContent.py
new file mode 100644
index 0000000..3e076cb
--- /dev/null
+++ b/alert/content/searchAlertContent.py
@@ -0,0 +1,91 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAlertContent
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Search for alert content based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/search_alert_content.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def searchAlertContent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pagination": {"pageNo": 1,
+                           "pageSize": 10}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertContent_modelId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"modelId": "Python_Demo_Model"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertContent_alertTypeId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertTypeId": "Python_Type_ID"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertContent_subAlertTypeId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"subAlertTypeId": "Python_Type_ID"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertContent_Expression(accessKey, secretKey, orgId, url, Expression):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"expression": Expression
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/content/updateAlertContent.py b/alert/content/updateAlertContent.py
new file mode 100644
index 0000000..68d2623
--- /dev/null
+++ b/alert/content/updateAlertContent.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAlertContent
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Update an alert content
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_alert_content.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAlertContent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-contents'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertContent": {"contentId": "Python_Content_ID",
+                           "contentDesc": {"defaultValue": "Updated_Default_Contents",
+                                           "i18nValue": {"en_US": "Updated_Contents",
+                                                         "zh_CN": "更新内容",
+                                                         "ja_JP":"更新された内容",
+                                                         "es_ES":"Contenidos Actualizados"}},
+                           "tags": {"NewContentKey1": "NewContentValue1",
+                                    "NewContentKey2": "NewContentValue2",
+                                    "NewContentKey3": "NewContentValue3"},
+                           "modelId": "Python_Demo_Model",
+                           "alertTypeId": "Python_Type_ID"}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/record/new/alertTags/batchUpdateAlertTags.py b/alert/record/new/alertTags/batchUpdateAlertTags.py
new file mode 100644
index 0000000..b09f3a6
--- /dev/null
+++ b/alert/record/new/alertTags/batchUpdateAlertTags.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: batchUpdateAlertTags
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description: Batch update the tags for the specified history and active alerts. The returned structure describes the update results of each alert. If an error message occurs, the error message will be recorded and the rest of the update will continue
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/batch_update_alert_tags.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def batchUpdateAlertTags(accessKey, secretKey, orgId, url, alertId_list):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "batchUpdateTags", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"alertIds": alertId_list,
+            "isPatchUpdate": True,
+            "tags": {"NewActiveAlert_newverKey1": "NewActiveAlert_newverValue1",
+                     "NewActiveAlert_newverKey2": "NewActiveAlert_newverValue2",
+                     "NewActiveAlert_newverKey3": "NewActiveAlert_newverValue3"},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/new/alertTags/updateAlertTags.py b/alert/record/new/alertTags/updateAlertTags.py
new file mode 100644
index 0000000..1aa19ea
--- /dev/null
+++ b/alert/record/new/alertTags/updateAlertTags.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAlertTags
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description:  Update history and active alert tags
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/update_alert_tags.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAlertTags(accessKey, secretKey, orgId, url, alertId):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "updateTags", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"alertId": alertId,
+            "isPatchUpdate": True,
+            "tags": {"NewActiveAlert_newverKey1": "NewActiveAlert_newverValue1",
+                     "NewActiveAlert_newverKey2": "NewActiveAlert_newverValue2",
+                     "NewActiveAlert_newverKey3": "NewActiveAlert_newverValue3"},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/record/new/historyAndActiveAlertRecords/batchCreateAlerts.py b/alert/record/new/historyAndActiveAlertRecords/batchCreateAlerts.py
new file mode 100644
index 0000000..a518db2
--- /dev/null
+++ b/alert/record/new/historyAndActiveAlertRecords/batchCreateAlerts.py
@@ -0,0 +1,371 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: batchCreateAlerts
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description: Batch create alert records, up to 1000 items at a time
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/batch_create_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def batchCreateAlert_ActiveAlert(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertVoList": [{"eventType": "3",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",
+                           "occurTime": current_utc,
+                           "recoverTime": current_utc,
+                           "value": "ActiveAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "AA1_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "AA1_newver_severityDescription",
+                                                          "zh_CN": "AA1_newver_严重性 描述",
+                                                          "ja_JP": "AA1_newver_重大度説明",
+                                                          "es_ES": "AA1_newver_severidad Descripción"}},
+                           "typeId": "AA1_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_AA1_newver_typeDescription",
+                                        "i18nValue": {"en_US": "AA1_newver_typeDescription",
+                                                      "zh_CN": "AA1_newver_类型描述",
+                                                      "ja_JP": "AA1_newver_タイプの説明",
+                                                      "es_ES": "AA1_newver_descripción del tipo"}},
+                           "parentTypeId": "AA1_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_AA1_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "AA1_newver_parentTypeDescription",
+                                                            "zh_CN": "AA1_newver_父类型描述",
+                                                            "ja_JP": "AA1_newver_親タイプの説明",
+                                                            "es_ES": "AA1_newver_descripción del tipo padre"}},
+                           "contentId": "AA1_newver_contentId",
+                           "content": {"defaultValue": "Default_AA1_newver_contentDescription",
+                                       "i18nValue": {"en_US": "AA1_newver_contentDescription",
+                                                     "zh_CN": "AA1_newver_内容",
+                                                     "ja_JP": "AA1_newver_ルールの説明",
+                                                     "es_ES": "AA1_newver_descripción de la regla"}},
+                           "ruleId": "AA1_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_AA1_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "AA1_newver_typeDescription",
+                                                      "zh_CN": "AA1_newver_类型描述",
+                                                      "ja_JP": "AA1_newver_タイプの説明",
+                                                      "es_ES": "AA1_newver_descripción del tipo"}},
+                           "tags": {"ActiveAlert1_newverKey1": "ActiveAlert1_newverValue1",
+                                    "ActiveAlert1_newverKey2": "ActiveAlert1_newverValue2",
+                                    "ActiveAlert1_newverKey3": "ActiveAlert1_newverValue3"},
+                           "ruleTags": {"ActiveAlert1RuletagKey1": "ActiveAlert1RuletagValue1",
+                                        "ActiveAlert1RuletagKey2": "ActiveAlert1RuletagValue2",
+                                        "ActiveAlert1RuletagKey3": "ActiveAlert1RuletagValue3"},
+                           "metrictags": {"ActiveAlert1MetricTagKey1": "ActiveAlert1MetricTagValue1",
+                                          "ActiveAlert1MetricTagKey2": "ActiveAlert1MetricTagValue2",
+                                          "ActiveAlert1MetricTagKey3": "ActiveAlert1MetricTagValue3"},
+                           "inhibited": False
+                           },
+                          {"eventType": "3",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",
+                           "occurTime": current_utc,
+                           "recoverTime": current_utc,
+                           "value": "ActiveAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "AA2_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "AA2_newver_severityDescription",
+                                                          "zh_CN": "AA2_newver_严重性 描述",
+                                                          "ja_JP": "AA2_newver_重大度説明",
+                                                          "es_ES": "AA2_newver_severidad Descripción"}},
+                           "typeId": "AA2_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_AA2_newver_typeDescription",
+                                        "i18nValue": {"en_US": "AA2_newver_typeDescription",
+                                                      "zh_CN": "AA2_newver_类型描述",
+                                                      "ja_JP": "AA2_newver_タイプの説明",
+                                                      "es_ES": "AA2_newver_descripción del tipo"}},
+                           "parentTypeId": "AA2_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_AA2_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "AA2_newver_parentTypeDescription",
+                                                            "zh_CN": "AA2_newver_父类型描述",
+                                                            "ja_JP": "AA2_newver_親タイプの説明",
+                                                            "es_ES": "AA2_newver_descripción del tipo padre"}},
+                           "contentId": "AA2_newver_contentId",
+                           "content": {"defaultValue": "Default_AA2_newver_contentDescription",
+                                       "i18nValue": {"en_US": "AA2_newver_contentDescription",
+                                                     "zh_CN": "AA2_newver_内容",
+                                                     "ja_JP": "AA2_newver_ルールの説明",
+                                                     "es_ES": "AA2_newver_descripción de la regla"}},
+                           "ruleId": "AA2_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_AA2_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "AA2_newver_typeDescription",
+                                                      "zh_CN": "AA2_newver_类型描述",
+                                                      "ja_JP": "AA2_newver_タイプの説明",
+                                                      "es_ES": "AA2_newver_descripción del tipo"}},
+                           "tags": {"ActiveAlert2_newverKey1": "ActiveAlert2_newverValue1",
+                                    "ActiveAlert2_newverKey2": "ActiveAlert2_newverValue2",
+                                    "ActiveAlert2_newverKey3": "ActiveAlert2_newverValue3"},
+                           "ruleTags": {"ActiveAlert2RuletagKey1": "ActiveAlert2RuletagValue1",
+                                        "ActiveAlert2RuletagKey2": "ActiveAlert2RuletagValue2",
+                                        "ActiveAlert2RuletagKey3": "ActiveAlert2RuletagValue3"},
+                           "metrictags": {"ActiveAlert2MetricTagKey1": "ActiveAlert2MetricTagValue1",
+                                          "ActiveAlert2MetricTagKey2": "ActiveAlert2MetricTagValue2",
+                                          "ActiveAlert2MetricTagKey3": "ActiveAlert2MetricTagValue3"},
+                           "inhibited": False
+                           }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def batchCreateAlert_HistoryAlert(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertVoList": [{"eventType": "2",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",  # measurementPoint
+                           "occurTime": current_utc,
+                           "value": "HistoryAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "recoverTime": current_utc,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "HA1_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "HA1_newver_severityDescription",
+                                                          "zh_CN": "HA1_newver_严重性 描述",
+                                                          "ja_JP": "HA1_newver_重大度説明",
+                                                          "es_ES": "HA1_newver_severidad Descripción"}},
+                           "typeId": "HA1_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_HA1_newver_typeDescription",
+                                        "i18nValue": {"en_US": "HA1_newver_typeDescription",
+                                                      "zh_CN": "HA1_newver_类型描述",
+                                                      "ja_JP": "HA1_newver_タイプの説明",
+                                                      "es_ES": "HA1_newver_descripción del tipo"}},
+                           "parentTypeId": "HA1_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_HA1_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "HA1_newver_parentTypeDescription",
+                                                            "zh_CN": "HA1_newver_父类型描述",
+                                                            "ja_JP": "HA1_newver_親タイプの説明",
+                                                            "es_ES": "HA1_newver_descripción del tipo padre"}},
+                           "contentId": "AA_newver_contentId",
+                           "content": {"defaultValue": "Default_HA1_newver_contentDescription",
+                                       "i18nValue": {"en_US": "HA1_newver_contentDescription",
+                                                     "zh_CN": "HA1_newver_规则说明",
+                                                     "ja_JP": "HA1_newver_ルールの説明",
+                                                     "es_ES": "HA1_newver_descripción de la regla"}},
+                           "ruleId": "HA1_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_HA1_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "HA1_newver_typeDescription",
+                                                      "zh_CN": "HA1_newver_类型描述",
+                                                      "ja_JP": "HA1_newver_タイプの説明",
+                                                      "es_ES": "HA1_newver_descripción del tipo"}},
+                           "tags": {"HistoryAlert1_newverKey1": "HistoryAlert1_newverValue1",
+                                    "HistoryAlert1_newverKey2": "HistoryAlert1_newverValue2",
+                                    "HistoryAlert1_newverKey3": "HistoryAlert1_newverValue3"},
+                           "ruleTags": {"HistoryAlert1RuletagKey1": "HistoryAlert1RuletagValue1",
+                                        "HistoryAlert1RuletagKey2": "HistoryAlert1RuletagValue2",
+                                        "HistoryAlert1RuletagKey3": "HistoryAlert1RuletagValue3"},
+                           "metrictags": {"HistoryAlert1MetricTagKey1": "HistoryAlert1MetricTagValue1",
+                                          "HistoryAlert1MetricTagKey2": "HistoryAlert1MetricTagValue2",
+                                          "HistoryAlert1MetricTagKey3": "HistoryAlert1MetricTagValue3"},
+                           "inhibited": False
+                           },
+                          {"eventType": "2",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",  # measurementPoint
+                           "occurTime": current_utc,
+                           "value": "HistoryAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "recoverTime": current_utc,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "HA2_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "HA2_newver_severityDescription",
+                                                          "zh_CN": "HA2_newver_严重性 描述",
+                                                          "ja_JP": "HA2_newver_重大度説明",
+                                                          "es_ES": "HA2_newver_severidad Descripción"}},
+                           "typeId": "HA2_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_HA2_newver_typeDescription",
+                                        "i18nValue": {"en_US": "HA2_newver_typeDescription",
+                                                      "zh_CN": "HA2_newver_类型描述",
+                                                      "ja_JP": "HA2_newver_タイプの説明",
+                                                      "es_ES": "HA2_newver_descripción del tipo"}},
+                           "parentTypeId": "HA2_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_HA2_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "HA2_newver_parentTypeDescription",
+                                                            "zh_CN": "HA2_newver_父类型描述",
+                                                            "ja_JP": "HA2_newver_親タイプの説明",
+                                                            "es_ES": "HA2_newver_descripción del tipo padre"}},
+                           "contentId": "AA_newver_contentId",
+                           "content": {"defaultValue": "Default_HA2_newver_contentDescription",
+                                       "i18nValue": {"en_US": "HA2_newver_contentDescription",
+                                                     "zh_CN": "HA2_newver_规则说明",
+                                                     "ja_JP": "HA2_newver_ルールの説明",
+                                                     "es_ES": "HA2_newver_descripción de la regla"}},
+                           "ruleId": "HA2_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_HA2_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "HA2_newver_typeDescription",
+                                                      "zh_CN": "HA2_newver_类型描述",
+                                                      "ja_JP": "HA2_newver_タイプの説明",
+                                                      "es_ES": "HA2_newver_descripción del tipo"}},
+                           "tags": {"HistoryAlert2_newverKey1": "HistoryAlert2_newverValue1",
+                                    "HistoryAlert2_newverKey2": "HistoryAlert2_newverValue2",
+                                    "HistoryAlert2_newverKey3": "HistoryAlert2_newverValue3"},
+                           "ruleTags": {"HistoryAlert2RuletagKey1": "HistoryAlert2RuletagValue1",
+                                        "HistoryAlert2RuletagKey2": "HistoryAlert2RuletagValue2",
+                                        "HistoryAlert2RuletagKey3": "HistoryAlert2RuletagValue3"},
+                           "metrictags": {"HistoryAlert2MetricTagKey1": "HistoryAlert2MetricTagValue1",
+                                          "HistoryAlert2MetricTagKey2": "HistoryAlert2MetricTagValue2",
+                                          "HistoryAlert2MetricTagKey3": "HistoryAlert2MetricTagValue3"},
+                           "inhibited": False
+                           }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def batchCreateAlert_mix(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertVoList": [{"eventType": "3",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",
+                           "occurTime": current_utc,
+                           "recoverTime": current_utc,
+                           "value": "ActiveAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "AA3_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "AA3_newver_severityDescription",
+                                                          "zh_CN": "AA3_newver_严重性 描述",
+                                                          "ja_JP": "AA3_newver_重大度説明",
+                                                          "es_ES": "AA3_newver_severidad Descripción"}},
+                           "typeId": "AA3_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_AA3_newver_typeDescription",
+                                        "i18nValue": {"en_US": "AA3_newver_typeDescription",
+                                                      "zh_CN": "AA3_newver_类型描述",
+                                                      "ja_JP": "AA3_newver_タイプの説明",
+                                                      "es_ES": "AA3_newver_descripción del tipo"}},
+                           "parentTypeId": "AA3_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_AA3_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "AA3_newver_parentTypeDescription",
+                                                            "zh_CN": "AA3_newver_父类型描述",
+                                                            "ja_JP": "AA3_newver_親タイプの説明",
+                                                            "es_ES": "AA3_newver_descripción del tipo padre"}},
+                           "contentId": "AA3_newver_contentId",
+                           "content": {"defaultValue": "Default_AA3_newver_contentDescription",
+                                       "i18nValue": {"en_US": "AA3_newver_contentDescription",
+                                                     "zh_CN": "AA3_newver_内容",
+                                                     "ja_JP": "AA3_newver_ルールの説明",
+                                                     "es_ES": "AA3_newver_descripción de la regla"}},
+                           "ruleId": "AA3_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_AA3_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "AA3_newver_typeDescription",
+                                                      "zh_CN": "AA3_newver_类型描述",
+                                                      "ja_JP": "AA3_newver_タイプの説明",
+                                                      "es_ES": "AA3_newver_descripción del tipo"}},
+                           "tags": {"ActiveAlert3_newverKey1": "ActiveAlert3_newverValue1",
+                                    "ActiveAlert3_newverKey2": "ActiveAlert3_newverValue2",
+                                    "ActiveAlert3_newverKey3": "ActiveAlert3_newverValue3"},
+                           "ruleTags": {"ActiveAlert3RuletagKey1": "ActiveAlert3RuletagValue1",
+                                        "ActiveAlert3RuletagKey2": "ActiveAlert3RuletagValue2",
+                                        "ActiveAlert3RuletagKey3": "ActiveAlert3RuletagValue3"},
+                           "metrictags": {"ActiveAlert3MetricTagKey1": "ActiveAlert3MetricTagValue1",
+                                          "ActiveAlert3MetricTagKey2": "ActiveAlert3MetricTagValue2",
+                                          "ActiveAlert3MetricTagKey3": "ActiveAlert3MetricTagValue3"},
+                           "inhibited": False
+                           },
+                          {"eventType": "2",
+                           "instanceId": "AvxV8hkR",  # assetId
+                           "metricId": "Int_MeasurementPoint",  # measurementPoint
+                           "occurTime": current_utc,
+                           "value": "HistoryAlert_metricvalue",
+                           # Optional Parameter
+                           "orgId": orgId,
+                           "localOccurTime": current_local,
+                           "recoverTime": current_utc,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_Recover_Reason",
+                           "severityId": "HA3_newver_severityId",
+                           "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                            "i18nValue": {"en_US": "HA3_newver_severityDescription",
+                                                          "zh_CN": "HA3_newver_严重性 描述",
+                                                          "ja_JP": "HA3_newver_重大度説明",
+                                                          "es_ES": "HA3_newver_severidad Descripción"}},
+                           "typeId": "HA3_newver_typeId",
+                           "typeDesc": {"defaultValue": "Default_HA3_newver_typeDescription",
+                                        "i18nValue": {"en_US": "HA3_newver_typeDescription",
+                                                      "zh_CN": "HA3_newver_类型描述",
+                                                      "ja_JP": "HA3_newver_タイプの説明",
+                                                      "es_ES": "HA3_newver_descripción del tipo"}},
+                           "parentTypeId": "HA3_newver_parentTypeId",
+                           "parentTypeDesc": {"defaultValue": "Default_HA3_newver_parentTypeDescription",
+                                              "i18nValue": {"en_US": "HA3_newver_parentTypeDescription",
+                                                            "zh_CN": "HA3_newver_父类型描述",
+                                                            "ja_JP": "HA3_newver_親タイプの説明",
+                                                            "es_ES": "HA3_newver_descripción del tipo padre"}},
+                           "contentId": "AA_newver_contentId",
+                           "content": {"defaultValue": "Default_HA3_newver_contentDescription",
+                                       "i18nValue": {"en_US": "HA3_newver_contentDescription",
+                                                     "zh_CN": "HA3_newver_规则说明",
+                                                     "ja_JP": "HA3_newver_ルールの説明",
+                                                     "es_ES": "HA3_newver_descripción de la regla"}},
+                           "ruleId": "HA3_newver_ruleId",
+                           "ruleDesc": {"defaultValue": "Default_HA3_newver_ruleDescription",
+                                        "i18nValue": {"en_US": "HA3_newver_typeDescription",
+                                                      "zh_CN": "HA3_newver_类型描述",
+                                                      "ja_JP": "HA3_newver_タイプの説明",
+                                                      "es_ES": "HA3_newver_descripción del tipo"}},
+                           "tags": {"HistoryAlert3_newverKey1": "HistoryAlert3_newverValue1",
+                                    "HistoryAlert3_newverKey2": "HistoryAlert3_newverValue2",
+                                    "HistoryAlert3_newverKey3": "HistoryAlert3_newverValue3"},
+                           "ruleTags": {"HistoryAlert3RuletagKey1": "HistoryAlert3RuletagValue1",
+                                        "HistoryAlert3RuletagKey2": "HistoryAlert3RuletagValue2",
+                                        "HistoryAlert3RuletagKey3": "HistoryAlert3RuletagValue3"},
+                           "metrictags": {"HistoryAlert3MetricTagKey1": "HistoryAlert3MetricTagValue1",
+                                          "HistoryAlert3MetricTagKey2": "HistoryAlert3MetricTagValue2",
+                                          "HistoryAlert3MetricTagKey3": "HistoryAlert3MetricTagValue3"},
+                           "inhibited": False
+                           }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/new/historyAndActiveAlertRecords/closeAlert.py b/alert/record/new/historyAndActiveAlertRecords/closeAlert.py
new file mode 100644
index 0000000..8490d32
--- /dev/null
+++ b/alert/record/new/historyAndActiveAlertRecords/closeAlert.py
@@ -0,0 +1,39 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: closeAlert
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description: Close an active alert. A closed active alert will become a history alert
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/close_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+import time
+
+current_time = round(time.time()*1000)
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+def closeActiveAlert(accessKey, secretKey, orgId, url, alertId):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "close", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertId": alertId,
+          "recoverTime": current_time,
+          #optional parameters
+          "localRecoverTime": current_local,
+          "recoverReason": "Your_Recover_Reason"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/record/new/historyAndActiveAlertRecords/createAlert.py b/alert/record/new/historyAndActiveAlertRecords/createAlert.py
new file mode 100644
index 0000000..b8f9984
--- /dev/null
+++ b/alert/record/new/historyAndActiveAlertRecords/createAlert.py
@@ -0,0 +1,151 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAlert
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Create an alert record
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/create_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def createAlert_ActiveAlert(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertVo": {"eventType": "3",
+                      "instanceId": "AvxV8hkR",  #assetId
+                      "metricId": "Int_MeasurementPoint",
+                      "occurTime": current_utc,
+                      "recoverTime": current_utc,
+                      "value": "ActiveAlert_metricvalue",
+                      # Optional Parameter
+                      "orgId": orgId,
+                      "localOccurTime": current_local,
+                      "localRecoverTime": current_local,
+                      "recoverReason": "Your_Recover_Reason",
+                      "severityId": "AA_newver_severityId",
+                      "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                       "i18nValue": {"en_US": "AA_newver_severityDescription",
+                                                     "zh_CN": "AA_newver_严重性 描述",
+                                                     "ja_JP": "AA_newver_重大度説明",
+                                                     "es_ES": "AA_newver_severidad Descripción"}},
+                      "typeId": "AA_newver_typeId",
+                      "typeDesc": {"defaultValue": "Default_AA_newver_typeDescription",
+                                   "i18nValue": {"en_US": "AA_newver_typeDescription",
+                                                 "zh_CN": "AA_newver_类型描述",
+                                                 "ja_JP": "AA_newver_タイプの説明",
+                                                 "es_ES": "AA_newver_descripción del tipo"}},
+                      "parentTypeId": "AA_newver_parentTypeId",
+                      "parentTypeDesc": {"defaultValue": "Default_AA_newver_parentTypeDescription",
+                                         "i18nValue": {"en_US": "AA_newver_parentTypeDescription",
+                                                       "zh_CN": "AA_newver_父类型描述",
+                                                       "ja_JP": "AA_newver_親タイプの説明",
+                                                       "es_ES": "AA_newver_descripción del tipo padre"}},
+                      "contentId": "AA_newver_contentId",
+                      "content": {"defaultValue": "Default_AA_newver_contentDescription",
+                                  "i18nValue": {"en_US": "AA_newver_contentDescription",
+                                                "zh_CN": "AA_newver_内容",
+                                                "ja_JP": "AA_newver_ルールの説明",
+                                                "es_ES": "AA_newver_descripción de la regla"}},
+                      "ruleId": "AA_newver_ruleId",
+                      "ruleDesc": {"defaultValue": "Default_AA_newver_ruleDescription",
+                                   "i18nValue": {"en_US": "AA_newver_typeDescription",
+                                                 "zh_CN": "AA_newver_类型描述",
+                                                 "ja_JP": "AA_newver_タイプの説明",
+                                                 "es_ES": "AA_newver_descripción del tipo"}},
+                      "tags": {"ActiveAlert_newverKey1": "ActiveAlert_newverValue1",
+                              "ActiveAlert_newverKey2": "ActiveAlert_newverValue2",
+                              "ActiveAlert_newverKey3": "ActiveAlert_newverValue3"},
+                      "ruleTags": {"ActiveAlertRuletagKey1": "ActiveAlertRuletagValue1",
+                                  "ActiveAlertRuletagKey2": "ActiveAlertRuletagValue2",
+                                  "ActiveAlertRuletagKey3": "ActiveAlertRuletagValue3"},
+                      "metrictags": {"ActiveAlertMetricTagKey1": "ActiveAlertMetricTagValue1",
+                                     "ActiveAlertMetricTagKey2": "ActiveAlertMetricTagValue2",
+                                     "ActiveAlertMetricTagKey3": "ActiveAlertMetricTagValue3"},
+                      "inhibited": True
+                      }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createAlert_HistoryAlert(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"alertVo": {"eventType": "2",
+                      "instanceId": "AvxV8hkR",  #assetId
+                      "metricId": "Int_MeasurementPoint", #measurementPoint
+                      "occurTime": current_utc,
+                      "value": "HistoryAlert_metricvalue",
+                      # Optional Parameter
+                      "orgId": orgId,
+                      "localOccurTime": current_local,
+                      "recoverTime": current_utc,
+                      "localRecoverTime": current_local,
+                      "recoverReason": "Your_Recover_Reason",
+                      "severityId": "HA_newver_severityId",
+                      "severityDesc": {"defaultValue": "Default_Alert_severityDescription",
+                                       "i18nValue": {"en_US": "HA_newver_severityDescription",
+                                                     "zh_CN": "HA_newver_严重性 描述",
+                                                     "ja_JP": "HA_newver_重大度説明",
+                                                     "es_ES": "HA_newver_severidad Descripción"}},
+                      "typeId": "HA_newver_typeId",
+                      "typeDesc": {"defaultValue": "Default_HA_newver_typeDescription",
+                                   "i18nValue": {"en_US": "HA_newver_typeDescription",
+                                                 "zh_CN": "HA_newver_类型描述",
+                                                 "ja_JP": "HA_newver_タイプの説明",
+                                                 "es_ES": "HA_newver_descripción del tipo"}},
+                      "parentTypeId": "HA_newver_parentTypeId",
+                      "parentTypeDesc": {"defaultValue": "Default_HA_newver_parentTypeDescription",
+                                         "i18nValue": {"en_US": "HA_newver_parentTypeDescription",
+                                                       "zh_CN": "HA_newver_父类型描述",
+                                                       "ja_JP": "HA_newver_親タイプの説明",
+                                                       "es_ES": "HA_newver_descripción del tipo padre"}},
+                      "contentId": "AA_newver_contentId",
+                      "content": {"defaultValue": "Default_HA_newver_contentDescription",
+                                  "i18nValue": {"en_US": "HA_newver_contentDescription",
+                                                "zh_CN": "HA_newver_规则说明",
+                                                "ja_JP": "HA_newver_ルールの説明",
+                                                "es_ES": "HA_newver_descripción de la regla"}},
+                      "ruleId": "HA_newver_ruleId",
+                      "ruleDesc": {"defaultValue": "Default_HA_newver_ruleDescription",
+                                   "i18nValue": {"en_US": "HA_newver_typeDescription",
+                                                 "zh_CN": "HA_newver_类型描述",
+                                                 "ja_JP": "HA_newver_タイプの説明",
+                                                 "es_ES": "HA_newver_descripción del tipo"}},
+                      "tags": {"HistoryAlert_newverKey1": "HistoryAlert_newverValue1",
+                              "HistoryAlert_newverKey2": "HistoryAlert_newverValue2",
+                              "HistoryAlert_newverKey3": "HistoryAlert_newverValue3"},
+                      "ruleTags": {"HistoryAlertRuletagKey1": "HistoryAlertRuletagValue1",
+                                  "HistoryAlertRuletagKey2": "HistoryAlertRuletagValue2",
+                                  "HistoryAlertRuletagKey3": "HistoryAlertRuletagValue3"},
+                      "metrictags": {"HistoryAlertMetricTagKey1": "HistoryAlertMetricTagValue1",
+                                     "HistoryAlertMetricTagKey2": "HistoryAlertMetricTagValue2",
+                                     "HistoryAlertMetricTagKey3": "HistoryAlertMetricTagValue3"},
+                      "inhibited": False
+                      }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/record/new/historyAndActiveAlertRecords/scrollAlerts.py b/alert/record/new/historyAndActiveAlertRecords/scrollAlerts.py
new file mode 100644
index 0000000..28ac16c
--- /dev/null
+++ b/alert/record/new/historyAndActiveAlertRecords/scrollAlerts.py
@@ -0,0 +1,154 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: scrollAlerts
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description: Search for active and history alerts. The first search returns a pageToken to be used for the next search, and all subsequent searches will return a different pageToken to be used for its next search.
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/scroll_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+startTime = (datetime.now() - relativedelta(months=3)).strftime("%Y-%m-%d %H:%M:%S") # 94 days from current date
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def scroll_pageToken(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageSize":10}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    pageToken = response['data']['pageToken']
+    print("pageToken:", pageToken)
+    return pageToken
+
+
+def scrollAlerts(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollAlerts_instanceId(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "instanceId": "AvxV8hkR"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollAlerts_metricId(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "metricId": "Int_MeasurementPoint",
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollAlerts_recoverTime(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "startRecoverTime": startTime,
+            "endRecoverTime": current_local,
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollAlerts_active(accessKey, secretKey, orgId, url, activeStatus):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "active": activeStatus
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "expression": expression
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/record/new/historyAndActiveAlertRecords/searchAlerts.py b/alert/record/new/historyAndActiveAlertRecords/searchAlerts.py
new file mode 100644
index 0000000..5bff691
--- /dev/null
+++ b/alert/record/new/historyAndActiveAlertRecords/searchAlerts.py
@@ -0,0 +1,123 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAlerts
+ * Author:  Dylan Yeo
+ * Date:    18/02/22
+ * Description:  Search for active and history alerts, where the pages of the returned results do not have to be in order.
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/new_version/search_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+startTime = (datetime.now() - relativedelta(months=3)).strftime("%Y-%m-%d %H:%M:%S")
+
+def searchAlerts(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "pagination": {"pageNo": 1,
+                          "pageSize": 5}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlerts_instanceId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "instanceId": "ActiveAlert_instanceId"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlerts_metricId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "metricId": "ActiveAlert_metricId"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlerts_recoverTime(accessKey, secretKey, orgId, url):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "startRecoverTime": startTime,
+           "endRecoverTime":current_local
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlerts_active(accessKey, secretKey, orgId, url, activeStatus):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "active": activeStatus
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/alert-service/v2.1/alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {"startOccurTime": startTime,
+           "endOccurTime": current_local,
+           "expression": expression
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/old/activeAlertRecord/aggregateActiveAlerts.py b/alert/record/old/activeAlertRecord/aggregateActiveAlerts.py
new file mode 100644
index 0000000..a21b92f
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/aggregateActiveAlerts.py
@@ -0,0 +1,63 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: aggregateActiveAlerts
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Calculate the number of active alerts
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/aggregate_active_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+
+def aggregateActiveAlerts_groupByField(accessKey, secretKey, orgId, url, field):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "aggregate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"groupByField": field
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def aggregateActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, startTime=None, endTime=None):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "aggregate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"groupByField": "assetId",
+          "startOccurTime": startTime,
+          "endOccurTime": endTime
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def aggregateActiveAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "aggregate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"groupByField": "assetId",
+          "expression": expression
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/old/activeAlertRecord/closeActiveAlert.py b/alert/record/old/activeAlertRecord/closeActiveAlert.py
new file mode 100644
index 0000000..72002ac
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/closeActiveAlert.py
@@ -0,0 +1,39 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: closeActiveAlert
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Close an active alert. A closed active alert will become a history alert
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/close_active_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+import time
+
+current_time = round(time.time()*1000)
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+def closeActiveAlert(accessKey, secretKey, orgId, url, eventId):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "close", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"eventId": eventId,
+          "recoverTime": current_time,
+          #optional parameters
+          "localRecoverTime": current_local,
+          "recoverReason": "Your_Recover_Reason"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/record/old/activeAlertRecord/createActiveAlert.py b/alert/record/old/activeAlertRecord/createActiveAlert.py
new file mode 100644
index 0000000..99e6969
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/createActiveAlert.py
@@ -0,0 +1,127 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createActiveAlert
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Create an active alert. Except for the mandatory fields, there is no need to verify the legality of other parameters. The parameters used by users such as contentId will not be maintained on the EnOS platform
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_active_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def createActiveAlert_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"activeAlert": {"assetId": "AvxV8hkR",
+                          "modelId": "Python_Demo_Model",
+                          "measurepointId": "Int_MeasurementPoint",
+                          "value": 10,
+                          "occurTime": current_utc,
+                          # Optional Parameter
+                          "localOccurTime": current_local,
+                          "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                          "modelIdPath": "/Python_Demo_Model",
+                          "severityId": "AA_severityId",
+                          "severityDesc": {"defaultValue": "Default_AA_severityDescription",
+                                           "i18nValue": {"en_US": "AA_severityDescription",
+                                                         "zh_CN": "AA_严重性 描述",
+                                                         "ja_JP": "AA_重大度説明",
+                                                         "es_ES": "AA_severidad Descripción"}},
+                          "typeId": "AA_typeId",
+                          "typeDesc": {"defaultValue": "Default_AA_typeDescription",
+                                       "i18nValue": {"en_US": "AA_typeDescription",
+                                                     "zh_CN": "AA_类型描述",
+                                                     "ja_JP": "AA_タイプの説明",
+                                                     "es_ES": "AA_descripción del tipo"}},
+                          "subTypeId": "AA_subTypeId",
+                          "subTypeDesc": {"defaultValue": "Default_AA_subtypeDescription",
+                                          "i18nValue": {"en_US": "AA_subtypeDescription",
+                                                        "zh_CN": "AA_子类型描述",
+                                                        "ja_JP": "AA_サブタイプの説明",
+                                                        "es_ES": "AA_descripción del subtipo"}},
+                          "contentId": "AA_contentId",
+                          "contentDesc": {"defaultValue": "Default_AA_contentDescription",
+                                          "i18nValue": {"en_US": "AA_contentDescription",
+                                                        "zh_CN": "AA_内容描述",
+                                                        "ja_JP": "AA_コンテンツの説明",
+                                                        "es_ES": "AA_descripción del contenido"}},
+                          "tag": {"ActiveAlertKey1": "ActiveAlertValue1",
+                                  "ActiveAlertKey2": "ActiveAlertValue2",
+                                  "ActiveAlertKey3": "ActiveAlertValue3"},
+                          }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    alertId = response['data']
+    return alertId
+
+
+def createActiveAlert_deviceStatus(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"activeAlert": {"assetId": "AvxV8hkR",
+                            "modelId": "Python_Demo_Model",
+                            "deviceStatus": "offline",
+                            "value": "offline",
+                            "occurTime": current_utc,
+                            # Optional Parameter
+                            "localOccurTime": current_local,
+                            "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                            "modelIdPath": "/Python_Demo_Model",
+                            "severityId": "AA_severityId",
+                            "severityDesc": {"defaultValue": "Default_AA_severityDescription",
+                                             "i18nValue": {"en_US": "AA_severityDescription",
+                                                           "zh_CN": "AA_严重性 描述",
+                                                           "ja_JP": "AA_重大度説明",
+                                                           "es_ES": "AA_severidad Descripción"}},
+                            "typeId": "AA_typeId",
+                            "typeDesc": {"defaultValue": "Default_AA_typeDescription",
+                                         "i18nValue": {"en_US": "AA_typeDescription",
+                                                       "zh_CN": "AA_类型描述",
+                                                       "ja_JP": "AA_タイプの説明",
+                                                       "es_ES": "AA_descripción del tipo"}},
+                            "subTypeId": "AA_subTypeId",
+                            "subTypeDesc": {"defaultValue": "Default_AA_subtypeDescription",
+                                            "i18nValue": {"en_US": "AA_subtypeDescription",
+                                                          "zh_CN": "AA_子类型描述",
+                                                          "ja_JP": "AA_サブタイプの説明",
+                                                          "es_ES": "AA_descripción del subtipo"}},
+                            "contentId": "AA_contentId",
+                            "contentDesc": {"defaultValue": "Default_AA_contentDescription",
+                                            "i18nValue": {"en_US": "AA_contentDescription",
+                                                          "zh_CN": "AA_内容描述",
+                                                          "ja_JP": "AA_コンテンツの説明",
+                                                          "es_ES": "AA_descripción del contenido"}},
+                            "tag": {"ActiveAlertKey1": "ActiveAlertValue1",
+                                    "ActiveAlertKey2": "ActiveAlertValue2",
+                                    "ActiveAlertKey3": "ActiveAlertValue3"},
+                            }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    alertId = response['data']
+    return alertId
+
diff --git a/alert/record/old/activeAlertRecord/createActiveAlertBatch.py b/alert/record/old/activeAlertRecord/createActiveAlertBatch.py
new file mode 100644
index 0000000..dbedb3b
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/createActiveAlertBatch.py
@@ -0,0 +1,314 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createActiveAlertBatch
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Batch create active alerts
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_active_alerts_in_batch.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+import time
+
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def createActiveAlertBatch_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"activeAlertList": [{"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "measurepointId": "Int_MeasurementPoint",
+                                 "value": 10,
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA1_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA1_severityDescription",
+                                                  "i18nValue": {"en_US": "AA1_severityDescription",
+                                                                "zh_CN": "AA1_严重性 描述",
+                                                                "ja_JP": "AA1_重大度説明",
+                                                                "es_ES": "AA1_severidad Descripción"}},
+                                 "typeId": "AA1_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA1_typeDescription",
+                                              "i18nValue": {"en_US": "AA1_typeDescription",
+                                                            "zh_CN": "AA1_类型描述",
+                                                            "ja_JP": "AA1_タイプの説明",
+                                                            "es_ES": "AA1_descripción del tipo"}},
+                                 "subTypeId": "AA1_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA1_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA1_subtypeDescription",
+                                                               "zh_CN": "AA1_子类型描述",
+                                                               "ja_JP": "AA1_サブタイプの説明",
+                                                               "es_ES": "AA1_descripción del subtipo"}},
+                                 "contentId": "AA1_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA1_contentDescription",
+                                                 "i18nValue": {"en_US": "AA1_contentDescription",
+                                                               "zh_CN": "AA1_内容描述",
+                                                               "ja_JP": "AA1_コンテンツの説明",
+                                                               "es_ES": "AA1_descripción del contenido"}},
+                                 "tag": {"ActiveAlert1Key1": "ActiveAlert1Value1",
+                                         "ActiveAlert1Key2": "ActiveAlert1Value2",
+                                         "ActiveAlert1Key3": "ActiveAlert1Value3"},
+                                 },
+                                {"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "measurepointId": "Int_MeasurementPoint",
+                                 "value": 10,
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA2_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA2_severityDescription",
+                                                  "i18nValue": {"en_US": "AA2_severityDescription",
+                                                                "zh_CN": "AA2_严重性 描述",
+                                                                "ja_JP": "AA2_重大度説明",
+                                                                "es_ES": "AA2_severidad Descripción"}},
+                                 "typeId": "AA2_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA2_typeDescription",
+                                              "i18nValue": {"en_US": "AA2_typeDescription",
+                                                            "zh_CN": "AA2_类型描述",
+                                                            "ja_JP": "AA2_タイプの説明",
+                                                            "es_ES": "AA2_descripción del tipo"}},
+                                 "subTypeId": "AA2_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA2_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA2_subtypeDescription",
+                                                               "zh_CN": "AA2_子类型描述",
+                                                               "ja_JP": "AA2_サブタイプの説明",
+                                                               "es_ES": "AA2_descripción del subtipo"}},
+                                 "contentId": "AA2_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA2_contentDescription",
+                                                 "i18nValue": {"en_US": "AA2_contentDescription",
+                                                               "zh_CN": "AA2_内容描述",
+                                                               "ja_JP": "AA2_コンテンツの説明",
+                                                               "es_ES": "AA2_descripción del contenido"}},
+                                 "tag": {"ActiveAlert2Key1": "ActiveAlert2Value1",
+                                         "ActiveAlert2Key2": "ActiveAlert2Value2",
+                                         "ActiveAlert2Key3": "ActiveAlert2Value3"},
+                                 }]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    batchlist = response['data']
+    alertIdlist = []
+
+    for i in range(len(batchlist)):
+        alertId = batchlist[i]['data']
+        alertIdlist.append(alertId)
+
+    print(alertIdlist)
+    return alertIdlist
+
+
+def createActiveAlertBatch_deviceStatus(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"activeAlertList": [{"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "deviceStatus": "offline",
+                                 "value": "offline",
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA3_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA3_severityDescription",
+                                                  "i18nValue": {"en_US": "AA3_severityDescription",
+                                                                "zh_CN": "AA31_严重性 描述",
+                                                                "ja_JP": "AA3_重大度説明",
+                                                                "es_ES": "AA3_severidad Descripción"}},
+                                 "typeId": "AA3_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA3_typeDescription",
+                                              "i18nValue": {"en_US": "AA3_typeDescription",
+                                                            "zh_CN": "AA3_类型描述",
+                                                            "ja_JP": "AA3_タイプの説明",
+                                                            "es_ES": "AA3_descripción del tipo"}},
+                                 "subTypeId": "AA3_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA3_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA3_subtypeDescription",
+                                                               "zh_CN": "AA3_子类型描述",
+                                                               "ja_JP": "AA3_サブタイプの説明",
+                                                               "es_ES": "AA3_descripción del subtipo"}},
+                                 "contentId": "AA3_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA3_contentDescription",
+                                                 "i18nValue": {"en_US": "AA3_contentDescription",
+                                                               "zh_CN": "AA3_内容描述",
+                                                               "ja_JP": "AA3_コンテンツの説明",
+                                                               "es_ES": "AA3_descripción del contenido"}},
+                                 "tag": {"ActiveAlert3Key1": "ActiveAlert3Value1",
+                                         "ActiveAlert3Key2": "ActiveAlert3Value2",
+                                         "ActiveAlert3Key3": "ActiveAlert3Value3"},
+                                 },
+                                {"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "deviceStatus": "offline",
+                                 "value": "offline",
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA4_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA4_severityDescription",
+                                                  "i18nValue": {"en_US": "AA4_severityDescription",
+                                                                "zh_CN": "AA4_严重性 描述",
+                                                                "ja_JP": "AA4_重大度説明",
+                                                                "es_ES": "AA4_severidad Descripción"}},
+                                 "typeId": "AA4_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA4_typeDescription",
+                                              "i18nValue": {"en_US": "AA4_typeDescription",
+                                                            "zh_CN": "AA4_类型描述",
+                                                            "ja_JP": "AA4_タイプの説明",
+                                                            "es_ES": "AA4_descripción del tipo"}},
+                                 "subTypeId": "AA4_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA4_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA4_subtypeDescription",
+                                                               "zh_CN": "AA4_子类型描述",
+                                                               "ja_JP": "AA4_サブタイプの説明",
+                                                               "es_ES": "AA4_descripción del subtipo"}},
+                                 "contentId": "AA4_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA4_contentDescription",
+                                                 "i18nValue": {"en_US": "AA4_contentDescription",
+                                                               "zh_CN": "AA4_内容描述",
+                                                               "ja_JP": "AA4_コンテンツの説明",
+                                                               "es_ES": "AA4_descripción del contenido"}},
+                                 "tag": {"ActiveAlert4Key1": "ActiveAlert4Value1",
+                                         "ActiveAlert4Key2": "ActiveAlert4Value2",
+                                         "ActiveAlert4Key3": "ActiveAlert4Value3"},
+                                 }]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    batchlist = response['data']
+    alertIdlist = []
+
+    for i in range(len(batchlist)):
+        alertId = batchlist[i]['data']
+        alertIdlist.append(alertId)
+
+    print(alertIdlist)
+    return alertIdlist
+
+
+def createActiveAlertBatch_mix(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"activeAlertList": [{"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "measurepointId": "Int_MeasurementPoint",
+                                 "value": 10,
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA5_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA5_severityDescription",
+                                                  "i18nValue": {"en_US": "AA5_severityDescription",
+                                                                "zh_CN": "AA51_严重性 描述",
+                                                                "ja_JP": "AA5_重大度説明",
+                                                                "es_ES": "AA5_severidad Descripción"}},
+                                 "typeId": "AA5_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA5_typeDescription",
+                                              "i18nValue": {"en_US": "AA5_typeDescription",
+                                                            "zh_CN": "AA5_类型描述",
+                                                            "ja_JP": "AA5_タイプの説明",
+                                                            "es_ES": "AA5_descripción del tipo"}},
+                                 "subTypeId": "AA5_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA5_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA5_subtypeDescription",
+                                                               "zh_CN": "AA5_子类型描述",
+                                                               "ja_JP": "AA5_サブタイプの説明",
+                                                               "es_ES": "AA5_descripción del subtipo"}},
+                                 "contentId": "AA5_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA5_contentDescription",
+                                                 "i18nValue": {"en_US": "AA5_contentDescription",
+                                                               "zh_CN": "AA5_内容描述",
+                                                               "ja_JP": "AA5_コンテンツの説明",
+                                                               "es_ES": "AA5_descripción del contenido"}},
+                                 "tag": {"ActiveAlert5Key1": "ActiveAlert5Value1",
+                                         "ActiveAlert5Key2": "ActiveAlert5Value2",
+                                         "ActiveAlert5Key3": "ActiveAlert5Value3"},
+                                 },
+                                {"assetId": "AvxV8hkR",
+                                 "modelId": "Python_Demo_Model",
+                                 "deviceStatus": "offline",
+                                 "value": "offline",
+                                 "occurTime": current_utc,
+                                 # Optional Parameter
+                                 "localOccurTime": current_local,
+                                 "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                 "modelIdPath": "/Python_Demo_Model",
+                                 "severityId": "AA6_severityId",
+                                 "severityDesc": {"defaultValue": "Default_AA6_severityDescription",
+                                                  "i18nValue": {"en_US": "AA6_severityDescription",
+                                                                "zh_CN": "AA6_严重性 描述",
+                                                                "ja_JP": "AA6_重大度説明",
+                                                                "es_ES": "AA6_severidad Descripción"}},
+                                 "typeId": "AA6_typeId",
+                                 "typeDesc": {"defaultValue": "Default_AA6_typeDescription",
+                                              "i18nValue": {"en_US": "AA6_typeDescription",
+                                                            "zh_CN": "AA6_类型描述",
+                                                            "ja_JP": "AA6_タイプの説明",
+                                                            "es_ES": "AA6_descripción del tipo"}},
+                                 "subTypeId": "AA6_subTypeId",
+                                 "subTypeDesc": {"defaultValue": "Default_AA6_subtypeDescription",
+                                                 "i18nValue": {"en_US": "AA6_subtypeDescription",
+                                                               "zh_CN": "AA6_子类型描述",
+                                                               "ja_JP": "AA6_サブタイプの説明",
+                                                               "es_ES": "AA6_descripción del subtipo"}},
+                                 "contentId": "AA6_contentId",
+                                 "contentDesc": {"defaultValue": "Default_AA6_contentDescription",
+                                                 "i18nValue": {"en_US": "AA6_contentDescription",
+                                                               "zh_CN": "AA6_内容描述",
+                                                               "ja_JP": "AA6_コンテンツの説明",
+                                                               "es_ES": "AA6_descripción del contenido"}},
+                                 "tag": {"ActiveAlert6Key1": "ActiveAlert6Value1",
+                                         "ActiveAlert6Key2": "ActiveAlert6Value2",
+                                         "ActiveAlert6Key3": "ActiveAlert6Value3"},
+                                 }]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    batchlist = response['data']
+    alertIdlist = []
+
+    for i in range(len(batchlist)):
+        alertId = batchlist[i]['data']
+        alertIdlist.append(alertId)
+
+    print(alertIdlist)
+    return alertIdlist
diff --git a/alert/record/old/activeAlertRecord/deleteActiveAlert.py b/alert/record/old/activeAlertRecord/deleteActiveAlert.py
new file mode 100644
index 0000000..bb572ad
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/deleteActiveAlert.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteActiveAlert
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Delete an active alert
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/delete_active_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def deleteActiveAlert(accessKey, secretKey, orgId, url, eventId):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "delete", "orgId": orgId, "eventId": eventId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/record/old/activeAlertRecord/searchActiveAlerts.py b/alert/record/old/activeAlertRecord/searchActiveAlerts.py
new file mode 100644
index 0000000..069dd05
--- /dev/null
+++ b/alert/record/old/activeAlertRecord/searchActiveAlerts.py
@@ -0,0 +1,140 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchActiveAlerts
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Search for active alerts based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/aggregate_active_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+
+def searchActiveAlerts(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": {"pageNo": 1,
+                           "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_modelId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": "Python_Demo_Model"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_assetId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetId": "AvxV8hkR"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"measurepointId": "Int_MeasurementPoint"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_TimeRange(accessKey, secretKey, orgId, url, startTime=None, endTime=None):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": endTime
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"expression": expression
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_Scope(accessKey, secretKey, orgId, url, treeId, assetId=None, includeDerivative=False):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"scope": {"treeId": treeId,
+                    "fromAssetId": assetId,
+                    "includeDerivative": includeDerivative}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchActiveAlerts_RootAlert(accessKey, secretKey, orgId, url, rootAlertId, treeId=None):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"rootAlert": {"rootAlertId": rootAlertId,
+                        "treeId": treeId}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/old/alertTags/batchUpdateActiveAlertTags.py b/alert/record/old/alertTags/batchUpdateActiveAlertTags.py
new file mode 100644
index 0000000..2190ad3
--- /dev/null
+++ b/alert/record/old/alertTags/batchUpdateActiveAlertTags.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: batchUpdateActiveAlertTags
+ * Author:  Dylan Yeo
+ * Date:    16/02/22
+ * Description: Batch update the tag data for the specified alerts in the current alert library. The returned structure will indicate the updated results of each alert. When an update error occurs for an alert, the error information will be recorded and the remaining update process will continue
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/batch_update_active_alert_tags.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def batchUpdateActiveAlertTags(accessKey, secretKey, orgId, url, eventId_list):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "batchUpdateTags", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"eventIds": eventId_list,
+            "isPatchUpdate": True,
+            "tags": {"NewActiveAlertKey1": "NewActiveAlertValue1",
+                     "NewActiveAlertKey2": "NewActiveAlertValue2",
+                     "NewActiveAlertKey3": "NewActiveAlertValue3"},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/record/old/alertTags/updateActiveAlertTags.py b/alert/record/old/alertTags/updateActiveAlertTags.py
new file mode 100644
index 0000000..ba7a4ec
--- /dev/null
+++ b/alert/record/old/alertTags/updateActiveAlertTags.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateActiveAlertTags
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description:  Update the tags of an active alert
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_active_alert_tags.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateActiveAlertTags(accessKey, secretKey, orgId, url, eventId):
+    accessURL = url + '/event-service/v2.1/active-alerts'
+    params = {"action": "updateTags", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"eventId": eventId,
+            "isPatchUpdate": True,
+            "tags": {"NewActiveAlertKey1": "NewActiveAlertValue1",
+                    "NewActiveAlertKey2": "NewActiveAlertValue2",
+                    "NewActiveAlertKey3": "NewActiveAlertValue3"},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/record/old/alertTags/updateHistoryAlertTags.py b/alert/record/old/alertTags/updateHistoryAlertTags.py
new file mode 100644
index 0000000..554a148
--- /dev/null
+++ b/alert/record/old/alertTags/updateHistoryAlertTags.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateHistoryAlert
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Update the tags of a history alert
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_history_alert_tags.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateHistoryAlertTags(accessKey, secretKey, orgId, url, eventId):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "updateTags", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"eventId": eventId,
+            "isPatchUpdate": True,
+            "tags": {"NewHistoryAlertKey1": "NewHistoryAlertValue1",
+                    "NewHistoryAlertKey2": "NewHistoryAlertValue2",
+                    "NewHistoryAlertKey3": "NewHistoryAlertValue3"},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/alert/record/old/historyAlertRecord/createHistoryAlert.py b/alert/record/old/historyAlertRecord/createHistoryAlert.py
new file mode 100644
index 0000000..52e5f31
--- /dev/null
+++ b/alert/record/old/historyAlertRecord/createHistoryAlert.py
@@ -0,0 +1,127 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createHistoryAlert
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Create a new history alert. Except for the mandatory fields, there is no need to verify the legality of other parameters. The parameters used by users such as contentId would not be maintained on the EnOS platform. Alerts with the same assetId, measurepointId, and occurTime will be updated
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_history_alert.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def createHistoryAlert_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"historyAlert": {"assetId": "AvxV8hkR",
+                           "modelId": "Python_Demo_Model",
+                           "measurepointId": "Int_MeasurementPoint",
+                           "value": 10,
+                           "occurTime": current_utc,
+                           "recoverTime": current_utc,
+                           # Optional Parameter
+                           "localOccurTime": current_local,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_HisotryAlert_recoverReason",
+                           "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                           "modelIdPath": "/Python_Demo_Model",
+                           "severityId": "HA_severityId",
+                           "severityDesc": {"defaultValue": "Default_HA_severityDescription",
+                                            "i18nValue": {"en_US": "HA_severityDescription",
+                                                          "zh_CN": "HA_严重性 描述",
+                                                          "ja_JP": "HA_重大度説明",
+                                                          "es_ES": "HA_severidad Descripción"}},
+                           "typeId": "HA_typeId",
+                           "typeDesc": {"defaultValue": "Default_HA_typeDescription",
+                                        "i18nValue": {"en_US": "HA_typeDescription",
+                                                      "zh_CN": "HA_类型描述",
+                                                      "ja_JP": "HA_タイプの説明",
+                                                      "es_ES": "HA_descripción del tipo"}},
+                           "subTypeId": "HA_subTypeId",
+                           "subTypeDesc": {"defaultValue": "Default_HA_subtypeDescription",
+                                           "i18nValue": {"en_US": "HA_subtypeDescription",
+                                                         "zh_CN": "HA_子类型描述",
+                                                         "ja_JP": "HA_サブタイプの説明",
+                                                         "es_ES": "HA_descripción del subtipo"}},
+                           "contentId": "HA_contentId",
+                           "contentDesc": {"defaultValue": "Default_HA_contentDescription",
+                                           "i18nValue": {"en_US": "HA_contentDescription",
+                                                         "zh_CN": "HA_内容描述",
+                                                         "ja_JP": "HA_コンテンツの説明",
+                                                         "es_ES": "HA_descripción del contenido"}},
+                           "tag": {"HistoryAlertKey1": "HistoryAlertValue1",
+                                   "HistoryAlertKey2": "HistoryAlertValue2",
+                                   "HistoryAlertKey3": "HistoryAlertValue3"},
+                           }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createHistoryAlert_deviceStatus(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"historyAlert": {"assetId": "AvxV8hkR",
+                           "modelId": "Python_Demo_Model",
+                           "deviceStatus": "offline",
+                           "value": "offline",
+                           "occurTime": current_utc,
+                           "recoverTime": current_utc,
+                           # Optional Parameter
+                           "localOccurTime": current_local,
+                           "localRecoverTime": current_local,
+                           "recoverReason": "Your_HisotryAlert_recoverReason",
+                           "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                           "modelIdPath": "/Python_Demo_Model",
+                           "severityId": "HA_severityId",
+                           "severityDesc": {"defaultValue": "Default_HA_severityDescription",
+                                            "i18nValue": {"en_US": "HA_severityDescription",
+                                                          "zh_CN": "HA_严重性 描述",
+                                                          "ja_JP": "HA_重大度説明",
+                                                          "es_ES": "HA_severidad Descripción"}},
+                           "typeId": "HA_typeId",
+                           "typeDesc": {"defaultValue": "Default_HA_typeDescription",
+                                        "i18nValue": {"en_US": "HA_typeDescription",
+                                                      "zh_CN": "HA_类型描述",
+                                                      "ja_JP": "HA_タイプの説明",
+                                                      "es_ES": "HA_descripción del tipo"}},
+                           "subTypeId": "HA_subTypeId",
+                           "subTypeDesc": {"defaultValue": "Default_HA_subtypeDescription",
+                                           "i18nValue": {"en_US": "HA_subtypeDescription",
+                                                         "zh_CN": "HA_子类型描述",
+                                                         "ja_JP": "HA_サブタイプの説明",
+                                                         "es_ES": "HA_descripción del subtipo"}},
+                           "contentId": "HA_contentId",
+                           "contentDesc": {"defaultValue": "Default_HA_contentDescription",
+                                           "i18nValue": {"en_US": "HA_contentDescription",
+                                                         "zh_CN": "HA_内容描述",
+                                                         "ja_JP": "HA_コンテンツの説明",
+                                                         "es_ES": "HA_descripción del contenido"}},
+                           "tag": {"HistoryAlertKey1": "HistoryAlertValue1",
+                                   "HistoryAlertKey2": "HistoryAlertValue2",
+                                   "HistoryAlertKey3": "HistoryAlertValue3"},
+                           }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/record/old/historyAlertRecord/createHistoryAlertBatch.py b/alert/record/old/historyAlertRecord/createHistoryAlertBatch.py
new file mode 100644
index 0000000..a5b5010
--- /dev/null
+++ b/alert/record/old/historyAlertRecord/createHistoryAlertBatch.py
@@ -0,0 +1,300 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createHistoryAlertBatch
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Batch create history alerts
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_history_alerts_in_batch.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def createHistoryAlertBatch_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"historyAlertList": [{"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "measurepointId": "Int_MeasurementPoint",
+                                "value": 10,
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA1_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA1_severityDescription",
+                                                 "i18nValue": {"en_US": "HA1_severityDescription",
+                                                               "zh_CN": "HA1_严重性 描述",
+                                                               "ja_JP": "HA1_重大度説明",
+                                                               "es_ES": "HA1_severidad Descripción"}},
+                                "typeId": "HA1_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA1_typeDescription",
+                                             "i18nValue": {"en_US": "HA1_typeDescription",
+                                                           "zh_CN": "HA1_类型描述",
+                                                           "ja_JP": "HA1_タイプの説明",
+                                                           "es_ES": "HA1_descripción del tipo"}},
+                                "subTypeId": "HA1_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA1_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA1_subtypeDescription",
+                                                              "zh_CN": "HA1_子类型描述",
+                                                              "ja_JP": "HA1_サブタイプの説明",
+                                                              "es_ES": "HA1_descripción del subtipo"}},
+                                "contentId": "HA1_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA1_contentDescription",
+                                                "i18nValue": {"en_US": "HA1_contentDescription",
+                                                              "zh_CN": "HA1_内容描述",
+                                                              "ja_JP": "HA1_コンテンツの説明",
+                                                              "es_ES": "HA1_descripción del contenido"}},
+                                "tag": {"HistoryAlert1Key1": "HistoryAlert1Value1",
+                                        "HistoryAlert1Key2": "HistoryAlert1Value2",
+                                        "HistoryAlert1Key3": "HistoryAlert1Value3"},
+                                },
+                               {"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "measurepointId": "Int_MeasurementPoint",
+                                "value": 10,
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA2_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA2_severityDescription",
+                                                 "i18nValue": {"en_US": "HA2_severityDescription",
+                                                               "zh_CN": "HA2_严重性 描述",
+                                                               "ja_JP": "HA2_重大度説明",
+                                                               "es_ES": "HA2_severidad Descripción"}},
+                                "typeId": "HA2_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA2_typeDescription",
+                                             "i18nValue": {"en_US": "HA2_typeDescription",
+                                                           "zh_CN": "HA2_类型描述",
+                                                           "ja_JP": "HA2_タイプの説明",
+                                                           "es_ES": "HA2_descripción del tipo"}},
+                                "subTypeId": "HA2_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA2_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA2_subtypeDescription",
+                                                              "zh_CN": "HA2_子类型描述",
+                                                              "ja_JP": "HA2_サブタイプの説明",
+                                                              "es_ES": "HA2_descripción del subtipo"}},
+                                "contentId": "HA2_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA2_contentDescription",
+                                                "i18nValue": {"en_US": "HA2_contentDescription",
+                                                              "zh_CN": "HA2_内容描述",
+                                                              "ja_JP": "HA2_コンテンツの説明",
+                                                              "es_ES": "HA2_descripción del contenido"}},
+                                "tag": {"HistoryAlert2Key1": "HistoryAlert2Value1",
+                                        "HistoryAlert2Key2": "HistoryAlert2Value2",
+                                        "HistoryAlert2Key3": "HistoryAlert2Value3"},
+                                }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createHistoryAlertBatch_deviceStatus(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"historyAlertList": [{"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "deviceStatus": "offline",
+                                "value": "offline",
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA3_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA3_severityDescription",
+                                                 "i18nValue": {"en_US": "HA3_severityDescription",
+                                                               "zh_CN": "HA3_严重性 描述",
+                                                               "ja_JP": "HA3_重大度説明",
+                                                               "es_ES": "HA3_severidad Descripción"}},
+                                "typeId": "HA3_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA3_typeDescription",
+                                             "i18nValue": {"en_US": "HA3_typeDescription",
+                                                           "zh_CN": "HA3_类型描述",
+                                                           "ja_JP": "HA3_タイプの説明",
+                                                           "es_ES": "HA3_descripción del tipo"}},
+                                "subTypeId": "HA3_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA3_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA3_subtypeDescription",
+                                                              "zh_CN": "HA3_子类型描述",
+                                                              "ja_JP": "HA3_サブタイプの説明",
+                                                              "es_ES": "HA3_descripción del subtipo"}},
+                                "contentId": "HA3_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA3_contentDescription",
+                                                "i18nValue": {"en_US": "HA3_contentDescription",
+                                                              "zh_CN": "HA3_内容描述",
+                                                              "ja_JP": "HA3_コンテンツの説明",
+                                                              "es_ES": "HA3_descripción del contenido"}},
+                                "tag": {"HistoryAlert3Key1": "HistoryAlert3Value1",
+                                        "HistoryAlert3Key2": "HistoryAlert3Value2",
+                                        "HistoryAlert3Key3": "HistoryAlert3Value3"},
+                                },
+                               {"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "deviceStatus": "offline",
+                                "value": "offline",
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA4_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA4_severityDescription",
+                                                 "i18nValue": {"en_US": "HA4_severityDescription",
+                                                               "zh_CN": "HA4_严重性 描述",
+                                                               "ja_JP": "HA4_重大度説明",
+                                                               "es_ES": "HA4_severidad Descripción"}},
+                                "typeId": "HA4_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA4_typeDescription",
+                                             "i18nValue": {"en_US": "HA4_typeDescription",
+                                                           "zh_CN": "HA4_类型描述",
+                                                           "ja_JP": "HA4_タイプの説明",
+                                                           "es_ES": "HA4_descripción del tipo"}},
+                                "subTypeId": "HA4_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA4_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA4_subtypeDescription",
+                                                              "zh_CN": "HA4_子类型描述",
+                                                              "ja_JP": "HA4_サブタイプの説明",
+                                                              "es_ES": "HA4_descripción del subtipo"}},
+                                "contentId": "HA4_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA4_contentDescription",
+                                                "i18nValue": {"en_US": "HA4_contentDescription",
+                                                              "zh_CN": "HA4_内容描述",
+                                                              "ja_JP": "HA4_コンテンツの説明",
+                                                              "es_ES": "HA4_descripción del contenido"}},
+                                "tag": {"HistoryAlert4Key1": "HistoryAlert4Value1",
+                                        "HistoryAlert4Key2": "HistoryAlert4Value2",
+                                        "HistoryAlert4Key3": "HistoryAlert4Value3"},
+                                }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+    
+
+def createHistoryAlertBatch_mix(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "batchCreate", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"historyAlertList": [{"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "measurepointId": "Int_MeasurementPoint",
+                                "value": 10,
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA5_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA5_severityDescription",
+                                                 "i18nValue": {"en_US": "HA5_severityDescription",
+                                                               "zh_CN": "HA5_严重性 描述",
+                                                               "ja_JP": "HA5_重大度説明",
+                                                               "es_ES": "HA5_severidad Descripción"}},
+                                "typeId": "HA5_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA5_typeDescription",
+                                             "i18nValue": {"en_US": "HA5_typeDescription",
+                                                           "zh_CN": "HA5_类型描述",
+                                                           "ja_JP": "HA5_タイプの説明",
+                                                           "es_ES": "HA5_descripción del tipo"}},
+                                "subTypeId": "HA5_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA5_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA5_subtypeDescription",
+                                                              "zh_CN": "HA5_子类型描述",
+                                                              "ja_JP": "HA5_サブタイプの説明",
+                                                              "es_ES": "HA5_descripción del subtipo"}},
+                                "contentId": "HA5_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA5_contentDescription",
+                                                "i18nValue": {"en_US": "HA5_contentDescription",
+                                                              "zh_CN": "HA5_内容描述",
+                                                              "ja_JP": "HA5_コンテンツの説明",
+                                                              "es_ES": "HA5_descripción del contenido"}},
+                                "tag": {"HistoryAlert5Key1": "HistoryAlert5Value1",
+                                        "HistoryAlert5Key2": "HistoryAlert5Value2",
+                                        "HistoryAlert5Key3": "HistoryAlert5Value3"},
+                                },
+                               {"assetId": "AvxV8hkR",
+                                "modelId": "Python_Demo_Model",
+                                "deviceStatus": "offline",
+                                "value": "offline",
+                                "occurTime": current_utc,
+                                "recoverTime": current_utc,
+                                # Optional Parameter
+                                "localOccurTime": current_local,
+                                "localRecoverTime": current_local,
+                                "recoverReason": "Your_HisotryAlert_recoverReason",
+                                "assetPath": ["LlrLCZqt:/AvxV8hkR/pqXwiK5U/LKnsI2hG", "treeId1:/assetId1/assetIdx"],
+                                "modelIdPath": "/Python_Demo_Model",
+                                "severityId": "HA6_severityId",
+                                "severityDesc": {"defaultValue": "Default_HA6_severityDescription",
+                                                 "i18nValue": {"en_US": "HA6_severityDescription",
+                                                               "zh_CN": "HA6_严重性 描述",
+                                                               "ja_JP": "HA6_重大度説明",
+                                                               "es_ES": "HA6_severidad Descripción"}},
+                                "typeId": "HA6_typeId",
+                                "typeDesc": {"defaultValue": "Default_HA6_typeDescription",
+                                             "i18nValue": {"en_US": "HA6_typeDescription",
+                                                           "zh_CN": "HA6_类型描述",
+                                                           "ja_JP": "HA6_タイプの説明",
+                                                           "es_ES": "HA6_descripción del tipo"}},
+                                "subTypeId": "HA6_subTypeId",
+                                "subTypeDesc": {"defaultValue": "Default_HA6_subtypeDescription",
+                                                "i18nValue": {"en_US": "HA6_subtypeDescription",
+                                                              "zh_CN": "HA6_子类型描述",
+                                                              "ja_JP": "HA6_サブタイプの説明",
+                                                              "es_ES": "HA6_descripción del subtipo"}},
+                                "contentId": "HA6_contentId",
+                                "contentDesc": {"defaultValue": "Default_HA6_contentDescription",
+                                                "i18nValue": {"en_US": "HA6_contentDescription",
+                                                              "zh_CN": "HA6_内容描述",
+                                                              "ja_JP": "HA6_コンテンツの説明",
+                                                              "es_ES": "HA6_descripción del contenido"}},
+                                "tag": {"HistoryAlert6Key1": "HistoryAlert6Value1",
+                                        "HistoryAlert6Key2": "HistoryAlert6Value2",
+                                        "HistoryAlert6Key3": "HistoryAlert6Value3"},
+                                }]
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/record/old/historyAlertRecord/scrollHistoryAlerts.py b/alert/record/old/historyAlertRecord/scrollHistoryAlerts.py
new file mode 100644
index 0000000..a2fb16f
--- /dev/null
+++ b/alert/record/old/historyAlertRecord/scrollHistoryAlerts.py
@@ -0,0 +1,194 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: scrollHistoryAlerts
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Search for the past 3 months’ historical alerts. The first search returns a pageToken to be used for the next search, and all subsequent searches will return a different pageToken to be used for its next search
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/scroll_history_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+startTime = (datetime.now() - relativedelta(months=3)).strftime("%Y-%m-%d %H:%M:%S") # 3 months ago from current date
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+def scroll_pageToken(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageSize":10}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    pageToken = response['data']['pageToken']
+    print("pageToken:", pageToken)
+    return pageToken
+
+
+def scrollHistoryAlerts(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_modelId(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "modelId": "Python_Demo_Model"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_assetId(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "assetId": "AvxV8hkR"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_measurepointsId(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "measurepointsId": "Int_MeasurementPoint"
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_recoverTime(accessKey, secretKey, orgId, url):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "recoverStartTime": "2021-12-31 12:30:00",
+            "recoverEndTime": current_local,
+            "scroll": {"pageToken": pageToken}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, rootAlertId, treeId=None):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "rootAlert": {"rootAlertId": rootAlertId,
+                          "treeId": treeId}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def scrollHistoryAlerts_Scope(accessKey, secretKey, orgId, url, treeId, assetId=None, includeDerivative=False):
+    pageToken = scroll_pageToken(accessKey, secretKey, orgId, url)
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "scroll", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= { "startOccurTime": startTime,
+            "endOccurTime": current_local,
+            "scroll": {"pageToken": pageToken},
+            "scope": {"treeId": treeId,
+                    "fromAssetId": assetId,
+                    "includeDerivative": includeDerivative}
+           }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/alert/record/old/historyAlertRecord/searchHistoryAlerts.py b/alert/record/old/historyAlertRecord/searchHistoryAlerts.py
new file mode 100644
index 0000000..4713104
--- /dev/null
+++ b/alert/record/old/historyAlertRecord/searchHistoryAlerts.py
@@ -0,0 +1,159 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchHistoryAlert
+ * Author:  Dylan Yeo
+ * Date:    17/02/22
+ * Description: Search for the past 3 months’ historical alerts
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/search_history_alerts.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+current_utc = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+current_local = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+startTime = (datetime.now() - relativedelta(months=3)).strftime("%Y-%m-%d %H:%M:%S")
+
+def searchHistoryAlerts(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "pagination": {"pageNo": 1,
+                         "pageSize": 5}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_modelId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "modelId": "Python_Demo_Model"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_assetId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "assetId": "AvxV8hkR"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "measurepointId": "Int_MeasurementPoint"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_recoverTime(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "recoverStartTime": "2021-12-31 12:30:00",
+          "recoverEndTime": current_local
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "expression": expression
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_Scope(accessKey, secretKey, orgId, url, treeId, assetId=None, includeDerivative=False):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "scope": {"treeId": treeId,
+                    "fromAssetId": assetId,
+                    "includeDerivative": includeDerivative}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchHistoryAlerts_RootAlert(accessKey, secretKey, orgId, url, rootAlertId, treeId=None):
+    accessURL = url + '/event-service/v2.1/history-alerts'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"startOccurTime": startTime,
+          "endOccurTime": current_local,
+          "rootAlert": {"rootAlertId": rootAlertId,
+                        "treeId": treeId}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/rule/createAlertRule.py b/alert/rule/createAlertRule.py
new file mode 100644
index 0000000..77b48df
--- /dev/null
+++ b/alert/rule/createAlertRule.py
@@ -0,0 +1,147 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAlertRule
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Create an alert rule
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_alert_rule.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createAlertRule(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": "Python_Rule_ID",
+          "ruleDesc": {"defaultValue": "Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Alert_Rule_Description",
+                                     "zh_CN": "警报规则说明",
+                                     "ja_JP": "アラートルールの説明",
+                                     "es_ES":"Descripción De La Regla De Alerta"}},
+          "tags": {"RuleKey1": "RuleValue1",
+                   "RuleKey2": "RuleValue2",
+                   "RuleKey3": "RuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          "measurepointId": "Int_MeasurementPoint",
+          # "deviceStatus": "offline", # Alternative (Use either "measurepointId" or "deviceStatus")
+          "condition": "${Int_MeasurementPoint} < 100",
+          "scope": [{"treeId": "all",
+                     "assetId": "all"}],
+          "isEnabled": True,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createAlertRule_measurepointIdCondition(accessKey, secretKey, orgId, url, ruleId, measurepointId, condition):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": ruleId,
+          "ruleDesc": {"defaultValue": "Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Alert_Rule_Description",
+                                     "zh_CN": "警报规则说明",
+                                     "ja_JP": "アラートルールの説明",
+                                     "es_ES":"Descripción De La Regla De Alerta"}},
+          "tags": {"RuleKey1": "RuleValue1",
+                   "RuleKey2": "RuleValue2",
+                   "RuleKey3": "RuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          "measurepointId": measurepointId,
+          "condition": condition,
+          "scope": [{"treeId": "all",
+                     "assetId": "all"}],
+          "isEnabled": True,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createAlertRule_deviceStatusCondition(accessKey, secretKey, orgId, url, ruleId, condition):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": ruleId,
+          "ruleDesc": {"defaultValue": "Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Alert_Rule_Description",
+                                     "zh_CN": "警报规则说明",
+                                     "ja_JP": "アラートルールの説明",
+                                     "es_ES":"Descripción De La Regla De Alerta"}},
+          "tags": {"RuleKey1": "RuleValue1",
+                   "RuleKey2": "RuleValue2",
+                   "RuleKey3": "RuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          "deviceStatus": "offline",
+          "condition": condition,
+          "scope": [{"treeId": "all",
+                     "assetId": "all"}],
+          "isEnabled": True,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createAlertRule_scope(accessKey, secretKey, orgId, url, ruleId, treeId, assetId):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": ruleId,
+          "ruleDesc": {"defaultValue": "Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Alert_Rule_Description",
+                                     "zh_CN": "警报规则说明",
+                                     "ja_JP": "アラートルールの説明",
+                                     "es_ES":"Descripción De La Regla De Alerta"}},
+          "tags": {"RuleKey1": "RuleValue1",
+                   "RuleKey2": "RuleValue2",
+                   "RuleKey3": "RuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          "measurepointId": "Int_MeasurementPoint",
+          # "deviceStatus": "offline", # Alternative (Use either "measurepointId" or "deviceStatus")
+          "condition": "${Int_MeasurementPoint} < 100",
+          "scope": [{"treeId": treeId,
+                     "assetId": assetId}],
+          "isEnabled": True,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/alert/rule/deleteAlertRule.py b/alert/rule/deleteAlertRule.py
new file mode 100644
index 0000000..b46cdbd
--- /dev/null
+++ b/alert/rule/deleteAlertRule.py
@@ -0,0 +1,45 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAlertRule
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Delete an alert rule
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/delete_alert_rule.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteAlertRule(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "delete", "orgId": orgId, "ruleId": "Python_Rule_ID"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def deleteAlertRule_ruleId(accessKey, secretKey, orgId, url, ruleId):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "delete", "orgId": orgId, "ruleId": ruleId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/rule/searchAlertRule.py b/alert/rule/searchAlertRule.py
new file mode 100644
index 0000000..669cf76
--- /dev/null
+++ b/alert/rule/searchAlertRule.py
@@ -0,0 +1,76 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAlertRule
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Search for alert rules based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/search_alert_rule.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def searchAlertRule(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pagination": {"pageNo": 1,
+                           "pageSize": 10}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertRule_modelId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"modelId": "Python_Demo_Model"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertRule_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"measurepointId": "Int_MeasurementPoint"
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertRule_Expression(accessKey, secretKey, orgId, url, Expression):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"expression": Expression
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/rule/updateAlertRule.py b/alert/rule/updateAlertRule.py
new file mode 100644
index 0000000..f04591a
--- /dev/null
+++ b/alert/rule/updateAlertRule.py
@@ -0,0 +1,83 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAlertRule
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Update an alert rule. Any parameter (that is not null) included the request body can be updated
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_alert_rule.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAlertRule_measurepointId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": "Python_Rule_ID",
+          "ruleDesc": {"defaultValue": "Updated_Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Updated_Alert_Rule_Description",
+                                     "zh_CN": "更新警报规则说明",
+                                     "ja_JP": "アラートルールの説明を更新",
+                                     "es_ES":"Descripción De La Regla De Alerta Actualizada"}},
+          "tags": {"NewRuleKey1": "NewRuleValue1",
+                   "NewRuleKey2": "NewRuleValue2",
+                   "NewRuleKey3": "NewRuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          "measurepointId": "Int_MeasurementPoint",
+          # "deviceStatus": "offline", #Alternative (Use either "measurepointId" or "deviceStatus")
+          "condition": "${Int_MeasurementPoint} < 100",
+          "scope": [{"treeId": "all",
+                     "assetId": "all"}],
+          "isEnabled": True ,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def updateAlertRule_deviceStatus(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-rules'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"ruleId": "Python_Rule_ID",
+          "ruleDesc": {"defaultValue": "Updated_Default_Alert_Rule_Description",
+                       "i18nValue": {"en_US": "Updated_Alert_Rule_Description",
+                                     "zh_CN": "更新警报规则说明",
+                                     "ja_JP": "アラートルールの説明を更新",
+                                     "es_ES":"Descripción De La Regla De Alerta Actualizada"}},
+          "tags": {"NewRuleKey1": "NewRuleValue1",
+                   "NewRuleKey2": "NewRuleValue2",
+                   "NewRuleKey3": "NewRuleValue3"},
+          "severityId": "Python_Severity_ID",
+          "contentId": "Python_Content_ID",
+          "modelId": "Python_Demo_Model",
+          # "measurepointId": "Int_MeasurementPoint", # Alternative (Use either "measurepointId" or "deviceStatus")
+          "deviceStatus": "offline",
+          "condition": "${Int_MeasurementPoint} < 100",
+          "scope": [{"treeId": "all",
+                     "assetId": "all"}],
+          "isEnabled": True ,
+          "isRoot": False,
+          "triggeringDelayTimer": 120
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/severity/createAlertSeverity.py b/alert/severity/createAlertSeverity.py
new file mode 100644
index 0000000..cc29370
--- /dev/null
+++ b/alert/severity/createAlertSeverity.py
@@ -0,0 +1,38 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAlertSeverity
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Create a new alert severity
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_alert_severity
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createAlertSeverity(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-severities'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"severity": {"severityId": "Python_Severity_ID",
+                       "severityDesc": {"defaultValue": "Default_Severity_Error",
+                                        "i18nValue": {"en_US": "Severity_Error",
+                                                      "zh_CN": "严重性错误",
+                                                      "ja_JP":"重大度エラー",
+                                                      "es_ES":"ErrorDeGravedad"}},
+                       "tags": {"SeverityKey1": "SeverityValue1",
+                                "SeverityKey2": "SeverityValue2",
+                                "SeverityKey3": "SeverityValue3"}}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/severity/deleteAlertSeverity.py b/alert/severity/deleteAlertSeverity.py
new file mode 100644
index 0000000..7dc38ed
--- /dev/null
+++ b/alert/severity/deleteAlertSeverity.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAlertSeverity
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Delete an alert severity. It cannot be deleted if it is used by other rules
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/delete_alert_severity.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteAlertSeverity(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-severities'
+    params = {"action": "delete", "orgId": orgId, "severityId": "Severity_ID"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/severity/searchAlertSeverity.py b/alert/severity/searchAlertSeverity.py
new file mode 100644
index 0000000..8cf3885
--- /dev/null
+++ b/alert/severity/searchAlertSeverity.py
@@ -0,0 +1,46 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAlertSeverity
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Search for alert severity based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/search_alert_severity.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def searchAlertSeverity(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-severities'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pagination": {"pageNo": 1,
+                           "pageSize": 10}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertSeverity_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/event-service/v2.1/alert-severities'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/alert/severity/updateAlertSeverity.py b/alert/severity/updateAlertSeverity.py
new file mode 100644
index 0000000..80391fd
--- /dev/null
+++ b/alert/severity/updateAlertSeverity.py
@@ -0,0 +1,37 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAlertSeverity
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Update an alert severity
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_alert_severity.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAlertSeverity(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-severities'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"severity": {"severityId": "Python_Severity_ID",
+                       "severityDesc": {"defaultValue": "Default_Updated_Severity_Error",
+                                        "i18nValue": {"en_US": "Updated_Severity_Error",
+                                                      "zh_CN": "更新的严重性错误",
+                                                      "ja_JP":"更新された重大度エラー",
+                                                      "es_ES":"ErrorDeGravedadActualizado"}},
+                       "tags": {"NewSeverityKey1": "NewSeverityValue1",
+                                "NewSeverityKey2": "NewSeverityValue2",
+                                "NewSeverityKey3": "NewSeverityValue3"}}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/type/createAlertType.py b/alert/type/createAlertType.py
new file mode 100644
index 0000000..8cc1728
--- /dev/null
+++ b/alert/type/createAlertType.py
@@ -0,0 +1,62 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAlertType
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Create a new alert type
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_alert_type.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createAlertType(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"type": {"typeId": "Python_Type_ID",
+                   "typeDesc": {"defaultValue": "Default_Alert_Type",
+                                "i18nValue": {"en_US": "Alert_Type",
+                                              "zh_CN": "警报类型",
+                                              "ja_JP":"アラートタイプ",
+                                              "es_ES":"Tipo De Alerta"}},
+                   "tags": {"TypeKey1": "TypeValue1",
+                            "TypeKey2": "TypeValue2",
+                            "TypeKey3": "TypeValue3"}}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createAlertType_addParent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"type": {"typeId": "Python_Type_ID_Child",
+                   "typeDesc": {"defaultValue": "Default_Alert_Type_Child",
+                                "i18nValue": {"en_US": "Alert_Type_Child",
+                                              "zh_CN": "警报类型的孩子",
+                                              "ja_JP":"アラートタイプの子",
+                                              "es_ES":"Tipo De Alerta Niño"}},
+                   "tags": {"TypeKey1_Child": "TypeValue1_Child",
+                            "TypeKey2_Child": "TypeValue2_Child",
+                            "TypeKey3_Child": "TypeValue3_Child"},
+                   "parentTypeId": "Python_Type_ID"
+                   }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/type/deleteAlertType.py b/alert/type/deleteAlertType.py
new file mode 100644
index 0000000..ffbe907
--- /dev/null
+++ b/alert/type/deleteAlertType.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAlertType
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Delete an alert type. It cannot be deleted if it is used by other rules
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/delete_alert_type.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteAlertType(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types'
+    params = {"action": "delete", "orgId": orgId, "alertTypeId": "Python_Type_ID_Child"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/alert/type/searchAlertType.py b/alert/type/searchAlertType.py
new file mode 100644
index 0000000..1dc0e2b
--- /dev/null
+++ b/alert/type/searchAlertType.py
@@ -0,0 +1,44 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAlertType
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Search for alert types based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/create_alert_type.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def searchAlertType(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types/search'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": {"pageNo": 1,
+                           "pageSize": 10}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchAlertType_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/event-service/v2.1/alert-types/search'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/alert/type/updateAlertType.py b/alert/type/updateAlertType.py
new file mode 100644
index 0000000..2c37799
--- /dev/null
+++ b/alert/type/updateAlertType.py
@@ -0,0 +1,61 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAlertType
+ * Author:  Dylan Yeo
+ * Date:    15/02/22
+ * Description: Update an alert type. If the alert type already has a parent alert type, the parentTypeId cannot be updated
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/alert-api/en/2.3.0/update_alert_type.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAlertType(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"type": {"typeId": "Python_Type_ID",
+                   "typeDesc": {"defaultValue": "Default_Updated_Alert_Type",
+                                "i18nValue": {"en_US": "Updated_Alert_Type",
+                                              "zh_CN": "更新的警报类型",
+                                              "ja_JP":"アラートタイプを更新",
+                                              "es_ES":"Tipo De Alerta Actualizado"}},
+                   "tags": {"NewTypeKey1": "NewTypeValue1",
+                            "NewTypeKey2": "NewTypeValue2",
+                            "NewTypeKey3": "NewTypeValue3"}}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def updateAlertType_withParent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/event-service/v2.1/alert-types'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"type": {"typeId": "Python_Type_ID_Child",
+                   "typeDesc": {"defaultValue": "Default_Updated_Alert_Type_Child",
+                                "i18nValue": {"en_US": "Updated_Alert_Type_Child",
+                                              "zh_CN": "更新的警报类型子级",
+                                              "ja_JP":"アラートタイプの子を更新",
+                                              "es_ES":"Niño De Tipo De Alerta Actualizado"}},
+                   "tags": {"NewTypeKey1_Child": "NewTypeValue1_Child",
+                            "NewTypeKey2_Child": "NewTypeValue2_Child",
+                            "NewTypeKey3_Child": "NewTypeValue3_Child"},
+                   "parentTypeId": "Python_Type_ID"}
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/applicationportal/application/__pycache__/createMessage.cpython-310.pyc b/applicationportal/application/__pycache__/createMessage.cpython-310.pyc
new file mode 100644
index 0000000..21feddc
Binary files /dev/null and b/applicationportal/application/__pycache__/createMessage.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/getAppMenuAndPermission.cpython-310.pyc b/applicationportal/application/__pycache__/getAppMenuAndPermission.cpython-310.pyc
new file mode 100644
index 0000000..2748bcb
Binary files /dev/null and b/applicationportal/application/__pycache__/getAppMenuAndPermission.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/getColorsOfTheMessageIcon.cpython-310.pyc b/applicationportal/application/__pycache__/getColorsOfTheMessageIcon.cpython-310.pyc
new file mode 100644
index 0000000..de74ed3
Binary files /dev/null and b/applicationportal/application/__pycache__/getColorsOfTheMessageIcon.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/getMessageRingtones.cpython-310.pyc b/applicationportal/application/__pycache__/getMessageRingtones.cpython-310.pyc
new file mode 100644
index 0000000..7a23f34
Binary files /dev/null and b/applicationportal/application/__pycache__/getMessageRingtones.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/getUnresolvedMessages.cpython-310.pyc b/applicationportal/application/__pycache__/getUnresolvedMessages.cpython-310.pyc
new file mode 100644
index 0000000..9f44576
Binary files /dev/null and b/applicationportal/application/__pycache__/getUnresolvedMessages.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/getUserApplications.cpython-310.pyc b/applicationportal/application/__pycache__/getUserApplications.cpython-310.pyc
new file mode 100644
index 0000000..fe97335
Binary files /dev/null and b/applicationportal/application/__pycache__/getUserApplications.cpython-310.pyc differ
diff --git a/applicationportal/application/__pycache__/updateMessages.cpython-310.pyc b/applicationportal/application/__pycache__/updateMessages.cpython-310.pyc
new file mode 100644
index 0000000..ddec15c
Binary files /dev/null and b/applicationportal/application/__pycache__/updateMessages.cpython-310.pyc differ
diff --git a/applicationportal/application/createMessage.py b/applicationportal/application/createMessage.py
new file mode 100644
index 0000000..3bd18b4
--- /dev/null
+++ b/applicationportal/application/createMessage.py
@@ -0,0 +1,75 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createMessage
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Create common messages and alert messages on the Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/create_message.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+from datetime import datetime
+
+current_time = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
+
+def createMessage(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/message/produce"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"messages": [{"messageId": "test_messageId",
+                          "orgId": orgId,
+                          "accessKey": accessKey,
+                          "produceTime": current_time,
+                          "zoneOffset": "+08:00",
+                          "authUnitId": "G5M8Ojhd",
+                          "callbackUrl": "/",
+                          "actionName": {"en_US": "ACK",
+                                         "zh_CN": "确认",
+                                         "ja_JP": "はい",
+                                         "es_ES": "Sí"},
+                          "type": 1,
+                          "body": {"default": "Type message here default",
+                                   "en_US": "Type message here English",
+                                   "zh_CN": "在此处输入中文信息",
+                                   "ja_JP": "ここにメッセージを入力してください日本語",
+                                   "es_ES": "escriba el mensaje aquí español" },
+                          "color": 1,
+                          "ring": 1,
+                          "tags": [{"default": "Severe",
+                                    "en_US": "Severe",
+                                    "zh_CN": "严重",
+                                    "ja_JP": "重度",
+                                    "es_ES": "grave"},
+                                   {"default": "Performance Alarm",
+                                    "en_US": "Performance Alarm",
+                                    "zh_CN": "性能告警",
+                                    "ja_JP": "パフォーマンスアラーム",
+                                    "es_ES": "alarma de rendimiento"},
+                                   {"default": "Inverter",
+                                    "en_US": "Inverter",
+                                    "zh_CN": "逆变器",
+                                    "ja_JP": "インバーター",
+                                    "es_ES": "inversora"}],
+                          "state": 0,
+
+                          "feature": {"default": "This is a feature test in default",
+                                      "en_US": "This is a feature test in english",
+                                      "zh_CN": "这是中文的功能测试",
+                                      "ja_JP": "これは日本語の機能テストです",
+                                      "es_ES": "Esta es una prueba de características en español"},
+                          # "linkedAppId": "accessKey",
+                          # "linkedMenuCode": "menucode",
+                          # "linkedStates": "states",
+                          # "assetId": "G5M8Ojhd"
+                          }]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/application/getAppMenuAndPermission.py b/applicationportal/application/getAppMenuAndPermission.py
new file mode 100644
index 0000000..90c5757
--- /dev/null
+++ b/applicationportal/application/getAppMenuAndPermission.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAppMenuAndPermission
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the list of application menus and permissions
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/get_app_menu_and_permission.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAppMenuAndPermission(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/app/resource/info"
+    params = {"accessKey": accessKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/applicationportal/application/getColorsOfTheMessageIcon.py b/applicationportal/application/getColorsOfTheMessageIcon.py
new file mode 100644
index 0000000..2b962ca
--- /dev/null
+++ b/applicationportal/application/getColorsOfTheMessageIcon.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getColorsOfTheMessageIcon
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the list of colors for configuring the message icon
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/get_colors_of_the_message_icon.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getColorsOfTheMessageIcon(accessKey, secretKey, url):
+    accessURL = url + "/app-portal-service/v2.2/message/enum/colors"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/applicationportal/application/getMessageRingtones.py b/applicationportal/application/getMessageRingtones.py
new file mode 100644
index 0000000..12eaae4
--- /dev/null
+++ b/applicationportal/application/getMessageRingtones.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getMessageRingtones
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the list of ringtones for configuring the message
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/get_message_ringtones.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getMessageRingtones(accessKey, secretKey, url):
+    accessURL = url + "/app-portal-service/v2.2/message/enum/ringtones"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/applicationportal/application/getUnresolvedMessages.py b/applicationportal/application/getUnresolvedMessages.py
new file mode 100644
index 0000000..3ebc905
--- /dev/null
+++ b/applicationportal/application/getUnresolvedMessages.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUnresolvedMessages
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the list of unresolved messages that are reported for the applications
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/get_unresolved_messages.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUnresolvedMessages(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/message/unresolved/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"accessKey": accessKey,
+            "orgId": orgId,
+            "pagination": { "pageNo":0,
+                            "pageSize":5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/application/getUserApplications.py b/applicationportal/application/getUserApplications.py
new file mode 100644
index 0000000..44c46cb
--- /dev/null
+++ b/applicationportal/application/getUserApplications.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserApplications
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get a list of applications that the current user has permission to access through the access token
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/get_user_apps.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUserApplications(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/app/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/applicationportal/application/updateMessages.py b/applicationportal/application/updateMessages.py
new file mode 100644
index 0000000..8e97ebc
--- /dev/null
+++ b/applicationportal/application/updateMessages.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateMessages
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Update the status of the message
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/update_messages.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def updateMessages(accessKey, secretKey, url):
+    accessURL = url + "/app-portal-service/v2.2/message/update"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"messages": [{"messageId": "test_messageId",
+                          "accessKey": accessKey,
+                          "state": "1"}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/applicationPortalApp.py b/applicationportal/applicationPortalApp.py
new file mode 100644
index 0000000..e853d2b
--- /dev/null
+++ b/applicationportal/applicationPortalApp.py
@@ -0,0 +1,172 @@
+import aep.applicationportal.authentication.login as login_py
+import aep.applicationportal.authentication.logout as logout_py
+import aep.applicationportal.authentication.getTokenInformation as getTokenInformation_py
+import aep.applicationportal.authentication.refreshAccessToken as refreshAccessToken_py
+import aep.applicationportal.authentication.revokeRefreshToken as revokeRefreshToken_py
+import aep.applicationportal.usersandorganization.chooseOrganization as chooseOrganization_py
+import aep.applicationportal.usersandorganization.createAndJoinUser as createAndJoinUser_py
+import aep.applicationportal.usersandorganization.joinUsers as joinUsers_py
+import aep.applicationportal.usersandorganization.getManageableUserList as getManageableUserList_py
+import aep.applicationportal.usersandorganization.getOrganizationList as getOrganizationList_py
+import aep.applicationportal.usersandorganization.getOrganizationLanguageList as getOrganizationLanguageList_py
+import aep.applicationportal.usersandorganization.getOrganizationUserList as getOrganizationUserList_py
+import aep.applicationportal.usersandorganization.getOrganizationRoles as getOrganizationRoles_py
+import aep.applicationportal.usersandorganization.getAppUserList as getAppUserList_py
+import aep.applicationportal.usersandorganization.getUserInformation as getUserInformation_py
+import aep.applicationportal.usersandorganization.getUserDomain as getUserDomain_py
+import aep.applicationportal.usersandorganization.getUserStructures as getUserStructures_py
+import aep.applicationportal.usersandorganization.getUserRoles as getUserRoles_py
+import aep.applicationportal.usersandorganization.getUserPermissions as getUserPermissions_py
+import aep.applicationportal.usersandorganization.getUserBaseInfo as getUserBaseInfo_py
+import aep.applicationportal.usersandorganization.getUsersAssetList as getUsersAssetList_py
+import aep.applicationportal.usersandorganization.getUsersRoleList as getUsersRoleList_py
+import aep.applicationportal.usersandorganization.getUsersStructureList as getUsersStructureList_py
+import aep.applicationportal.usersandorganization.getUsersUserGroupList as getUsersUserGroupList_py
+import aep.applicationportal.usersandorganization.assignOrganizationStructures as assignOrganizationStructures_py
+import aep.applicationportal.usersandorganization.assignUserRoles as assignUserRoles_py
+import aep.applicationportal.usersandorganization.assignUserGroups as assignUserGroups_py
+import aep.applicationportal.usersandorganization.removeOrganizationStructures as removeOrganizationStructures_py
+import aep.applicationportal.usersandorganization.removeUserRoles as removeUserRoles_py
+import aep.applicationportal.usersandorganization.removeUserGroups as removeUserGroups_py
+import aep.applicationportal.usersandorganization.removeUser as removerUser_py
+import aep.applicationportal.asset.authorizeAsset as authorizeAsset_py
+import aep.applicationportal.asset.checkAssetPermission as checkAssetPermission_py
+import aep.applicationportal.asset.getAssetsByApplication as getAssetsByApplication_py
+import aep.applicationportal.asset.getAssetsByOrganization as getAssetsByOrganization_py
+import aep.applicationportal.asset.getAssetStructure as getAssetStructure_py
+import aep.applicationportal.asset.getStructureAsset as getStructureAsset_py
+import aep.applicationportal.asset.syncAsset as syncAsset_py
+import aep.applicationportal.asset.getUsersWithAssetAccess as getUsersWithAssetAccess_py
+import aep.applicationportal.application.createMessage as createMessage_py
+import aep.applicationportal.application.getAppMenuAndPermission as getAppMenuAndPermission_py
+import aep.applicationportal.application.getColorsOfTheMessageIcon as getColorsOfTheMessageIcon_py
+import aep.applicationportal.application.getMessageRingtones as getMessageRingtones_py
+import aep.applicationportal.application.getUserApplications as getUserApplications_py
+import aep.applicationportal.application.updateMessages as updateMessages_py
+import aep.applicationportal.application.getUnresolvedMessages as getUnresolvedMessages_py
+
+def applicationPortalGeneral(accessKey, secretKey, orgId, url):
+
+    '''
+    1. Authentication
+    https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/index_authentication.html
+    '''
+    # accessToken = login_py.login(accessKey, secretKey, url)
+
+    # refreshToken = chooseOrganization_py.chooseOrganization(accessKey, secretKey, orgId, url, accessToken)
+
+    # getTokenInformation_py.getTokenInformation(accessKey, secretKey, url, accessToken)
+
+    # newAccessToken = refreshAccessToken_py.refreshAccessToken(accessKey, secretKey, url, refreshToken)
+
+    # revokeRefreshToken_py.revokeRefreshToken(accessKey, secretKey, url, accessToken, refreshToken)
+
+    # logout_py.logout(accessKey, secretKey, url, newAccessToken)
+
+    '''
+    2. Users and Organisation
+    https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/index_user_ou.html
+    '''
+    # createAndJoinUser_py.createAndJoinUser(accessKey, secretKey, orgId, url)
+
+    # joinUsers_py.joinUsers(accessKey, secretKey, orgId, url)
+
+    # getManageableUserList_py.getManageableUserList(accessKey, secretKey, url, accessToken)
+
+    # getOrganizationList_py.getOrganizationList(accessKey, secretKey, url, accessToken)
+
+    # getOrganizationLanguageList_py.getOrganizationLanguageList(accessKey, secretKey, orgId, url)
+
+    # getOrganizationUserList_py.getOrganizationUserList(accessKey, secretKey, orgId, url)
+
+    # getOrganizationRoles_py.getOrganizationRoles(accessKey, secretKey, orgId, url)
+
+    # getAppUserList_py.getAppUserList(accessKey, secretKey, url, accessToken)
+
+    # getUserInformation_py.getUserInformation(accessKey, secretKey, url, accessToken)
+
+    # getUserDomain_py.getUserDomain(accessKey, secretKey, url)
+
+    # getUserStructures_py.getUserStructures(accessKey, secretKey, url, accessToken)
+
+    # getUserRoles_py.getUserRoles(accessKey, secretKey, orgId, url)
+
+    # getUserPermissions_py.getUserPermissions(accessKey, secretKey, orgId, url)
+
+    # getUserBaseInfo_py.getUserBaseInfo(accessKey, secretKey, orgId, url, email="ming.wang4@envision-digital.com")
+    # getUserBaseInfo_py.getUserBaseInfo(accessKey, secretKey, orgId, url, domain="enosBFCustomer2")
+    # getUserBaseInfo_py.getUserBaseInfo(accessKey, secretKey, orgId, url, phoneArea="86")
+    # getUserBaseInfo_py.getUserBaseInfo(accessKey, secretKey, orgId, url, phone="1231234")
+    # getUserBaseInfo_py.getUserBaseInfo(accessKey, secretKey, orgId, url, name="songxibin2013")
+
+    # getUsersAssetList_py.getUsersAssetList(accessKey, secretKey, orgId, url)
+
+    # getUsersRoleList_py.getUsersRoleList(accessKey, secretKey, orgId, url)
+
+    # getUsersStructureList_py.getUsersStructureList(accessKey, secretKey, orgId, url)
+
+    # getUsersUserGroupList_py.getUsersUserGroupList(accessKey, secretKey, orgId, url)
+
+    # assignOrganizationStructures_py.assignOrganizationStructures(accessKey, secretKey, orgId, url)
+
+    # assignUserRoles_py.assignUserRoles(accessKey, secretKey, orgId, url)
+
+    # assignUserGroups_py.assignUserGroups(accessKey, secretKey, orgId, url)
+
+    # removeOrganizationStructures_py.removeOrganizationStructures(accessKey, secretKey, orgId, url)
+
+    # removeUserRoles_py.removeUserRoles(accessKey, secretKey, orgId, url)
+
+    # removeUserGroups_py.removeUserGroups(accessKey, secretKey, orgId, url)
+
+    # removerUser_py.removeUser(accessKey, secretKey, orgId, url)
+
+    '''
+    3. Asset (Requires assets to be synchronize)
+    https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/index_asset.html
+    '''
+    # authorizeAsset_py.authorizeAsset(accessKey, secretKey, orgId, url)
+
+    # checkAssetPermission_py.checkAssetPermission(accessKey, secretKey, url, accessToken)
+
+    # getAssetsByApplication_py.getAssetsByApplication(accessKey, secretKey, url, accessToken)
+
+    # getAssetsByOrganization_py.getAssetsByOrganization(accessKey, secretKey, orgId, url)
+
+    # getAssetStructure_py.getAssetStructure(accessKey, secretKey, url, accessToken)
+
+    # getStructureAsset_py.getStructureAsset(accessKey, secretKey, url, accessToken)
+
+    # syncAsset_py.syncAsset(accessKey, secretKey, orgId, url)
+
+    # getUsersWithAssetAccess_py.getUsersWithAssetAccess(accessKey, secretKey, orgId, url)
+
+    '''
+    4. Application
+    https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/application/index_app.html
+    '''
+    # createMessage_py.createMessage(accessKey, secretKey, orgId, url)
+
+    # getAppMenuAndPermission_py.getAppMenuAndPermission(accessKey, secretKey, url, accessToken)
+
+    # getColorsOfTheMessageIcon_py.getColorsOfTheMessageIcon(accessKey, secretKey, url)
+
+    # getMessageRingtones_py.getMessageRingtones(accessKey, secretKey, url)
+
+    # getUserApplications_py.getUserApplications(accessKey, secretKey, url, accessToken)
+
+    # updateMessages_py.updateMessages(accessKey, secretKey, url)
+
+    # getUnresolvedMessages_py.getUnresolvedMessages(accessKey, secretKey, orgId, url)
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applicationportal/asset/__pycache__/authorizeAsset.cpython-310.pyc b/applicationportal/asset/__pycache__/authorizeAsset.cpython-310.pyc
new file mode 100644
index 0000000..c853f24
Binary files /dev/null and b/applicationportal/asset/__pycache__/authorizeAsset.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/checkAssetPermission.cpython-310.pyc b/applicationportal/asset/__pycache__/checkAssetPermission.cpython-310.pyc
new file mode 100644
index 0000000..d566bcd
Binary files /dev/null and b/applicationportal/asset/__pycache__/checkAssetPermission.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/getAssetStructure.cpython-310.pyc b/applicationportal/asset/__pycache__/getAssetStructure.cpython-310.pyc
new file mode 100644
index 0000000..9a78ef4
Binary files /dev/null and b/applicationportal/asset/__pycache__/getAssetStructure.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/getAssetsByApplication.cpython-310.pyc b/applicationportal/asset/__pycache__/getAssetsByApplication.cpython-310.pyc
new file mode 100644
index 0000000..cd4dfe5
Binary files /dev/null and b/applicationportal/asset/__pycache__/getAssetsByApplication.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/getAssetsByOrganization.cpython-310.pyc b/applicationportal/asset/__pycache__/getAssetsByOrganization.cpython-310.pyc
new file mode 100644
index 0000000..46d9065
Binary files /dev/null and b/applicationportal/asset/__pycache__/getAssetsByOrganization.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/getStructureAsset.cpython-310.pyc b/applicationportal/asset/__pycache__/getStructureAsset.cpython-310.pyc
new file mode 100644
index 0000000..4d4e5bd
Binary files /dev/null and b/applicationportal/asset/__pycache__/getStructureAsset.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/getUsersWithAssetAccess.cpython-310.pyc b/applicationportal/asset/__pycache__/getUsersWithAssetAccess.cpython-310.pyc
new file mode 100644
index 0000000..ff97d5b
Binary files /dev/null and b/applicationportal/asset/__pycache__/getUsersWithAssetAccess.cpython-310.pyc differ
diff --git a/applicationportal/asset/__pycache__/syncAsset.cpython-310.pyc b/applicationportal/asset/__pycache__/syncAsset.cpython-310.pyc
new file mode 100644
index 0000000..c96d1e6
Binary files /dev/null and b/applicationportal/asset/__pycache__/syncAsset.cpython-310.pyc differ
diff --git a/applicationportal/asset/authorizeAsset.py b/applicationportal/asset/authorizeAsset.py
new file mode 100644
index 0000000..12d3a70
--- /dev/null
+++ b/applicationportal/asset/authorizeAsset.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: authorizeAsset
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: When a new asset on the EnOS platform is synchronized to the Application Portal, use this API to authorize the new asset to the asset creator
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/authorize_asset.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def authorizeAsset(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/asset/append"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"orgId": orgId,
+            "userId": "u16473063753681521",
+            "assetIds": ["G5M8Ojhd", "OPVD7NPz", "Nmw9npSq"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/asset/checkAssetPermission.py b/applicationportal/asset/checkAssetPermission.py
new file mode 100644
index 0000000..f5b53ce
--- /dev/null
+++ b/applicationportal/asset/checkAssetPermission.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: checkAssetPermission
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: When a new asset on the EnOS platform is synchronized to the Application Portal, use this API to authorize the new asset to the asset creator
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/authorize_asset.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def checkAssetPermission(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/authorization/asset/check"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = { "assetIds": ["G5M8Ojhd", "OPVD7NPz", "Nmw9npSq"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/applicationportal/asset/getAssetStructure.py b/applicationportal/asset/getAssetStructure.py
new file mode 100644
index 0000000..a5c88d8
--- /dev/null
+++ b/applicationportal/asset/getAssetStructure.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetStructure
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the upstream organizational structure where the asset is located
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/get_asset_structure.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetStructure(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/asset/structure"
+    params = {"assetId": "0x19kHPY"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/applicationportal/asset/getAssetsByApplication.py b/applicationportal/asset/getAssetsByApplication.py
new file mode 100644
index 0000000..3ffa159
--- /dev/null
+++ b/applicationportal/asset/getAssetsByApplication.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetsByApplication
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get all the assets that the current user can access under a specified application
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/get_assets_by_app.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetsByApplication(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/app/asset/tree"
+    params = {"accessKey": accessKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/applicationportal/asset/getAssetsByOrganization.py b/applicationportal/asset/getAssetsByOrganization.py
new file mode 100644
index 0000000..19d9456
--- /dev/null
+++ b/applicationportal/asset/getAssetsByOrganization.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetsByOrganization
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get all the assets that a specified user can access under a specified organization
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/get_assets_by_ou.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetsByOrganization(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/asset/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"orgId": orgId,
+            "userId": "u16473063753681521",
+            "pagination": {"pageNo": 0,
+                           "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/asset/getStructureAsset.py b/applicationportal/asset/getStructureAsset.py
new file mode 100644
index 0000000..80e3952
--- /dev/null
+++ b/applicationportal/asset/getStructureAsset.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getStructureAsset
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get all the assets that the user can access under an organization structure
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/get_structure_asset.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getStructureAsset(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/structure/asset/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"structureIds": ["sg16256613934031600", "sg15780327471491"],
+            "locale": "en_US"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/applicationportal/asset/getUsersWithAssetAccess.py b/applicationportal/asset/getUsersWithAssetAccess.py
new file mode 100644
index 0000000..2185f4c
--- /dev/null
+++ b/applicationportal/asset/getUsersWithAssetAccess.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUsersWithAssetAccess
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Get the list of users who have access permission to a specific asset
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/get_assets_by_ou.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUsersWithAssetAccess(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/asset/authorize/user/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"orgId": orgId,
+            "assetId": "G5M8Ojhd"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/asset/syncAsset.py b/applicationportal/asset/syncAsset.py
new file mode 100644
index 0000000..1440ee9
--- /dev/null
+++ b/applicationportal/asset/syncAsset.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: syncAsset
+ * Author:  Dylan Yeo
+ * Date:    21/03/22
+ * Description: Synchronize assets on the EnOS to the Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/asset/sync_asset.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def syncAsset(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/asset/sync"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/applicationportal/authentication/__pycache__/getTokenInformation.cpython-310.pyc b/applicationportal/authentication/__pycache__/getTokenInformation.cpython-310.pyc
new file mode 100644
index 0000000..3262647
Binary files /dev/null and b/applicationportal/authentication/__pycache__/getTokenInformation.cpython-310.pyc differ
diff --git a/applicationportal/authentication/__pycache__/login.cpython-310.pyc b/applicationportal/authentication/__pycache__/login.cpython-310.pyc
new file mode 100644
index 0000000..92a2596
Binary files /dev/null and b/applicationportal/authentication/__pycache__/login.cpython-310.pyc differ
diff --git a/applicationportal/authentication/__pycache__/logout.cpython-310.pyc b/applicationportal/authentication/__pycache__/logout.cpython-310.pyc
new file mode 100644
index 0000000..363b15a
Binary files /dev/null and b/applicationportal/authentication/__pycache__/logout.cpython-310.pyc differ
diff --git a/applicationportal/authentication/__pycache__/refreshAccessToken.cpython-310.pyc b/applicationportal/authentication/__pycache__/refreshAccessToken.cpython-310.pyc
new file mode 100644
index 0000000..4f43f2a
Binary files /dev/null and b/applicationportal/authentication/__pycache__/refreshAccessToken.cpython-310.pyc differ
diff --git a/applicationportal/authentication/__pycache__/revokeRefreshToken.cpython-310.pyc b/applicationportal/authentication/__pycache__/revokeRefreshToken.cpython-310.pyc
new file mode 100644
index 0000000..fb0e051
Binary files /dev/null and b/applicationportal/authentication/__pycache__/revokeRefreshToken.cpython-310.pyc differ
diff --git a/applicationportal/authentication/getTokenInformation.py b/applicationportal/authentication/getTokenInformation.py
new file mode 100644
index 0000000..847c292
--- /dev/null
+++ b/applicationportal/authentication/getTokenInformation.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTokenInformation
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Get information about the user who is currently logged-in through the access token.
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/get_token_information.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTokenInformation(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/session/info"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
diff --git a/applicationportal/authentication/login.py b/applicationportal/authentication/login.py
new file mode 100644
index 0000000..e215346
--- /dev/null
+++ b/applicationportal/authentication/login.py
@@ -0,0 +1,34 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: login
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Log in to the account
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/login.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def login(accessKey, secretKey, url):
+    accessURL = url + "/app-portal-service/v2.2/login"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"account": "",
+            "password": ""
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        accessToken = response["data"]["accessToken"]
+    except:
+        accessToken = None
+    return accessToken
diff --git a/applicationportal/authentication/logout.py b/applicationportal/authentication/logout.py
new file mode 100644
index 0000000..048ff76
--- /dev/null
+++ b/applicationportal/authentication/logout.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: logout
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Log out of the account
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/logout.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def logout(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/logout"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header= {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/applicationportal/authentication/refreshAccessToken.py b/applicationportal/authentication/refreshAccessToken.py
new file mode 100644
index 0000000..789156e
--- /dev/null
+++ b/applicationportal/authentication/refreshAccessToken.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: refreshAccessToken
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Request a new access token using the refresh token
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/refresh_access_token.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def refreshAccessToken(accessKey, secretKey, url, refreshToken):
+    accessURL = url + "/app-portal-service/v2.2/token/refresh"
+    params = {"refreshToken": refreshToken}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+    try:
+        newAccessToken = response["data"]["accessToken"]
+    except:
+        newAccessToken = None
+    return newAccessToken
+
+
diff --git a/applicationportal/authentication/revokeRefreshToken.py b/applicationportal/authentication/revokeRefreshToken.py
new file mode 100644
index 0000000..d5be2cf
--- /dev/null
+++ b/applicationportal/authentication/revokeRefreshToken.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: revokeRefreshToken
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Revoke a user’s refresh token
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/authentication/revoke_refresh_token.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def revokeRefreshToken(accessKey, secretKey, url, accessToken, refreshToken):
+    accessURL = url + "/app-portal-service/v2.2/refreshToken/revokeAll"
+    params = {"refreshToken": refreshToken}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken,
+              "Content-Type": "application/x-www-form-urlencoded"}
+    print(header)
+
+    body = {}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, headers=header, method='POST')
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/__pycache__/assignOrganizationStructures.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/assignOrganizationStructures.cpython-310.pyc
new file mode 100644
index 0000000..51855f6
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/assignOrganizationStructures.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/assignUserGroups.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/assignUserGroups.cpython-310.pyc
new file mode 100644
index 0000000..4317bf4
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/assignUserGroups.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/assignUserRoles.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/assignUserRoles.cpython-310.pyc
new file mode 100644
index 0000000..2a9ea65
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/assignUserRoles.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/chooseOrganization.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/chooseOrganization.cpython-310.pyc
new file mode 100644
index 0000000..51b6241
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/chooseOrganization.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/createAndJoinUser.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/createAndJoinUser.cpython-310.pyc
new file mode 100644
index 0000000..371bd60
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/createAndJoinUser.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getAppUserList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getAppUserList.cpython-310.pyc
new file mode 100644
index 0000000..644446e
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getAppUserList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getManageableUserList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getManageableUserList.cpython-310.pyc
new file mode 100644
index 0000000..0228e62
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getManageableUserList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getOrganizationLanguageList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getOrganizationLanguageList.cpython-310.pyc
new file mode 100644
index 0000000..f41a143
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getOrganizationLanguageList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getOrganizationList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getOrganizationList.cpython-310.pyc
new file mode 100644
index 0000000..6fd111b
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getOrganizationList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getOrganizationRoles.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getOrganizationRoles.cpython-310.pyc
new file mode 100644
index 0000000..28ff2c1
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getOrganizationRoles.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getOrganizationUserList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getOrganizationUserList.cpython-310.pyc
new file mode 100644
index 0000000..f3e6a8c
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getOrganizationUserList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserBaseInfo.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserBaseInfo.cpython-310.pyc
new file mode 100644
index 0000000..8b479c5
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserBaseInfo.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserDomain.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserDomain.cpython-310.pyc
new file mode 100644
index 0000000..24ac00b
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserDomain.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserInformation.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserInformation.cpython-310.pyc
new file mode 100644
index 0000000..e096fa9
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserInformation.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserPermissions.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserPermissions.cpython-310.pyc
new file mode 100644
index 0000000..bb89aac
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserPermissions.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserRoles.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserRoles.cpython-310.pyc
new file mode 100644
index 0000000..916ce4e
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserRoles.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUserStructures.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUserStructures.cpython-310.pyc
new file mode 100644
index 0000000..467c6e1
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUserStructures.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUsersAssetList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUsersAssetList.cpython-310.pyc
new file mode 100644
index 0000000..527cb18
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUsersAssetList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUsersRoleList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUsersRoleList.cpython-310.pyc
new file mode 100644
index 0000000..c0066ff
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUsersRoleList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUsersStructureList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUsersStructureList.cpython-310.pyc
new file mode 100644
index 0000000..e6900aa
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUsersStructureList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/getUsersUserGroupList.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/getUsersUserGroupList.cpython-310.pyc
new file mode 100644
index 0000000..8a251aa
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/getUsersUserGroupList.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/joinUsers.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/joinUsers.cpython-310.pyc
new file mode 100644
index 0000000..3b50827
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/joinUsers.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/removeOrganizationStructures.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/removeOrganizationStructures.cpython-310.pyc
new file mode 100644
index 0000000..449413e
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/removeOrganizationStructures.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/removeUser.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/removeUser.cpython-310.pyc
new file mode 100644
index 0000000..bd911fb
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/removeUser.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/removeUserGroups.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/removeUserGroups.cpython-310.pyc
new file mode 100644
index 0000000..a2fc659
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/removeUserGroups.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/__pycache__/removeUserRoles.cpython-310.pyc b/applicationportal/usersandorganization/__pycache__/removeUserRoles.cpython-310.pyc
new file mode 100644
index 0000000..a481750
Binary files /dev/null and b/applicationportal/usersandorganization/__pycache__/removeUserRoles.cpython-310.pyc differ
diff --git a/applicationportal/usersandorganization/assignOrganizationStructures.py b/applicationportal/usersandorganization/assignOrganizationStructures.py
new file mode 100644
index 0000000..2e904f7
--- /dev/null
+++ b/applicationportal/usersandorganization/assignOrganizationStructures.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: assignOrganizationStructures
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign an organization structure to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_org_structures.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def assignOrganizationStructures(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/structure/appendStructures"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "structureIds": ["sg16000557456141", "sg16256613934031600"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/assignUserGroups.py b/applicationportal/usersandorganization/assignUserGroups.py
new file mode 100644
index 0000000..78c6249
--- /dev/null
+++ b/applicationportal/usersandorganization/assignUserGroups.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: assignUserGroups
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign a user group to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_usergroups.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def assignUserGroups(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/userGroup/appendUserGroups"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "userGroupIds": ["ug16110406799521691", "ug16124463904521679"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/assignUserRoles.py b/applicationportal/usersandorganization/assignUserRoles.py
new file mode 100644
index 0000000..a2eda4a
--- /dev/null
+++ b/applicationportal/usersandorganization/assignUserRoles.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: assignUserRoles
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign a role to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_user_roles.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def assignUserRoles(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/role/appendRoles"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "roleIds": ["ro16059397494401", "ro16113096236511727"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/chooseOrganization.py b/applicationportal/usersandorganization/chooseOrganization.py
new file mode 100644
index 0000000..f0ccbed
--- /dev/null
+++ b/applicationportal/usersandorganization/chooseOrganization.py
@@ -0,0 +1,37 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: chooseOrganization
+ * Author:  Dylan Yeo
+ * Date:    16/03/22
+ * Description: Select the organization that the user needs to use after login
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/choose_organization
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def chooseOrganization(accessKey, secretKey, orgId, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/session/set"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    headers = {"Authorization": "Bearer " + accessToken}
+    print(headers)
+
+    body = {"orgId": orgId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, headers=headers)
+    print(response)
+
+    try:
+        refreshToken = response["data"]["refreshToken"]
+    except:
+        refreshToken = None
+    return refreshToken
+
+
diff --git a/applicationportal/usersandorganization/createAndJoinUser.py b/applicationportal/usersandorganization/createAndJoinUser.py
new file mode 100644
index 0000000..f1eea13
--- /dev/null
+++ b/applicationportal/usersandorganization/createAndJoinUser.py
@@ -0,0 +1,34 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAndJoinUser
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Create a user and assign an OU to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/create_and_join_user.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createAndJoinUser(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/createAndJoin"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": "songxibin2013",
+            "domain": "iotsoft",
+            "email": "songxibin2013@gmail.com",
+            "organizationId": orgId,
+            "locale": "zh_CN",
+            "nickName": "songxibin2021"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getAppUserList.py b/applicationportal/usersandorganization/getAppUserList.py
new file mode 100644
index 0000000..1b4527b
--- /dev/null
+++ b/applicationportal/usersandorganization/getAppUserList.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAppUserList
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Based on the accessKey of an application, get the list of users who have access to the application
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_app_user_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getAppUserList(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"pagination": {"pageNo": 0,
+                           "pageSize": 10}}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getManageableUserList.py b/applicationportal/usersandorganization/getManageableUserList.py
new file mode 100644
index 0000000..44adfc4
--- /dev/null
+++ b/applicationportal/usersandorganization/getManageableUserList.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getManageableUserList
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: List all users that can be managed under the current account
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_manag_user_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getManageableUserList(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/organization/user/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"pagination": {"pageNo": 0,
+                            "pageSize": 10}}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getOrganizationLanguageList.py b/applicationportal/usersandorganization/getOrganizationLanguageList.py
new file mode 100644
index 0000000..3159ede
--- /dev/null
+++ b/applicationportal/usersandorganization/getOrganizationLanguageList.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOrganizationLanguageList
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get the list of languages available for an organization
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_organization_lang_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getOrganizationLanguageList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/organization/language/get"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getOrganizationList.py b/applicationportal/usersandorganization/getOrganizationList.py
new file mode 100644
index 0000000..d9a0d7b
--- /dev/null
+++ b/applicationportal/usersandorganization/getOrganizationList.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOrganizationList
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: List the organizations which the current user belongs to according to the access token
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_organization_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getOrganizationList(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/organization/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getOrganizationRoles.py b/applicationportal/usersandorganization/getOrganizationRoles.py
new file mode 100644
index 0000000..ea0e51f
--- /dev/null
+++ b/applicationportal/usersandorganization/getOrganizationRoles.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOrganizationRoles
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get all roles under an organization structure
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_organization_roles.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getOrganizationRoles(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/organization/role/list"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"locale": "en_US"}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getOrganizationUserList.py b/applicationportal/usersandorganization/getOrganizationUserList.py
new file mode 100644
index 0000000..853585b
--- /dev/null
+++ b/applicationportal/usersandorganization/getOrganizationUserList.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOrganizationUserList
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Authorize an application to get a list of all the users under a specified organization (OU) without logging in to the Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_ou_user_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getOrganizationUserList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/organization/roster"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"orgId": orgId,
+            "pagination": {"pageNo": 0,
+                           "pageSize": 10}
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUserBaseInfo.py b/applicationportal/usersandorganization/getUserBaseInfo.py
new file mode 100644
index 0000000..f4a4de4
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserBaseInfo.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserBaseInfo
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get basic information about a user, such as the user ID, based on the user’s email, account and domain, or phone number and phone area code
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_base_info.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUserBaseInfo(accessKey, secretKey, orgId, url, email=None, name=None, domain=None, phoneArea=None, phone=None):
+    accessURL = url + "/app-portal-service/v2.2/user/getUserBaseInfo"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "email": email,
+            "name": name,
+            "domain": domain,
+            "phoneArea": phoneArea,
+            "phone": phone}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/getUserDomain.py b/applicationportal/usersandorganization/getUserDomain.py
new file mode 100644
index 0000000..d7f8ee6
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserDomain.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserDomain
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get the domain information of a user using the email address
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_domain.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUserDomain(accessKey, secretKey, url):
+    accessURL = url + "/app-portal-service/v2.2/user/domain"
+    params = {"email": "songxibin2013@gmail.com"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUserInformation.py b/applicationportal/usersandorganization/getUserInformation.py
new file mode 100644
index 0000000..822a388
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserInformation.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserInformation
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get the information of the current user
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_information.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUserInformation(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/info"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUserPermissions.py b/applicationportal/usersandorganization/getUserPermissions.py
new file mode 100644
index 0000000..dd4d7aa
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserPermissions.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserPermissions
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get the permissions that are assigned to a user for the current application
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_permissions.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUserPermissions(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/permissions"
+    params = {"orgId": orgId, "userId": "u16473063753681521", "locale": "en_US"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUserRoles.py b/applicationportal/usersandorganization/getUserRoles.py
new file mode 100644
index 0000000..e8765f6
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserRoles.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserRoles
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get all roles that are assigned to a user
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_roles.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUserRoles(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/role/assignedList"
+    params = {"orgId": orgId, "userId": "u16473063753681521"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"locale": "en_US"}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUserStructures.py b/applicationportal/usersandorganization/getUserStructures.py
new file mode 100644
index 0000000..ee57180
--- /dev/null
+++ b/applicationportal/usersandorganization/getUserStructures.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUserStructures
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Get the information of the organization structure to which a user is assigned
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_user_structures.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUserStructures(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/app-portal-service/v2.2/user/structures"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/getUsersAssetList.py b/applicationportal/usersandorganization/getUsersAssetList.py
new file mode 100644
index 0000000..820d82e
--- /dev/null
+++ b/applicationportal/usersandorganization/getUsersAssetList.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUsersAssetList
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get the asset permissions of users without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_users_asset_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUsersAssetList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/users/assetList"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userIds": ["u15839808375371", "u16238383442701531", "u16050768760791", "u16473063753681521"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/getUsersRoleList.py b/applicationportal/usersandorganization/getUsersRoleList.py
new file mode 100644
index 0000000..57be2fd
--- /dev/null
+++ b/applicationportal/usersandorganization/getUsersRoleList.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUsersRoleList
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get the roles of users without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_users_role_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUsersRoleList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/userRoles/roleList"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userIds": ["u15839808375371", "u16238383442701531", "u16050768760791", "u16473063753681521"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/getUsersStructureList.py b/applicationportal/usersandorganization/getUsersStructureList.py
new file mode 100644
index 0000000..e060179
--- /dev/null
+++ b/applicationportal/usersandorganization/getUsersStructureList.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUsersStructureList
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get the organization structures of users without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_users_structure_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUsersStructureList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/userStructures/structureList"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userIds": ["u15839808375371", "u16238383442701531", "u16050768760791", "u16473063753681521"],
+            "locale": "en_US"}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/getUsersUserGroupList.py b/applicationportal/usersandorganization/getUsersUserGroupList.py
new file mode 100644
index 0000000..46323b4
--- /dev/null
+++ b/applicationportal/usersandorganization/getUsersUserGroupList.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUsersUserGroupList
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Get the user groups of users without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/get_users_usergroup_list.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getUsersUserGroupList(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/userGroup/getUsersUserGroupList"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userIds": ["u15839808375371", "u16238383442701531", "u16050768760791", "u16473063753681521"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/joinUsers.py b/applicationportal/usersandorganization/joinUsers.py
new file mode 100644
index 0000000..2c3f3d7
--- /dev/null
+++ b/applicationportal/usersandorganization/joinUsers.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: joinUsers
+ * Author:  Dylan Yeo
+ * Date:    17/03/22
+ * Description: Assign users to an organization without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/join_users.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def joinUsers(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/users/join"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userIds": ["u16473063753681521"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/applicationportal/usersandorganization/removeOrganizationStructures.py b/applicationportal/usersandorganization/removeOrganizationStructures.py
new file mode 100644
index 0000000..cf42f14
--- /dev/null
+++ b/applicationportal/usersandorganization/removeOrganizationStructures.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: removeOrganizationStructures
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign an organization structure to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_org_structures.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def removeOrganizationStructures(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/structure/removeStructures"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "structureIds": ["sg16000557456141", "sg16256613934031600"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/removeUser.py b/applicationportal/usersandorganization/removeUser.py
new file mode 100644
index 0000000..9b96dfb
--- /dev/null
+++ b/applicationportal/usersandorganization/removeUser.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: removeUser
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Remove a user from an OU without logging in to Application Portal. If the user only belongs to one OU, the user and the associated user data (including the username and the registered email address) will be permanently deleted
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/remove_user.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def removeUser(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/user/remove"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16475072968221401"}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/removeUserGroups.py b/applicationportal/usersandorganization/removeUserGroups.py
new file mode 100644
index 0000000..9d1345f
--- /dev/null
+++ b/applicationportal/usersandorganization/removeUserGroups.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: assignUserGroups
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign a user group to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_usergroups.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def removeUserGroups(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/userGroup/removeUserGroups"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "userGroupIds": ["ug16110406799521691", "ug16124463904521679"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/applicationportal/usersandorganization/removeUserRoles.py b/applicationportal/usersandorganization/removeUserRoles.py
new file mode 100644
index 0000000..4817f65
--- /dev/null
+++ b/applicationportal/usersandorganization/removeUserRoles.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: removeUserRoles
+ * Author:  Dylan Yeo
+ * Date:    18/03/22
+ * Description: Assign a role to the user without logging in to Application Portal
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/user_and_ou/assign_user_roles.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def removeUserRoles(accessKey, secretKey, orgId, url):
+    accessURL = url + "/app-portal-service/v2.2/role/removeRoles"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"organizationId": orgId,
+            "userId": "u16473063753681521",
+            "roleIds": ["ro16059397494401", "ro16113096236511727"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/asset/assetApp.py b/asset/assetApp.py
new file mode 100644
index 0000000..aefc6cb
--- /dev/null
+++ b/asset/assetApp.py
@@ -0,0 +1,31 @@
+#Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+#Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+DeviceAsset_assetId = "assetId1"
+#Logical Asset assetId can be found on EnOS portal (Go to Device Management/Logical Asset under Asset ID)
+LogicalAsset_assetId = "assetId2"
+
+def AssetGeneral(accessKey, secretKey, orgId, url):
+
+    '''Creates, Update, Get and Delete Logical Asset'''
+    # NewLogical_assetId = CreateLogicalAsset_py.CreateLogicalAsset(accessKey, secretKey, orgId, url, ModelId)
+    # UpdateLogicalAsset_py.UpdateLogicalAsset(accessKey, secretKey, orgId, url, NewLogical_assetId)
+    # GetAsset_py.GetAsset(accessKey, secretKey, orgId, url, NewLogical_assetId)
+    # DeleteLogicalAsset_py.DeleteLogicalAsset(accessKey, secretKey, orgId, url, NewLogical_assetId)
+
+    '''Update Existing Logical Asset using LogicalAsset_assetId as declared above'''
+    # UpdateLogicalAsset_py.UpdateLogicalAsset(accessKey, secretKey, orgId, url, LogicalAsset_assetId)
+
+    '''Update Existing Device Asset using DeviceAsset_assetId as declared above'''
+    # UpdateAsset_py.UpdateAsset(accessKey, secretKey, orgId, url, DeviceAsset_assetId)
+
+    '''Get Existing Logical Asset using LogicalAsset_assetId as declared above'''
+    # GetAsset_py.GetAsset(accessKey, secretKey, orgId, url, LogicalAsset_assetId)
+
+    '''Get Existing Device Asset using DeviceAsset_assetId as declared above'''
+    # GetAsset_py.GetAsset(accessKey, secretKey, orgId, url, DeviceAsset_assetId)
+
+
+
+
+
diff --git a/asset/createLogicalAsset.py b/asset/createLogicalAsset.py
new file mode 100644
index 0000000..27b0ecc
--- /dev/null
+++ b/asset/createLogicalAsset.py
@@ -0,0 +1,50 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateLogicalAsset
+ * Author:  Dylan Yeo
+ * Date:    04/02/22
+ * Description: Create a logical asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-api/en/2.3.0/create_logical_asset.html
+ * refer to the resources/AssetServiceModels/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 04/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def CreateLogicalAsset(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/asset-service/v2.1/logical-assets'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"assetInstance": {"modelId": modelId,
+                            "name": {"defaultValue": "Demo_Python_Asset",
+                                    "i18nValue": {"zh_CN": "演示Python断言", "en_US": "Asset_Demo_Python_Asset",
+                                    "ja_JP": "デモPythonアサート", "es_ES": "DeclaraciónDePythonDeDemostración"}},
+                            "timezone": "+08:00",
+                            "description": "Asset_Description",
+                            "attributes": {"Int_Attribute": 1,
+                                           "Float_Attribute": 1.23,
+                                           "String_Attribute": "Asset"},
+                            "tags": {"AssetKey1":"AssetValue1",
+                                     "AssetKey2":"AssetValue2",
+                                     "AssetKey3":"AssetValue3"}
+                            }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    AssetId = response["data"]
+    return AssetId
+
+
diff --git a/asset/deleteLogicalAsset.py b/asset/deleteLogicalAsset.py
new file mode 100644
index 0000000..e688f08
--- /dev/null
+++ b/asset/deleteLogicalAsset.py
@@ -0,0 +1,34 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: DeleteLogicalAsset
+ * Author:  Dylan Yeo
+ * Date:    04/02/22
+ * Description: Delete a specified logical asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://https://support.envisioniot.com/docs/asset-api/en/2.3.0/delete_logical_asset.html
+ * refer to the resources/AssetServiceModels/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 04/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def DeleteLogicalAsset(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/asset-service/v2.1/logical-assets'
+    params = {"action": "delete", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetId": assetId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/asset/getAsset.py b/asset/getAsset.py
new file mode 100644
index 0000000..6bd5eda
--- /dev/null
+++ b/asset/getAsset.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetAsset
+ * Author:  Dylan Yeo
+ * Date:    04/02/22
+ * Description: Get asset data by asset ID
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://https://support.envisioniot.com/docs/asset-api/en/2.3.0/get_asset.html
+ * refer to the resources/AssetServiceModels/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 04/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def GetAsset(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/asset-service/v2.1/assets'
+    params = {"action": "get", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/asset/updateAsset.py b/asset/updateAsset.py
new file mode 100644
index 0000000..4b85517
--- /dev/null
+++ b/asset/updateAsset.py
@@ -0,0 +1,49 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UpdateAsset
+ * Author:  Dylan Yeo
+ * Date:    04/02/22
+ * Description: Update asset information
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://https://support.envisioniot.com/docs/asset-api/en/2.3.0/update_asset.html
+ * refer to the resources/AssetServiceModels/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 04/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def UpdateAsset(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/asset-service/v2.1/assets'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"asset": {"assetId": assetId,
+                      "name": {"defaultValue": "Python_Demo_Device",
+                               "i18nValue": {"zh_CN": "Python 演示设备", "en_US": "Python_Demo_Device",
+                                             "ja_JP": "Pythonデモデバイス",
+                                             "es_ES": "DispositivoDeDemostraciónDePython"}},
+                      "description": "Updated Description",
+                      "timezone": "Asia/Shanghai",
+                      # "timezone": "+08:00", #Alternative
+                      "attributes": {"Int_Attribute": 246,
+                                     "Float_Attribute": 123.456,
+                                     "String_Attribute": "Update_Device"},
+                      "tags": {"DeviceKey1": "DeviceValue1",
+                               "DeviceKey2": "DeviceValue2",
+                               "DeviceKey3": "DeviceValue3"}
+                       }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/asset/updateLogicalAsset.py b/asset/updateLogicalAsset.py
new file mode 100644
index 0000000..37cbb22
--- /dev/null
+++ b/asset/updateLogicalAsset.py
@@ -0,0 +1,49 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UpdateLogicalAsset
+ * Author:  Dylan Yeo
+ * Date:    04/02/22
+ * Description: Update all or selected details of a logical asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://https://support.envisioniot.com/docs/asset-api/en/2.3.0/update_logical_asset.html
+ * refer to the resources/AssetServiceModels/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 04/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def UpdateLogicalAsset(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/asset-service/v2.1/logical-assets'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": True}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetUpdateVo": {"assetId": assetId,
+                              "name": {"defaultValue": "Default_Updated_Python_Asset",
+                                       "i18nValue": {"zh_CN": "更新的python资产", "en_US": "Updated_Python_Asset",
+                                                     "ja_JP": "更新されたPythonアセット",
+                                                     "es_ES": "ActivoDePythonActualizado"}},
+                              "description": "Updated Asset Description",
+                              "timezone": "Asia/Shanghai",
+                              # "timezone": "+08:00", #Alternative
+                              "attributes": {"Int_Attribute": 999,
+                                             "Float_Attribute": 123.456,
+                                             "String_Attribute": "Update_Asset"},
+                              "tags": {"AssetKey1": "Updated_AssetValue1",
+                                       "AssetKey2": "Updated_AssetValue2",
+                                       "AssetKey3": "Updated_AssetValue3",
+                                       "AssetKey4": "New_AssetValue4"}
+                              }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/assetTree/assetTree/assetTreeApp.py b/assetTree/assetTree/assetTreeApp.py
new file mode 100644
index 0000000..45f88f8
--- /dev/null
+++ b/assetTree/assetTree/assetTreeApp.py
@@ -0,0 +1,72 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+DeviceAsset_assetId = "assetId1"
+# Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+DeviceAsset_ProductKey = "pk1"
+# Device Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+DeviceAsset_DeviceKey = "dk1"
+# Logical Asset assetId can be found on EnOS portal (Go to Device Management/Logical Asset under Asset ID)
+LogicalAsset_assetId = "assetId2"
+# Tree Id can be found on the EnOS portal (Go to Asset Trees/<Asset_Tree_Name> under Tree ID)
+Existing_TreeId = "treeId1"
+
+
+def AssetTreeGeneral(accessKey, secretKey, orgId, url):
+    '''Create, Get and Delete Asset Tree and also delete Logical Asset which was created along with the Asset Tree'''
+    # TreeId = CreateAssetTree_py.CreateAssetTree(accessKey, secretKey, orgId, url, ModelId)
+    # AssetId = GetAssetTree_py.GetAssetTree(accessKey, secretKey, orgId, url, TreeId)
+    # DeleteAssetTree_py.DeleteAssetTree(accessKey, secretKey, orgId, url, TreeId)
+    # DeleteLogicalAsset_py.DeleteLogicalAsset(accessKey, secretKey, orgId, url, AssetId)
+
+    '''Create New Asset Tree and associate Asset Tree with a existing logical asset using its assetId,
+    LogicalAsset_assetId as defined above and 
+    Delete the Asset Tree
+    '''
+    # AssociatedLogicalAsset_TreeId = CreateAssetTreeAndAssociateAsset_py.CreateAssetTreeAndAssociateAsset_assetId(
+    # accessKey, secretKey, orgId, url, LogicalAsset_assetId)
+    # DeleteAssetTree_py.DeleteAssetTree(accessKey, secretKey, orgId, url, AssociatedLogicalAsset_TreeId)
+
+    '''Create New Asset Tree and associate Asset Tree with a exising device asset using its product key and device key,
+    DeviceAsset_ProductKey and DeviceAsset_DeviceKey as defined above respectively and 
+    Delete the Asset Tree
+    '''
+    # AssociatedDeviceAsset_TreeId = CreateAssetTreeAndAssociateAsset_py.CreateAssetTreeAndAssociateAsset_Keys(
+    # accessKey, secretKey, orgId, url, DeviceAsset_ProductKey, DeviceAsset_DeviceKey)
+    # DeleteAssetTree_py.DeleteAssetTree(accessKey, secretKey, orgId, url, AssociatedDeviceAsset_TreeId)
+
+    '''Update Existing Asset Tree using Existing_TreeId as declared above'''
+    # UpdateAssetTree_py.UpdateAssetTree(accessKey, secretKey, orgId, url, Existing_TreeId)
+
+    '''Get Asset Tree'''
+    # GetAssetTree_py.GetAssetTree(accessKey, secretKey, orgId, url, Existing_TreeId)
+
+    '''Search Asset Tree with projection and pagination'''
+    # SearchAssetTree_py.SearchAssetTree(accessKey, secretKey, orgId, url)
+
+    '''Search Asset Tree with expression using tree Id'''
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "treeId ='" + Existing_TreeId + "'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "treeId in ('" + Existing_TreeId + "')")
+
+    '''Search Asset Tree with expression using name'''
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name like 'Default_Updated_Python_AssetTree'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.default like 'Default_Updated_Python_AssetTree'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.default like 'Python_AssetTree'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.en_US like 'Updated_Python_AssetTree'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like '更新Python资产树'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like '树'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like '更新されたPythonアセットツリー'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like 'トツリー'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'ÁrbolDeActivosDePythonActualizado'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'Python'")
+
+    '''Search Asset Tree with expression using tags'''
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "tags.AssetTreeKey1 = 'AssetTreeValue1'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "tags.NewAssetTreeKey1 = 'NewAssetTreeValue1'")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "exists(tags.AssetKey1)")
+    # SearchAssetTree_py.SearchAssetTree_Expression(accessKey, secretKey, orgId, url, "exists(tags.NewAssetTreeKey1)")
+
+    '''Search Asset Tree with filter'''
+    # SearchAssetTree_py.SearchAssetTree_Filter(accessKey, secretKey, orgId, url)
+
+
diff --git a/assetTree/assetTree/createAssetTree.py b/assetTree/assetTree/createAssetTree.py
new file mode 100644
index 0000000..9abbb6a
--- /dev/null
+++ b/assetTree/assetTree/createAssetTree.py
@@ -0,0 +1,60 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Create an asset tree as well as its root node
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/create_asset_tree.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def CreateAssetTree(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "create", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"asset": {"modelId": modelId,
+                    "name": {"defaultValue": "Default_Demo_Python_Asset",
+                            "i18nValue": {"zh_CN": "演示Python断言",
+                                          "en_US": "Demo_Python_Asset",
+                                          "ja_JP": "デモPythonアサート",
+                                          "es_ES": "DeclaraciónDePythonDeDemostración"}},
+                    "timezone": "+08:00",
+                    "description": "AssetTree_Description",
+                    "attributes": {"Int_Attribute": 1,
+                                    "Float_Attribute": 1.23,
+                                    "String_Attribute": "Asset"},
+                    "tags": {"AssetKey1":"AssetValue1",
+                             "AssetKey2":"AssetValue2",
+                             "AssetKey3":"AssetValue3"}
+                    },
+          "tree": {"name": {"defaultValue": "Default_Demo_Python_AssetTree",
+                            "i18nValue": {"zh_CN": "演示Python资产树",
+                                          "en_US": "Demo_Python_AssetTree",
+                                          "ja_JP": "デモPythonアセットツリー",
+                                          "es_ES": "ÁrbolDeActivosDePythonDeDemostración"}},
+                   "tags": {"AssetTreeKey1": "AssetTreeValue1",
+                            "AssetTreeKey2": "AssetTreeValue2",
+                            "AssetTreeKey3": "AssetTreeValue3"}
+                   }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    treeId = response["data"]
+    return treeId
+
diff --git a/assetTree/assetTree/createAssetTreeAndAssociateAsset.py b/assetTree/assetTree/createAssetTreeAndAssociateAsset.py
new file mode 100644
index 0000000..1ce999d
--- /dev/null
+++ b/assetTree/assetTree/createAssetTreeAndAssociateAsset.py
@@ -0,0 +1,72 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Create an asset tree and link an existing asset as the root node of the asset tree.
+ *              The asset to be linked can be a device asset or a non-device (logical) asset.
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/create_asset_tree_and_associate_asset.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def CreateAssetTreeAndAssociateAsset_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "associate", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={ "tree": {"name": {"defaultValue": "Default_Demo_Python_AssetTree",
+                             "i18nValue": {"zh_CN": "演示Python资产树",
+                                           "en_US": "Demo_Python_AssetTree",
+                                           "ja_JP": "デモPythonアセットツリー",
+                                           "es_ES": "ÁrbolDeActivosDePythonDeDemostración"}},
+                   "tags": {"AssetTreeKey1": "AssetTreeValue1",
+                            "AssetTreeKey2": "AssetTreeValue2",
+                            "AssetTreeKey3": "AssetTreeValue3"}
+                   }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    TreeId = response["data"]
+    return TreeId
+
+
+def CreateAssetTreeAndAssociateAsset_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "associate", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={ "tree": {"name": {"defaultValue": "Default_Demo_Python_AssetTree",
+                             "i18nValue": {"zh_CN": "演示Python资产树", "en_US": "Demo_Python_AssetTree",
+                             "ja_JP": "デモPythonアセットツリー", "es_ES": "ÁrbolDeActivosDePythonDeDemostración"}},
+                   "tags": {"AssetTreeKey1": "AssetTreeValue1",
+                            "AssetTreeKey2": "AssetTreeValue2",
+                            "AssetTreeKey3": "AssetTreeValue3"}
+                   }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    TreeId = response["data"]
+    return TreeId
+
+
+
diff --git a/assetTree/assetTree/deleteAssetTree.py b/assetTree/assetTree/deleteAssetTree.py
new file mode 100644
index 0000000..6306f0f
--- /dev/null
+++ b/assetTree/assetTree/deleteAssetTree.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: DeleteAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Delete an asset tree
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/delete_asset_tree.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def DeleteAssetTree(accessKey, secretKey, orgId, url, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "delete", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+
+
diff --git a/assetTree/assetTree/getAssetTree.py b/assetTree/assetTree/getAssetTree.py
new file mode 100644
index 0000000..d63d964
--- /dev/null
+++ b/assetTree/assetTree/getAssetTree.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Get the details of an asset tree using an asset tree ID
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/get_asset_tree.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def GetAssetTree(accessKey, secretKey, orgId, url, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "get", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+    assetId = response["data"]["asset"]["assetId"]
+    return assetId
+
diff --git a/assetTree/assetTree/searchAssetTree.py b/assetTree/assetTree/searchAssetTree.py
new file mode 100644
index 0000000..0b935d5
--- /dev/null
+++ b/assetTree/assetTree/searchAssetTree.py
@@ -0,0 +1,79 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SearchAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Search for asset trees based on the query criterion
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/search_asset_tree.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SearchAssetTree(accessKey, secretKey, orgId, url):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"projection":["treeId",
+                          "tags",
+                          "asset",
+                          "name"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 5},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def SearchAssetTree_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetTree_Filter(accessKey, secretKey, orgId, url):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+
+    body = {"projection":["treeId",
+                          "tags",
+                          "asset",
+                          "name"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 5},
+            "filter": {"tags":{"NewAssetTreeKey1": "NewAssetTreeValue1"}}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/assetTree/assetTree/updateAssetTree.py b/assetTree/assetTree/updateAssetTree.py
new file mode 100644
index 0000000..c67c4ef
--- /dev/null
+++ b/assetTree/assetTree/updateAssetTree.py
@@ -0,0 +1,44 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UpdateAssetTree
+ * Author:  Dylan Yeo
+ * Date:    08/02/22
+ * Description: Update the information of an asset tree
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/update_asset_tree.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 08/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def UpdateAssetTree(accessKey, secretKey, orgId, url, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-trees'
+    params = {"action": "update", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"treeUpdateInfo":{"treeId":treeId,
+                            "name": {"defaultValue": "Default_Updated_Python_AssetTree",
+                            "i18nValue": {"zh_CN": "更新Python资产树",
+                                          "en_US": "Updated_Python_AssetTree",
+                                          "ja_JP": "更新されたPythonアセットツリー",
+                                          "es_ES": "ÁrbolDeActivosDePythonActualizado"}},
+                            "tags": {"NewAssetTreeKey1": "NewAssetTreeValue1",
+                                     "NewAssetTreeKey2": "NewAssetTreeValue2",
+                                     "NewAssetTreeKey3": "NewAssetTreeValue3"}
+         }}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/assetTree/assetTreeNode/assetTreeNodeApp.py b/assetTree/assetTreeNode/assetTreeNodeApp.py
new file mode 100644
index 0000000..e64abb2
--- /dev/null
+++ b/assetTree/assetTreeNode/assetTreeNodeApp.py
@@ -0,0 +1,194 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+DeviceAsset_assetId = "assetId1"
+# Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+DeviceAsset_ProductKey = "pk1"
+# Device Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+DeviceAsset_DeviceKey = "dk1"
+# Logical Asset assetId can be found on EnOS portal (Go to Device Management/Logical Asset under Asset ID)
+# Root Node Asset Id
+LogicalAsset_assetId = "assetId1"
+# Tree Id can be found on the EnOS portal (Go to Asset Trees/<Asset_Tree_Name> under Tree ID)
+Existing_TreeId = "treeId1"
+# These Asset Ids can be found on the EnOS portal (Go to Asset Trees/<Asset_Tree_Name>/<Asset_Name> under Asset ID)
+Node_AssetId = "assetId1"
+SubNode_AssetId = "assetId2"
+
+
+def AssetTreeNodeGeneral(accessKey, secretKey, orgId, url):
+
+    # AssociateAsset_py.AssociateAsset_assetId(accessKey, secretKey, orgId, url, DeviceAsset_assetId, Existing_TreeId, LogicalAsset_assetId)
+    # AssociateAsset_py.AssociateAsset_Keys(accessKey, secretKey, orgId, url, DeviceAsset_ProductKey, DeviceAsset_DeviceKey, Existing_TreeId, LogicalAsset_assetId)
+
+    # Node_AssetId= CreateAndAssociateAsset_py.CreateAndAssociateAsset(accessKey, secretKey, orgId, url, ModelId, Existing_TreeId, LogicalAsset_assetId)
+
+    # DeleteAssetNode_py.DeleteAssetNode_assetId(accessKey, secretKey, orgId, url, Node_AssetId, Existing_TreeId)
+    # DeleteAssetNode_py.DeleteAssetNode_Keys(accessKey, secretKey, orgId, url, DeviceAsset_ProductKey, DeviceAsset_DeviceKey, Existing_TreeId)
+
+    # GetAssetTrees_py.GetAssetTrees(accessKey, secretKey, orgId, url)
+
+    '''Search Asset Node with projection and pagination'''
+    # SearchAssetNode_py.SearchAssetNode(accessKey, secretKey, orgId, url)
+
+    '''Search Asset Node with expression using tree Id'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "treeId ='" + Existing_TreeId + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "treeId in ('" + Existing_TreeId + "')")
+
+    '''Search Asset Node with expression using asset Id'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "assetId ='" + LogicalAsset_assetId + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "assetId = 'G5M8Ojhd' or assetId ='AvxV8hkR'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "assetId in ('" + LogicalAsset_assetId + "')")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "assetIds in ('G5M8Ojhd','AvxV8hkR')")
+
+    '''Search Asset Node with expression using model Id'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "modelId in ('" + ModelId + "')")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "modelId ='" + ModelId + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "modelIds in ('Python_Demo_Model', 'EnOS_CITY_BUILDING')")
+
+    '''Search Asset Node with expression usiSng root model Id'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "rootModelId in ('" + ModelId + "')")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "rootModelId ='" + ModelId + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "rootModelIds in ('Python_Demo_Model', 'EnOS_CITY_BUILDING')")
+
+    '''Search Asset Node with expression using name'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name like 'Default_Python_AssetNode'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.default like 'Default_Python_AssetNode'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.default like 'Node'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.en_US like 'Python_AssetNode'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like 'Python断言节点'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like '节点'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like 'Pythonアサートノード'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like 'ード'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'NodoDeAfirmaciónDePython'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'Nodo'")
+
+    '''Search Asset Node with expression using attributes'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "attributes.Int_Attribute = 1")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "attributes.String_Attribute = 'AssetNode'")
+
+    '''Search Asset Node with expression using tags'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "tags.AssetNodeKey1 = 'AssetNodeValue1'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "exists(tags.AssetNodeKey1)")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "tags.AssetNodeKey2 in ('AssetNodeValue1','AssetNodeValue2')")
+
+    '''Search Asset Node with expression using createTime'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "createTime = 1640684761334")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "createTime <= 1639645258000")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "createTime >= 1639645258000")
+
+    '''Search Asset Node with expression using product key and device key'''
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "productKey ='" + DeviceAsset_ProductKey + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "deviceKey ='" + DeviceAsset_DeviceKey + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "deviceKey = 'RqMa4xiwqo' and productKey = '4kZqiPoC'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "productKey like'" + DeviceAsset_ProductKey + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "deviceKey like'" + DeviceAsset_DeviceKey + "'")
+    # SearchAssetNode_py.SearchAssetNode_Expression(accessKey, secretKey, orgId, url, "deviceKey like 'RqMa4xiwqo' and productKey like '4kZqiPoC'")
+
+    '''Search Asset Node with filter using asset Ids'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"assetIds": ["AvxV8hkR","pqXwiK5U"]})
+
+    '''Search Asset Node with filter using model Ids'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"modelIds": ["Python_Demo_Model","EnOS_CITY_BUILDING"]})
+
+    '''Search Asset Node with filter using root model Ids'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"rootModelIds": ["Python_Demo_Model","EnOS_CITY_BUILDING"]})
+
+    '''Search Asset Node with filter using attributes'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"attributes": {"Int_Attribute": 1,"String_Attribute": "AssetNode"}})
+
+    '''Search Asset Node with filter using tags'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"tags":{"AssetNodeKey1": "AssetNodeValue1","AssetNodeKey2": "AssetNodeValue2"}})
+
+    '''Search Asset Node with filter using nameLike'''
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Default_Python_AssetNode"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Default_Python_AssetNode", "locale": "default"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Python_AssetNode", "locale": "en_US"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Node", "locale": "en_US"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Python断言节点", "locale": "zh_CN"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "断言节点", "locale": "zh_CN"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "Pythonアサートノード", "locale": "ja_JP"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "アサート", "locale": "ja_JP"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "NodoDeAfirmaciónDePython", "locale": "es_ES"}})
+    # SearchAssetNode_py.SearchAssetNode_Filter(accessKey, secretKey, orgId, url, {"nameLike": {"value": "NodoDe", "locale": "es_ES"}})
+
+
+    '''Search Related Asset Node with projection and pagination'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode(accessKey, secretKey, orgId, url, Existing_TreeId)
+
+    '''Search Related Asset Node with filter using assetIds'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["AvxV8hkR","pqXwiK5U"]})
+
+    '''Search Related Asset Node with filter using model Ids'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"modelIds": ["Python_Demo_Model"]})
+
+    '''Search Related Asset Node with filter using root model Ids'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"rootModelIds": ["Python_Demo_Model"]})
+
+    '''Search Related Asset Node with filter using attributes'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"attributes": {"Int_Attribute": 1,"String_Attribute": "AssetNode"}})
+
+    '''Search Related Asset Node with filter using tags'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"tags":{"AssetNodeKey1": "AssetNodeValue1","AssetNodeKey2": "AssetNodeValue2"}})
+
+    '''Search Related Asset Node with filter using nameLike'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Default_Python_AssetNode"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Default_Python_AssetNode", "locale": "default"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Python_AssetNode", "locale": "en_US"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Node", "locale": "en_US"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Python断言节点", "locale": "zh_CN"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "断言节点", "locale": "zh_CN"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "Pythonアサートノード", "locale": "ja_JP"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "アサート", "locale": "ja_JP"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "NodoDeAfirmaciónDePython", "locale": "es_ES"}})
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"nameLike": {"value": "NodoDe", "locale": "es_ES"}})
+
+    '''Search Related Asset Node with filter using isParentOfAssetId'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"isParentOfAssetId": "pqXwiK5U"})
+
+    '''Search Related Asset Node with filter using isChildOfAssetId'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"isChildOfAssetId": "AvxV8hkR"})
+
+    '''Search Related Asset Node with filter using isAncestorOfAssetId'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"isAncestorOfAssetId": "pqXwiK5U"})
+
+    '''Search Related Asset Node with filter using isDescendantOfAssetId'''
+    # SearchRelatedAssetNode_py.SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, Existing_TreeId, {"isDescendantOfAssetId": "AvxV8hkR"})
+
+    '''Search Asset Path with projection and pagination'''
+    # SearchAssetPath_py.SearchAssetPath(accessKey, secretKey, orgId, url, Existing_TreeId)
+    
+    '''Search Asset Path with from (Starting point of asset paths) using root model Ids'''
+    # SearchAssetPath_py.SearchAssetPath_from(accessKey, secretKey, orgId, url, Existing_TreeId, {"rootModelIds": ["Python_Demo_Model"]})
+
+    '''Search Asset Path with from (Starting point of asset paths) using model Ids'''
+    # SearchAssetPath_py.SearchAssetPath_from(accessKey, secretKey, orgId, url, Existing_TreeId, {"modelIds": ["Python_Demo_Model"]})
+
+    '''Search Asset Path with from (Starting point of asset paths) using asset Ids'''
+    # SearchAssetPath_py.SearchAssetPath_from(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["AvxV8hkR"]})
+    # SearchAssetPath_py.SearchAssetPath_from(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["pqXwiK5U"]})
+    # SearchAssetPath_py.SearchAssetPath_from(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["AvxV8hkR","pqXwiK5U"]})
+
+    '''Search Asset Path with to (Ending point of asset paths) using root model Ids'''
+    # SearchAssetPath_py.SearchAssetPath_to(accessKey, secretKey, orgId, url, Existing_TreeId, {"rootModelIds": ["Python_Demo_Model"]})
+
+    '''Search Asset Path with to (Ending point of asset paths) using model Ids'''
+    # SearchAssetPath_py.SearchAssetPath_to(accessKey, secretKey, orgId, url, Existing_TreeId, {"modelIds": ["Python_Demo_Model"]})
+
+    '''Search Asset Path with to (Ending point of asset paths) using asset Ids'''
+    # SearchAssetPath_py.SearchAssetPath_to(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["LKnsI2hG"]})
+    # SearchAssetPath_py.SearchAssetPath_to(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["pqXwiK5U"]})
+    # SearchAssetPath_py.SearchAssetPath_to(accessKey, secretKey, orgId, url, Existing_TreeId, {"assetIds": ["pqXwiK5U","LKnsI2hG"]})
+
+    '''Search Asset Path with pathProjection (Choose between showing all paths or start & end points of paths)'''
+    # SearchAssetPath_py.SearchAssetPath_pathProjection(accessKey, secretKey, orgId, url, Existing_TreeId, "COMPLETE")
+    # SearchAssetPath_py.SearchAssetPath_pathProjection(accessKey, secretKey, orgId, url, Existing_TreeId, "END_NODE_ONLY")
+
+
+
+
+
+
+
+
+
diff --git a/assetTree/assetTreeNode/associateAsset.py b/assetTree/assetTreeNode/associateAsset.py
new file mode 100644
index 0000000..841354e
--- /dev/null
+++ b/assetTree/assetTreeNode/associateAsset.py
@@ -0,0 +1,47 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: associateAsset
+ * Author:  Dylan Yeo
+ * Date:    11/02/22
+ * Description: Link an existing asset to an asset tree. The asset to be linked can be a device asset or a non-device (logical) asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/associate_asset.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 11/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def AssociateAsset_assetId(accessKey, secretKey, orgId, url, assetId, treeId, parentAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "associateAsset", "orgId": orgId, "assetId": assetId,
+              "treeId": treeId, "parentAssetId": parentAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def AssociateAsset_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey, treeId, parentAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "associateAsset", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey,
+              "treeId": treeId, "parentAssetId": parentAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/assetTree/assetTreeNode/associateAssetBatch.py b/assetTree/assetTreeNode/associateAssetBatch.py
new file mode 100644
index 0000000..c5a2c9c
--- /dev/null
+++ b/assetTree/assetTreeNode/associateAssetBatch.py
@@ -0,0 +1,51 @@
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def AssociateAssetBatch_assetId(accessKey, secretKey, orgId, url, treeId, parentAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "associateAssetBatch", "orgId": orgId,
+              "treeId": treeId, "parentAssetId": parentAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "assetIdentifiers": [
+            {
+                "assetId": "yourAssetId1"
+            },
+            {
+                "assetId": "yourAssetId2"
+            }
+        ]
+    }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def AssociateAssetBatch_Keys(accessKey, secretKey, orgId, url, treeId, parentAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "associateAssetBatch", "orgId": orgId,
+              "treeId": treeId, "parentAssetId": parentAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "assetIdentifiers": [
+            {
+                "deviceKey": "yourDeviceKey1",
+                "productKey": "yourProductKey1"
+            },
+            {
+                "deviceKey": "yourDeviceKey2",
+                "productKey": "yourProductKey2"
+            }
+        ]
+    }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/assetTree/assetTreeNode/createAndAssociateAsset.py b/assetTree/assetTreeNode/createAndAssociateAsset.py
new file mode 100644
index 0000000..8fa38f3
--- /dev/null
+++ b/assetTree/assetTreeNode/createAndAssociateAsset.py
@@ -0,0 +1,51 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createAndAssociateAsset
+ * Author:  Dylan Yeo
+ * Date:    11/02/22
+ * Description: Create an asset and link it to an asset tree
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/create_and_associate_asset.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 11/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def CreateAndAssociateAsset(accessKey, secretKey, orgId, url, modelId, treeId, parentAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "createAsset", "orgId": orgId, "treeId": treeId, "parentAssetId": parentAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"asset": {"modelId": modelId,
+                    "name": {"defaultValue": "Default_Python_AssetNode",
+                            "i18nValue": {"zh_CN": "Python断言节点",
+                                          "en_US": "Python_AssetNode",
+                                          "ja_JP": "Pythonアサートノード",
+                                          "es_ES": "NodoDeAfirmaciónDePython"}},
+                    "timezone": "+08:00",
+                    "description": "AssetNode_Description",
+                    "attributes": {"Int_Attribute": 1,
+                                    "Float_Attribute": 1.23,
+                                    "String_Attribute": "AssetNode"},
+                    "tags": {"AssetNodeKey1":"AssetNodeValue1",
+                             "AssetNodeKey2":"AssetNodeValue2",
+                             "AssetNodeKey3":"AssetNodeValue3"}
+                    }
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    assetId = response["data"]
+    return assetId
+
diff --git a/assetTree/assetTreeNode/deleteAssetNode.py b/assetTree/assetTreeNode/deleteAssetNode.py
new file mode 100644
index 0000000..4c78d84
--- /dev/null
+++ b/assetTree/assetTreeNode/deleteAssetNode.py
@@ -0,0 +1,44 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAssetNode
+ * Author:  Dylan Yeo
+ * Date:    11/02/22
+ * Description: Remove an asset from an asset tree. The asset to be removed can be a device asset or a non-device (logical) asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/delete_asset_node.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 11/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def DeleteAssetNode_assetId(accessKey, secretKey, orgId, url, assetId, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "delete", "orgId": orgId, "treeId": treeId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def DeleteAssetNode_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "delete", "orgId": orgId, "treeId": treeId, "productKey":productKey, "deviceKey":deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/assetTree/assetTreeNode/getAssetTrees.py b/assetTree/assetTreeNode/getAssetTrees.py
new file mode 100644
index 0000000..a3e7b10
--- /dev/null
+++ b/assetTree/assetTreeNode/getAssetTrees.py
@@ -0,0 +1,36 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetTrees
+ * Author:  Dylan Yeo
+ * Date:    11/02/22
+ * Description: Get the details of one or multiple asset trees based on a set of assetIds. If the assetId is not in the tree, no Key will be returned in data
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/get_asset_trees.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 11/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def GetAssetTrees(accessKey, secretKey, orgId, url):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "getAssetTree", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": ["AvxV8hkR"],
+            "projection":["*.[*].treeId","*.[*].tags","*.[*].asset","*.[*].name"]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/assetTree/assetTreeNode/moveAssetNode.py b/assetTree/assetTreeNode/moveAssetNode.py
new file mode 100644
index 0000000..a2805e8
--- /dev/null
+++ b/assetTree/assetTreeNode/moveAssetNode.py
@@ -0,0 +1,15 @@
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def MoveAssetNode(accessKey, secretKey, orgId, url, assetId, treeId, parentAssetId, preAssetId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "move", "orgId": orgId, "assetId": assetId,
+              "treeId": treeId, "parentAssetId": parentAssetId, "preAssetId": preAssetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/assetTree/assetTreeNode/searchAssetNode.py b/assetTree/assetTreeNode/searchAssetNode.py
new file mode 100644
index 0000000..3a8fdca
--- /dev/null
+++ b/assetTree/assetTreeNode/searchAssetNode.py
@@ -0,0 +1,75 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAssetNode
+ * Author:  Dylan Yeo
+ * Date:    14/02/22
+ * Description: Search for assets based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/search_asset_node.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 14/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def SearchAssetNode(accessKey, secretKey, orgId, url):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "searchAsset", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"projection":["createTime",
+                          "modelId",
+                          "assetId",
+                          "timezone",
+                          "name",
+                          "description",
+                          "attributes",
+                          "inValid",
+                          "label",
+                          "modelIdPath",
+                          "tags"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 10},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetNode_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "searchAsset", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetNode_Filter(accessKey, secretKey, orgId, url, filter):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "searchAsset", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"filter": filter
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/assetTree/assetTreeNode/searchAssetPath.py b/assetTree/assetTreeNode/searchAssetPath.py
new file mode 100644
index 0000000..6619dbe
--- /dev/null
+++ b/assetTree/assetTreeNode/searchAssetPath.py
@@ -0,0 +1,81 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchAssetPath
+ * Author:  Dylan Yeo
+ * Date:    14/02/22
+ * Description: Search for paths on the asset tree. A path is a complete path from a superior asset node to a subordinate asset node, which can contain intermediate asset nodes
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/search_asset_path.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 14/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def SearchAssetPath(accessKey, secretKey, orgId, url, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-paths'
+    params = {"action": "search", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"projection":["assetPaths",
+                          "assets"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 10},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetPath_from(accessKey, secretKey, orgId, url, treeId, from_parameter):
+    accessURL = url + '/asset-tree-service/v2.1/asset-paths'
+    params = {"action": "search", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"from": from_parameter
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetPath_to(accessKey, secretKey, orgId, url, treeId, to_parameter):
+    accessURL = url + '/asset-tree-service/v2.1/asset-paths'
+    params = {"action": "search", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"to": to_parameter
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchAssetPath_pathProjection(accessKey, secretKey, orgId, url, treeId, pathStatus):
+    accessURL = url + '/asset-tree-service/v2.1/asset-paths'
+    params = {"action": "search", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pathProjection": pathStatus
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/assetTree/assetTreeNode/searchRelatedAssetNode.py b/assetTree/assetTreeNode/searchRelatedAssetNode.py
new file mode 100644
index 0000000..efa7008
--- /dev/null
+++ b/assetTree/assetTreeNode/searchRelatedAssetNode.py
@@ -0,0 +1,60 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchRelatedAssetNode
+ * Author:  Dylan Yeo
+ * Date:    14/02/22
+ * Description: Search for assets under the specified asset tree based on the relationship with a known asset
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/search_related_asset_node.html
+ * refer to the resources/AssetTreeService
+ *
+ * @author dylan.yeo
+ * @create 14/02/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def SearchRelatedAssetNode(accessKey, secretKey, orgId, url, treeId):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "searchRelatedAsset", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"projection":["createTime",
+                          "modelId",
+                          "assetId",
+                          "timezone",
+                          "name",
+                          "description",
+                          "attributes",
+                          "inValid",
+                          "label",
+                          "modelIdPath",
+                          "tags"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 10},
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchRelatedAssetNode_Filter(accessKey, secretKey, orgId, url, treeId, filter):
+    accessURL = url + '/asset-tree-service/v2.1/asset-nodes'
+    params = {"action": "searchRelatedAsset", "orgId": orgId, "treeId": treeId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"filter": filter
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/batchProcessing/batchProcessingApp.py b/batchProcessing/batchProcessingApp.py
new file mode 100644
index 0000000..82b3ce3
--- /dev/null
+++ b/batchProcessing/batchProcessingApp.py
@@ -0,0 +1,338 @@
+import batchProcessing.v2_1.cancelFlowInstance_V2_1 as CancelFlowInstance_V2_1_py
+import batchProcessing.v2_0.cancelFlowInstance_V2_0 as CancelFlowInstance_V2_0_py
+import batchProcessing.v2_1.createDirectory_V2_1 as CreateDirectory_V2_1_py
+import batchProcessing.v2_0.createDirectory_V2_0 as CreateDirectory_V2_0_py
+import batchProcessing.v2_1.deleteFlow_V2_1 as DeleteFlow_V2_1_py
+import batchProcessing.v2_0.deleteFlow_V2_0 as DeleteFlow_V2_0_py
+import batchProcessing.v2_1.disableFlow_V2_1 as DisableFlow_V2_1_py
+import batchProcessing.v2_0.disableFlow_V2_0 as DisableFlow_V2_0_py
+import batchProcessing.v2_1.enableFlow_V2_1 as EnableFlow_V2_1_py
+import batchProcessing.v2_0.enableFlow_V2_0 as EnableFlow_V2_0_py
+import batchProcessing.v2_1.exportFlow_V2_1 as ExportFlow_V2_1_py
+import batchProcessing.v2_0.exportFlow_V2_0 as ExportFlow_V2_0_py
+import batchProcessing.v2_1.getCurrentTime_V2_1 as GetCurrentTime_V2_1_py
+import batchProcessing.v2_0.getCurrentTime_V2_0 as GetCurrentTime_V2_0_py
+import batchProcessing.v2_1.getFlow_V2_1 as GetFlow_V2_1_py
+import batchProcessing.v2_0.getFlow_V2_0 as GetFlow_V2_0_py
+import batchProcessing.v2_1.getFlowInstance_V2_1 as GetFlowInstance_V2_1_py
+import batchProcessing.v2_0.getFlowInstance_V2_0 as GetFlowInstance_V2_0_py
+import batchProcessing.v2_1.getMyFlow_V2_1 as GetMyFlow_V2_1_py
+import batchProcessing.v2_0.getMyFlow_V2_0 as GetMyFlow_V2_0_py
+import batchProcessing.v2_1.getTaskInstance_V2_1 as GetTaskInstance_V2_1_py
+import batchProcessing.v2_1.getTaskInstanceLog_V2_1 as GetTaskInstanceLog_V2_1_py
+import batchProcessing.v2_0.getTaskInstanceLog_V2_0 as GetTaskInstanceLog_V2_0_py
+import batchProcessing.v2_1.getTimezone_V2_1 as GetTimezone_V2_1_py
+import batchProcessing.v2_0.getTimezone_V2_0 as GetTimezone_V2_0_py
+import batchProcessing.v2_1.importFlow_V2_1 as ImportFlow_V2_1_py
+import batchProcessing.v2_0.importFlow_V2_0 as ImportFlow_V2_0_py
+import batchProcessing.v2_1.listFlowInstances_V2_1 as ListFlowInstances_V2_1_py
+import batchProcessing.v2_0.listFlowInstances_V2_0 as ListFlowInstances_V2_0_py
+import batchProcessing.v2_1.listWorkflowDirectories_V2_1 as ListWorkFlowDirectories_V2_1_py
+import batchProcessing.v2_0.listWorkflowDirectories_V2_0 as ListWorkFlowDirectories_V2_0_py
+import batchProcessing.v2_1.loadFlowForEdit_V2_1 as LoadFlowForEdit_V2_1_py
+import batchProcessing.v2_0.loadFlowForEdit_V2_0 as LoadFlowForEdit_V2_0_py
+import batchProcessing.v2_1.saveFlow_V2_1 as SaveFlow_V2_1_py
+import batchProcessing.v2_0.saveFlow_V2_0 as SaveFlow_V2_0_py
+import batchProcessing.v2_1.searchFlow_V2_1 as SearchFlow_V2_1_py
+import batchProcessing.v2_0.searchFlow_V2_0 as SearchFlow_V2_0_py
+import batchProcessing.v2_1.triggerFlow_V2_1 as TriggerFlow_V2_1_py
+import batchProcessing.v2_0.triggerFlow_V2_0 as TriggerFlow_V2_0_py
+import batchProcessing.v2_1.triggerFlowFromTask_V2_1 as TriggerFlowFromTask_V2_1_py
+import batchProcessing.v2_1.updateAndTriggerFlow_V2_1 as UpdateAndTriggerFlow_V2_1_py
+import batchProcessing.v2_0.updateAndTriggerFlow_V2_0 as UpdateAndTriggerFlow_V2_0_py
+import time
+
+#userId can be found by clicking the profile icon on the top right corner of the EnOS portal under "User Id"
+userId = "u16418031372711526"
+current_Time = round(time.time()*1000)
+
+def batchProcessingGeneral(accessKey, secretKey, orgId, url):
+    '''Cancel Flow Instance: Version 2.1'''
+    # CancelFlowInstance_V2_1_py.cancelFlowInstance_V2_1(accessKey, secretKey, orgId, url,
+    #                                                    userId=userId,
+    #                                                    flowInstanceId="13766-20220311060000")
+
+    '''Cancel Flow Instance: Version 2.0'''
+    # CancelFlowInstance_V2_0_py.cancelFlowInstance_V2_0(accessKey, secretKey, orgId, url,
+    #                                                    userId=userId,
+    #                                                    flowInstanceId="13768-20220311060000")
+
+    '''Create Directory: Version 2.1'''
+    # CreateDirectory_V2_1_py.createDirectory_V2_1(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              parentId="71f03ea6ffd844dda5ef6380fc013592",
+    #                                              dirName="Python_Directory_NameV2_1")
+
+    '''Create Directory: Version 2.0'''
+    # CreateDirectory_V2_0_py.createDirectory_V2_0(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              parentId="71f03ea6ffd844dda5ef6380fc013592",
+    #                                              dirName="Python_Directory_NameV2_0")
+
+    '''Delete Flow: Version 2.1'''
+    # DeleteFlow_V2_1_py.deleteFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13770")
+
+    '''Delete Flow: Version 2.0'''
+    # DeleteFlow_V2_0_py.deleteFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13768")
+
+    '''Disable Flow: Version 2.1'''
+    # DisableFlow_V2_1_py.disableFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                      userId=userId,
+    #                                      flowId="13774")
+
+    '''Disable Flow: Version 2.0'''
+    # DisableFlow_V2_0_py.disableFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                      userId=userId,
+    #                                      flowId="13775")
+
+    '''Enable Flow: Version 2.1'''
+    # EnableFlow_V2_1_py.enableFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13774")
+
+    '''Enable Flow: Version 2.0'''
+    # EnableFlow_V2_0_py.enableFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13775")
+    
+    '''Export Flow: Version 2.1'''
+    # ExportFlow_V2_1_py.exportFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13774")
+
+    '''Export Flow: Version 2.0'''
+    # ExportFlow_V2_0_py.exportFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                    userId=userId,
+    #                                    flowId="13775")
+
+    '''Get Current Time: Version 2.1'''
+    # GetCurrentTime_V2_1_py.getCurrentTime_V2_1(accessKey, secretKey, url)
+
+    '''Get Current Time: Version 2.0'''
+    # GetCurrentTime_V2_0_py.getCurrentTime_V2_0(accessKey, secretKey, url)
+
+    '''Get Flow: Version 2.1'''
+    # GetFlow_V2_1_py.getFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                              userId=userId,
+    #                              flowId="13774")
+
+    '''Get Flow: Version 2.0'''
+    # GetFlow_V2_0_py.getFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                              userId=userId,
+    #                              flowId="13775")
+
+    '''Get Flow Instance: Version 2.1'''
+    # GetFlowInstance_V2_1_py.getFlowInstance_V2_1(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              flowInstId="13774-20220311040000")
+
+    '''Get Flow Instance: Version 2.0'''
+    # GetFlowInstance_V2_0_py.getFlowInstance_V2_0(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              flowInstId="13775-20220311060700")
+
+    '''Get My Flow: Version 2.1'''
+    # GetMyFlow_V2_1_py.getMyFlow_V2_1(accessKey, secretKey, orgId, url, userId=userId)
+    #
+    # GetMyFlow_V2_1_py.getMyFlow_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                             userId=userId,
+    #                                             expression="13774")
+    # GetMyFlow_V2_1_py.getMyFlow_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                             userId=userId,
+    #                                             expression="Python_FlowName2_1")
+
+    '''Get My Flow: Version 2.0'''
+    # GetMyFlow_V2_0_py.getMyFlow_V2_0(accessKey, secretKey, orgId, url, userId=userId)
+    #
+    # GetMyFlow_V2_0_py.getMyFlow_V2_0_searchValue(accessKey, secretKey, orgId, url,
+    #                                             userId=userId,
+    #                                             searchValue="13775")
+    # GetMyFlow_V2_0_py.getMyFlow_V2_0_searchValue(accessKey, secretKey, orgId, url,
+    #                                             userId=userId,
+    #                                             searchValue="Python_FlowName2_0")
+
+    '''Get Task Instance: Version 2.1'''
+    # GetTaskInstance_V2_1_py.getTaskInstance_V2_1(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              taskInstId="613010-2022031400")
+
+    '''Get Task Instance Log: Version 2.1'''
+    # GetTaskInstanceLog_V2_1_py.getTaskInstanceLog_V2_1(accessKey, secretKey, orgId, url,
+    #                                                    userId=userId,
+    #                                                    taskInstId="613010-2022031400",
+    #                                                    maxLength=100)
+
+    '''Get Task Instance Log: Version 2.0'''
+    # GetTaskInstanceLog_V2_0_py.getTaskInstanceLog_V2_0(accessKey, secretKey, orgId, url,
+    #                                                    userId=userId,
+    #                                                    taskInstId="613011-2022031400",
+    #                                                    maxLength=100)
+
+    '''Get Time Zone: Version 2.1'''
+    # GetTimezone_V2_1_py.getTimezone_V2_1(accessKey, secretKey, url)
+
+    '''Get Time Zone: Version 2.0'''
+    # GetTimezone_V2_0_py.getTimezone_V2_0(accessKey, secretKey, url)
+
+    '''Import Flow: Version 2.1'''
+    # ImportFlow_V2_1_py.importFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                 userId=userId,
+    #                                 flowName="Python_FlowName2_1",
+    #                                 description="Flow V2_1 Description",
+    #                                 dirId="97ec492e108b44f484a7790ee23764aa")
+
+    '''Import Flow: Version 2.0'''
+    # ImportFlow_V2_0_py.importFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                 userId=userId,
+    #                                 flowName="Python_FlowName2_0",
+    #                                 description="Flow V2_0 Description",
+    #                                 dirId="ea329ff896ad4cccbf64206836e2a6c0")
+
+    '''List Flow Instances: Version 2.1'''
+    # ListFlowInstances_V2_1_py.listFlowInstances_V2_1(accessKey, secretKey, orgId, url,
+    #                                                  userId=userId,
+    #                                                  schedule_type="1",
+    #                                                  owner="dylan.yeo",
+    #                                                  fromTriggerTime="1640995200000",
+    #                                                  toTriggerTime=current_Time,
+    #                                                  status="-1,0,1,2,3,4,5,6,7,8,9,10",
+    #                                                  )
+    #
+    # ListFlowInstances_V2_1_py.listFlowInstances_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             expression="13774-2022031400")
+    # ListFlowInstances_V2_1_py.listFlowInstances_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             expression="Python_FlowName2_1")
+    #
+    # ListFlowInstances_V2_1_py.listFlowInstances_V2_1_pagination(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             pagination={"pageNo": 1,
+    #                                                                         "pageSize": 5,
+    #                                                                         "sorters": [{
+    #                                                                             "field": "start_time",
+    #                                                                             "order": "DESC"
+    #                                                                         }]})
+
+    '''List Flow Instances: Version 2.0'''
+    # ListFlowInstances_V2_0_py.listFlowInstances_V2_0(accessKey, secretKey, orgId, url,
+    #                                                  userId=userId,
+    #                                                  schedule_type="1",
+    #                                                  owner="dylan.yeo",
+    #                                                  fromTriggerTime="1640995200000",
+    #                                                  toTriggerTime=current_Time,
+    #                                                  status="-1,0,1,2,3,4,5,6,7,8,9,10",
+    #                                                  )
+    #
+    # ListFlowInstances_V2_0_py.listFlowInstances_V2_0_expression(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             expression="13775-2022031400")
+    # ListFlowInstances_V2_0_py.listFlowInstances_V2_0_expression(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             expression="Python_FlowName2_0")
+    #
+    # ListFlowInstances_V2_0_py.listFlowInstances_V2_0_pagination(accessKey, secretKey, orgId, url,
+    #                                                             userId=userId,
+    #                                                             pagination={"pageNo": 0,
+    #                                                                         "pageSize": 5,
+    #                                                                         "sorters": [{
+    #                                                                             "field": "start_time",
+    #                                                                             "order": "DESC"
+    #                                                                         }]})
+
+    '''List Workflow Directories: Version 2.1'''
+    # ListWorkFlowDirectories_V2_1_py.listWorkFlowDirectories_V2_1(accessKey, secretKey, orgId, url, userId=userId)
+
+    '''List Workflow Directories: Version 2.0'''
+    # ListWorkFlowDirectories_V2_0_py.listWorkFlowDirectories_V2_0(accessKey, secretKey, orgId, url, userId=userId)
+
+    '''Load Flow for edit: Version 2.1'''
+    # LoadFlowForEdit_V2_1_py.loadFlowForEdit_V2_1(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              flowId="13774")
+
+    '''Load Flow for edit: Version 2.0'''
+    # LoadFlowForEdit_V2_0_py.loadFlowForEdit_V2_0(accessKey, secretKey, orgId, url,
+    #                                              userId=userId,
+    #                                              flowId="13775")
+
+    '''Save Flow: Version 2.1'''
+    # SaveFlow_V2_1_py.saveFlow_V2_1(accessKey, secretKey, orgId, url, userId=userId)
+
+    '''Save Flow: Version 2.0'''
+    # SaveFlow_V2_0_py.saveFlow_V2_0(accessKey, secretKey, orgId, url, userId=userId)
+
+    '''Search Flow: Version 2.1'''
+    # SearchFlow_V2_1_py.getFlow_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                            userId=userId,
+    #                                            expression="13774")
+    # SearchFlow_V2_1_py.getFlow_V2_1_expression(accessKey, secretKey, orgId, url,
+    #                                            userId=userId,
+    #                                            expression="Python_FlowName2_1")
+    #
+    # SearchFlow_V2_1_py.searchFlow_V2_1_pagination(accessKey, secretKey, orgId, url,
+    #                                               userId=userId,
+    #                                               pagination={"pageNo": 1,
+    #                                                           "pageSize": 20,
+    #                                                           "sorters": [{"field": "start_time",
+    #                                                                        "order": "DESC"
+    #                                                                        }]})
+
+    '''Search Flow: Version 2.0'''
+    # SearchFlow_V2_0_py.getFlow_V2_0_expression(accessKey, secretKey, orgId, url,
+    #                                            userId=userId,
+    #                                            expression="13775")
+    # SearchFlow_V2_0_py.getFlow_V2_0_expression(accessKey, secretKey, orgId, url,
+    #                                            userId=userId,
+    #                                            expression="Python_FlowName2_0")
+    #
+    # SearchFlow_V2_0_py.searchFlow_V2_0_pagination(accessKey, secretKey, orgId, url,
+    #                                               userId=userId,
+    #                                               pagination={"pageNo": 0,
+    #                                                           "pageSize": 20,
+    #                                                           "sorters": [{"field": "start_time",
+    #                                                                        "order": "DESC"
+    #                                                                        }]})
+
+    '''Trigger Flow: Version 2.1'''
+    # TriggerFlow_V2_1_py.triggerFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                      userId=userId,
+    #                                      flowId="13774",
+    #                                      triggerTime=current_Time)
+
+    '''Trigger Flow: Version 2.0'''
+    # TriggerFlow_V2_0_py.triggerFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                      userId=userId,
+    #                                      flowId="13775",
+    #                                      triggerTime=current_Time)
+
+    '''Trigger Flow From Task: Version 2.1'''
+    # TriggerFlowFromTask_V2_1_py.triggerFlowFromTask_V2_1(accessKey, secretKey, orgId, url,
+    #                                                      userId=userId,
+    #                                                      flowId="13774",
+    #                                                      taskId="613010",
+    #                                                      triggerTime=current_Time)
+
+    '''Parameters for Update and Trigger Flow'''
+    params = ["""java -cp ide.sdk-0.1.3.jar com.envision.dataplatform.C2R.C2RBeelineUtil -i
+              ${inputPath}  -o ${outputPath} -ot ${outputTableName} -ca ${columnAll} -cm
+              ${columnMust} -cs ${columnSelected} -g ${group_name} -h "${HIVE_JDBC}" -u
+              ${unix_timestamp} -z ${time_zone}"""]
+
+    '''Update and Trigger Flow: Version 2.1'''
+    # UpdateAndTriggerFlow_V2_1_py.updateAndTriggerFlow_V2_1(accessKey, secretKey, orgId, url,
+    #                                                        userId=userId,
+    #                                                        flowId="13774",
+    #                                                        triggerTime=current_Time,
+    #                                                        parameters=params)
+
+    '''Update and Trigger Flow: Version 2.0'''
+    # UpdateAndTriggerFlow_V2_0_py.updateAndTriggerFlow_V2_0(accessKey, secretKey, orgId, url,
+    #                                                        userId=userId,
+    #                                                        flowId="13775",
+    #                                                        triggerTime=current_Time,
+    #                                                        parameters=params)
diff --git a/batchProcessing/v2_0/cancelFlowInstance_V2_0.py b/batchProcessing/v2_0/cancelFlowInstance_V2_0.py
new file mode 100644
index 0000000..d54e3ed
--- /dev/null
+++ b/batchProcessing/v2_0/cancelFlowInstance_V2_0.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: cancelFlowInstance_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Cancel the running of a specified workflow instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/cancel_flow_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def cancelFlowInstance_V2_0(accessKey, secretKey, orgId, url, userId, flowInstanceId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flowInstances"
+    params = {"action": "cancel", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"flowInstId": flowInstanceId
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_0/createDirectory_V2_0.py b/batchProcessing/v2_0/createDirectory_V2_0.py
new file mode 100644
index 0000000..fe37c21
--- /dev/null
+++ b/batchProcessing/v2_0/createDirectory_V2_0.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createDirectory_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Create a directory
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/create_directory.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createDirectory_V2_0(accessKey, secretKey, orgId, url, userId, parentId, dirName):
+    accessURL = url + "/dataflow-batch-service/v2.0/directories"
+    params = {"action": "create", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"parentId": parentId,
+          "dirName" :dirName,
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_0/deleteFlow_V2_0.py b/batchProcessing/v2_0/deleteFlow_V2_0.py
new file mode 100644
index 0000000..edd6bec
--- /dev/null
+++ b/batchProcessing/v2_0/deleteFlow_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Delete a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/delete_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "delete", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/disableFlow_V2_0.py b/batchProcessing/v2_0/disableFlow_V2_0.py
new file mode 100644
index 0000000..3d509cb
--- /dev/null
+++ b/batchProcessing/v2_0/disableFlow_V2_0.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: disableFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Stop the scheduling of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/disable_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def disableFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "disable", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_0/enableFlow_V2_0.py b/batchProcessing/v2_0/enableFlow_V2_0.py
new file mode 100644
index 0000000..60a8630
--- /dev/null
+++ b/batchProcessing/v2_0/enableFlow_V2_0.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: enableFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Stop the scheduling of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/enable_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def enableFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "enable", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_0/exportFlow_V2_0.py b/batchProcessing/v2_0/exportFlow_V2_0.py
new file mode 100644
index 0000000..7c287c6
--- /dev/null
+++ b/batchProcessing/v2_0/exportFlow_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: exportFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Export a workflow configuration
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/export_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def exportFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "export", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/getCurrentTime_V2_0.py b/batchProcessing/v2_0/getCurrentTime_V2_0.py
new file mode 100644
index 0000000..cf808ec
--- /dev/null
+++ b/batchProcessing/v2_0/getCurrentTime_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getCurrentTime_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the current time of the server
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_current_time.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getCurrentTime_V2_0(accessKey, secretKey, url):
+    accessURL = url + "/dataflow-batch-service/v2.0/time"
+    params = {"action": "getCurrentTime"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/getFlowInstance_V2_0.py b/batchProcessing/v2_0/getFlowInstance_V2_0.py
new file mode 100644
index 0000000..adb052e
--- /dev/null
+++ b/batchProcessing/v2_0/getFlowInstance_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getFlowInstance_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the information of a specified workflow instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_flow_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlowInstance_V2_0(accessKey, secretKey, orgId, url, userId, flowInstId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flowInstances"
+    params = {"action": "get", "orgId": orgId, "userId": userId, "flowInstId": flowInstId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/getFlow_V2_0.py b/batchProcessing/v2_0/getFlow_V2_0.py
new file mode 100644
index 0000000..35ea4a2
--- /dev/null
+++ b/batchProcessing/v2_0/getFlow_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the information of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "get", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/getMyFlow_V2_0.py b/batchProcessing/v2_0/getMyFlow_V2_0.py
new file mode 100644
index 0000000..6111038
--- /dev/null
+++ b/batchProcessing/v2_0/getMyFlow_V2_0.py
@@ -0,0 +1,36 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getMyFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Search workflows that meet the search criteria
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_my_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getMyFlow_V2_0(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "getMyFlow", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getMyFlow_V2_0_searchValue(accessKey, secretKey, orgId, url, userId, searchValue):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "getMyFlow", "orgId": orgId, "userId": userId, "searchValue": searchValue}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/batchProcessing/v2_0/getTaskInstanceLog_V2_0.py b/batchProcessing/v2_0/getTaskInstanceLog_V2_0.py
new file mode 100644
index 0000000..c3ac242
--- /dev/null
+++ b/batchProcessing/v2_0/getTaskInstanceLog_V2_0.py
@@ -0,0 +1,23 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTaskInstanceLog_V2_0
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the log of a specified task instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_task_instance_log.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTaskInstanceLog_V2_0(accessKey, secretKey, orgId, url, userId, taskInstId, maxLength):
+    accessURL = url + "/dataflow-batch-service/v2.0/taskInstances"
+    params = {"action": "getLog", "orgId": orgId, "userId": userId, "taskInstId": taskInstId, "maxLength": maxLength}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/batchProcessing/v2_0/getTimezone_V2_0.py b/batchProcessing/v2_0/getTimezone_V2_0.py
new file mode 100644
index 0000000..ba15709
--- /dev/null
+++ b/batchProcessing/v2_0/getTimezone_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTimezone_V2_0
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Get the timezone where the server is located
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/get_time_zone.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTimezone_V2_0(accessKey, secretKey, url):
+    accessURL = url + "/dataflow-batch-service/v2.0/time"
+    params = {"action": "getTimeZone"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/importFlow_V2_0.py b/batchProcessing/v2_0/importFlow_V2_0.py
new file mode 100644
index 0000000..290ba80
--- /dev/null
+++ b/batchProcessing/v2_0/importFlow_V2_0.py
@@ -0,0 +1,67 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: importFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Import workflow configuration to create a workflow with the specified name under the specified directory
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/import_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def importFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowName, description, dirId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "import", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {
+        "flowJson": {
+            "cron": "0 0 0 * * ? *",
+            "desc": "",
+            "name": "flowJson_nameV2_0",
+            "type": 1,
+            "cycle": "D",
+            "tasks": [
+                {
+                    "cmd": "echo \"${REPLACE}\"",
+                    "cron": "",
+                    "name": "Task_Node_NameV2_0",
+                    "type": "COMMAND",
+                    "asLink": False,
+                    "timeout": 300,
+                    "resource": "default",
+                    "syncType": 1,
+                    "submitter": "",
+                    "retryLimit": 3,
+                    "filePackage": "",
+                    "successCode": "0",
+                    "priorityLevel": 0,
+                    "retryInterval": 0
+                }
+            ],
+            "owners": "dylan.yeo",
+            "syncType": 1,
+            "visitors": "dylan.yeo",
+            "alertMode": 3,
+            "flowLinks": [],
+            "relations": [],
+            "startTime": "2022-01-01",
+            "submitter": "db_demomanager",
+            "taskLinks": [],
+            "parameters": "[{\"key\":\"REPLACE\",\"value\":\"lili\"}]",
+            "linkRelations": []
+        },
+        "dirId": dirId,
+        "flowName": flowName,
+        "desc": description
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_0/listFlowInstances_V2_0.py b/batchProcessing/v2_0/listFlowInstances_V2_0.py
new file mode 100644
index 0000000..130a699
--- /dev/null
+++ b/batchProcessing/v2_0/listFlowInstances_V2_0.py
@@ -0,0 +1,86 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listFlowInstances_V2_0
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Search workflow instances that meet the search criteria
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/list_flow_instances.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+
+current_Time = round(time.time()*1000)
+
+def listFlowInstances_V2_0(accessKey, secretKey, orgId, url, userId, schedule_type, owner, fromTriggerTime, toTriggerTime, status):
+    accessURL = url + "/dataflow-batch-service/v2.0/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": schedule_type,
+            "owner": owner,
+            "fromTriggerTime": fromTriggerTime,
+            "toTriggerTime": toTriggerTime,
+            "status": status,
+            "pagination": {
+                "pageNo": 0,
+                "pageSize": 10,
+                "sorters": [{
+                    "field": "start_time",
+                    "order": "DESC"
+                }]}
+            }
+    # print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def listFlowInstances_V2_0_expression(accessKey, secretKey, orgId, url, userId, expression):
+    accessURL = url + "/dataflow-batch-service/v2.0/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": 1,
+            "expression": expression,
+            "owner": "dylan.yeo",
+            "fromTriggerTime": "1640995200000",
+            "toTriggerTime": current_Time,
+            "status": "-1,0,1,2,3,4,5,6,7,8,9,10",
+            "pagination": {
+                "pageNo": 0,
+                "pageSize": 10,
+                "sorters": [{
+                    "field": "start_time",
+                    "order": "ASC"
+                }]}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def listFlowInstances_V2_0_pagination(accessKey, secretKey, orgId, url, userId, pagination):
+    accessURL = url + "/dataflow-batch-service/v2.0/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": 1,
+            "owner": "dylan.yeo",
+            "fromTriggerTime": "1640995200000",
+            "toTriggerTime": current_Time,
+            "status": "-1,0,1,2,3,4,5,6,7,8,9,10",
+            "pagination": pagination
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/batchProcessing/v2_0/listWorkflowDirectories_V2_0.py b/batchProcessing/v2_0/listWorkflowDirectories_V2_0.py
new file mode 100644
index 0000000..2454527
--- /dev/null
+++ b/batchProcessing/v2_0/listWorkflowDirectories_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listWorkflowDirectories_V2_0
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Get all the content in the workflow directory of the current organization (OU), including workflow files and sub-directories
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/list_workflow_dirs.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listWorkFlowDirectories_V2_0(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/dataflow-batch-service/v2.0/directories"
+    params = {"action": "listWorkFlowDirs", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/loadFlowForEdit_V2_0.py b/batchProcessing/v2_0/loadFlowForEdit_V2_0.py
new file mode 100644
index 0000000..49508c9
--- /dev/null
+++ b/batchProcessing/v2_0/loadFlowForEdit_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: loadFlowForEdit_V2_0
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Load the specified workflow to a temporary workflow to get the workflow information
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/load_flow_for_edit.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def loadFlowForEdit_V2_0(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "loadForEdit", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_0/saveFlow_V2_0.py b/batchProcessing/v2_0/saveFlow_V2_0.py
new file mode 100644
index 0000000..eb9992f
--- /dev/null
+++ b/batchProcessing/v2_0/saveFlow_V2_0.py
@@ -0,0 +1,59 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: saveFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    15/03/22
+ * Description: Save the information of the current workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/save_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def saveFlow_V2_0(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "save", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"id": "13811",
+            "type": 1,
+            "name": "Python_SaveFlow2_0",
+            "freq": "0 0 0 * * ? *",
+            "cycle": "D",
+            "alertMode": 3,
+            "doAs": "db_demomanager",
+            "owners": "dylan.yeo",
+            "desc": "saveFlow_Testing2_0",
+            "startTime": "2022-03-15",
+            "visitors": "dylan.yeo",
+            "active": 1,
+            "queue": "",
+            "parameters": "[]",
+            "tasks": [{"taskId": "613317",
+                       "nodeId": "t_613317",
+                       "taskName": "SaveFlow_TaskNodeShell2_0",
+                       "x": 0.0132,
+                       "y": 0.008100000381469727}],
+            "flows": [{"flowId": "13775",
+                       "nodeId": "t_13775",
+                       "flowName": "Python_FlowName2_0",
+                       "isVirtual": True,
+                       "x": 0.0186,
+                       "y": 0.0016999999046325683}],
+            "relations": [{"cycleGap": "D0",
+                           "source": "t_13775",
+                           "rerun": True,
+                           "target": "t_613317"}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_0/searchFlow_V2_0.py b/batchProcessing/v2_0/searchFlow_V2_0.py
new file mode 100644
index 0000000..044952c
--- /dev/null
+++ b/batchProcessing/v2_0/searchFlow_V2_0.py
@@ -0,0 +1,47 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Search the basic information of workflows that meet the search criteria (including workflows of other users in the organization (OU))
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/search_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlow_V2_0_expression(accessKey, secretKey, orgId, url, userId, expression):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression,
+            "pagination": {"pageNo": 0,
+                           "pageSize": 10,
+                           "sorters": [{"field": "start_time",
+                                        "order": "DESC"
+                                        }]}
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchFlow_V2_0_pagination(accessKey, secretKey, orgId, url, userId, pagination):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": pagination
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/batchProcessing/v2_0/triggerFlow_V2_0.py b/batchProcessing/v2_0/triggerFlow_V2_0.py
new file mode 100644
index 0000000..7f6b584
--- /dev/null
+++ b/batchProcessing/v2_0/triggerFlow_V2_0.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: triggerFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Manually trigger a workflow schedule
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/trigger_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def triggerFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId, triggerTime):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "trigger", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId,
+            "triggerTime": triggerTime
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_0/updateAndTriggerFlow_V2_0.py b/batchProcessing/v2_0/updateAndTriggerFlow_V2_0.py
new file mode 100644
index 0000000..1b19e99
--- /dev/null
+++ b/batchProcessing/v2_0/updateAndTriggerFlow_V2_0.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAndTriggerFlow_V2_0
+ * Author:  Dylan Yeo
+ * Date:    15/03/22
+ * Description: Trigger workflow scheduling with updated parameters (the information of the original workflow is not changed; the updated parameters are only used to generate a workflow instance)
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.0/update_and_trigger_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAndTriggerFlow_V2_0(accessKey, secretKey, orgId, url, userId, flowId, triggerTime, parameters):
+    accessURL = url + "/dataflow-batch-service/v2.0/flows"
+    params = {"action": "updateAndTrigger", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId,
+            "triggerTime": triggerTime,
+            "parameters": parameters}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_1/cancelFlowInstance_V2_1.py b/batchProcessing/v2_1/cancelFlowInstance_V2_1.py
new file mode 100644
index 0000000..3efef1a
--- /dev/null
+++ b/batchProcessing/v2_1/cancelFlowInstance_V2_1.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: cancelFlowInstance_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Cancel the running of a specified workflow instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/cancel_flow_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def cancelFlowInstance_V2_1(accessKey, secretKey, orgId, url, userId, flowInstanceId):
+    accessURL = url + "/batch-processing-service/v2.1/flowInstances"
+    params = {"action": "cancel", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"flowInstId": flowInstanceId
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_1/createDirectory_V2_1.py b/batchProcessing/v2_1/createDirectory_V2_1.py
new file mode 100644
index 0000000..97cd8b7
--- /dev/null
+++ b/batchProcessing/v2_1/createDirectory_V2_1.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createDirectory_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Create a directory
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/create_directory.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createDirectory_V2_1(accessKey, secretKey, orgId, url, userId, parentId, dirName):
+    accessURL = url + "/batch-processing-service/v2.1/directories"
+    params = {"action": "create", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"parentId": parentId,
+          "dirName" :dirName,
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_1/deleteFlow_V2_1.py b/batchProcessing/v2_1/deleteFlow_V2_1.py
new file mode 100644
index 0000000..2f84e99
--- /dev/null
+++ b/batchProcessing/v2_1/deleteFlow_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Delete a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/delete_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "delete", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/disableFlow_V2_1.py b/batchProcessing/v2_1/disableFlow_V2_1.py
new file mode 100644
index 0000000..0129db4
--- /dev/null
+++ b/batchProcessing/v2_1/disableFlow_V2_1.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: disableFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Stop the scheduling of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/disable_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def disableFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "disable", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_1/enableFlow_V2_1.py b/batchProcessing/v2_1/enableFlow_V2_1.py
new file mode 100644
index 0000000..a2a9409
--- /dev/null
+++ b/batchProcessing/v2_1/enableFlow_V2_1.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: enableFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Start the scheduling of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/enable_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def enableFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "enable", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_1/exportFlow_V2_1.py b/batchProcessing/v2_1/exportFlow_V2_1.py
new file mode 100644
index 0000000..16dfbbb
--- /dev/null
+++ b/batchProcessing/v2_1/exportFlow_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: exportFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Export a workflow configuration
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/export_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def exportFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "export", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/getCurrentTime_V2_1.py b/batchProcessing/v2_1/getCurrentTime_V2_1.py
new file mode 100644
index 0000000..5b78307
--- /dev/null
+++ b/batchProcessing/v2_1/getCurrentTime_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getCurrentTime_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the current time of the server
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_current_time.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getCurrentTime_V2_1(accessKey, secretKey, url):
+    accessURL = url + "/batch-processing-service/v2.1/time"
+    params = {"action": "getCurrentTime"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/getFlowInstance_V2_1.py b/batchProcessing/v2_1/getFlowInstance_V2_1.py
new file mode 100644
index 0000000..87c0efb
--- /dev/null
+++ b/batchProcessing/v2_1/getFlowInstance_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getFlowInstance_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the information of a specified workflow instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_flow_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlowInstance_V2_1(accessKey, secretKey, orgId, url, userId, flowInstId):
+    accessURL = url + "/batch-processing-service/v2.1/flowInstances"
+    params = {"action": "get", "orgId": orgId, "userId": userId, "flowInstId": flowInstId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/getFlow_V2_1.py b/batchProcessing/v2_1/getFlow_V2_1.py
new file mode 100644
index 0000000..e0b9b5f
--- /dev/null
+++ b/batchProcessing/v2_1/getFlow_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the information of a specified workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "get", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/getMyFlow_V2_1.py b/batchProcessing/v2_1/getMyFlow_V2_1.py
new file mode 100644
index 0000000..ab3eb06
--- /dev/null
+++ b/batchProcessing/v2_1/getMyFlow_V2_1.py
@@ -0,0 +1,34 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getMyFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Search workflows that meet the search criteria
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_my_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getMyFlow_V2_1(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "getMyFlow", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getMyFlow_V2_1_expression(accessKey, secretKey, orgId, url, userId, expression):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "getMyFlow", "orgId": orgId, "userId": userId, "expression": expression}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/batchProcessing/v2_1/getTaskInstanceLog_V2_1.py b/batchProcessing/v2_1/getTaskInstanceLog_V2_1.py
new file mode 100644
index 0000000..ae8e6b4
--- /dev/null
+++ b/batchProcessing/v2_1/getTaskInstanceLog_V2_1.py
@@ -0,0 +1,23 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTaskInstanceLog_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the log of a specified task instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_task_instance_log.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTaskInstanceLog_V2_1(accessKey, secretKey, orgId, url, userId, taskInstId, maxLength):
+    accessURL = url + "/batch-processing-service/v2.1/taskInstances"
+    params = {"action": "getLog", "orgId": orgId, "userId": userId, "taskInstId": taskInstId, "maxLength": maxLength}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/batchProcessing/v2_1/getTaskInstance_V2_1.py b/batchProcessing/v2_1/getTaskInstance_V2_1.py
new file mode 100644
index 0000000..a11e61f
--- /dev/null
+++ b/batchProcessing/v2_1/getTaskInstance_V2_1.py
@@ -0,0 +1,23 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTaskInstanceLog_V2_1
+ * Author:  Dylan Yeo
+ * Date:    11/03/22
+ * Description: Get the information of a specified task node instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_task_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTaskInstance_V2_1(accessKey, secretKey, orgId, url, userId, taskInstId):
+    accessURL = url + "/batch-processing-service/v2.1/taskInstances"
+    params = {"action": "get", "orgId": orgId, "userId": userId, "taskInstId": taskInstId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/batchProcessing/v2_1/getTimezone_V2_1.py b/batchProcessing/v2_1/getTimezone_V2_1.py
new file mode 100644
index 0000000..0535511
--- /dev/null
+++ b/batchProcessing/v2_1/getTimezone_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTimezone_V2_1
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Get the timezone where the server is located
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/get_time_zone.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getTimezone_V2_1(accessKey, secretKey, url):
+    accessURL = url + "/batch-processing-service/v2.1/time"
+    params = {"action": "getTimeZone"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/importFlow_V2_1.py b/batchProcessing/v2_1/importFlow_V2_1.py
new file mode 100644
index 0000000..77b1f4c
--- /dev/null
+++ b/batchProcessing/v2_1/importFlow_V2_1.py
@@ -0,0 +1,67 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: importFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Import workflow configuration to create a workflow with the specified name under the specified directory
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/import_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def importFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowName, description, dirId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "import", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body= {
+        "flowJson": {
+            "cron": "0 0 0 * * ? *",
+            "desc": "",
+            "name": "flowJson_nameV2.1",
+            "type": 1,
+            "cycle": "D",
+            "tasks": [
+                {
+                    "cmd": "echo \"${REPLACE}\"",
+                    "cron": "",
+                    "name": "Task_Node_NameV2.1",
+                    "type": "COMMAND",
+                    "asLink": False,
+                    "timeout": 300,
+                    "resource": "default",
+                    "syncType": 1,
+                    "submitter": "",
+                    "retryLimit": 3,
+                    "filePackage": "",
+                    "successCode": "0",
+                    "priorityLevel": 0,
+                    "retryInterval": 0
+                }
+            ],
+            "owners": "dylan.yeo",
+            "syncType": 1,
+            "visitors": "dylan.yeo",
+            "alertMode": 3,
+            "flowLinks": [],
+            "relations": [],
+            "startTime": "2022-01-01",
+            "submitter": "db_demomanager",
+            "taskLinks": [],
+            "parameters": "[{\"key\":\"REPLACE\",\"value\":\"lili\"}]",
+            "linkRelations": []
+        },
+        "dirId": dirId,
+        "flowName": flowName,
+        "desc": description,
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/batchProcessing/v2_1/listFlowInstances_V2_1.py b/batchProcessing/v2_1/listFlowInstances_V2_1.py
new file mode 100644
index 0000000..b1f4075
--- /dev/null
+++ b/batchProcessing/v2_1/listFlowInstances_V2_1.py
@@ -0,0 +1,86 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listFlowInstances_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Search workflow instances that meet the search criteria
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/list_flow_instances.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+
+current_Time = round(time.time()*1000)
+
+def listFlowInstances_V2_1(accessKey, secretKey, orgId, url, userId, schedule_type, owner, fromTriggerTime, toTriggerTime, status):
+    accessURL = url + "/batch-processing-service/v2.1/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": schedule_type,
+            "owner": owner,
+            "fromTriggerTime": fromTriggerTime,
+            "toTriggerTime": toTriggerTime,
+            "status": status,
+            "pagination": {
+                "pageNo": 1,
+                "pageSize": 10,
+                "sorters": [{
+                    "field": "start_time",
+                    "order": "DESC"
+                }]}
+            }
+    # print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def listFlowInstances_V2_1_expression(accessKey, secretKey, orgId, url, userId, expression):
+    accessURL = url + "/batch-processing-service/v2.1/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": 1,
+            "expression": expression,
+            "owner": "dylan.yeo",
+            "fromTriggerTime": "1640995200000",
+            "toTriggerTime": current_Time,
+            "status": "-1,0,1,2,3,4,5,6,7,8,9,10",
+            "pagination": {
+                "pageNo": 1,
+                "pageSize": 10,
+                "sorters": [{
+                    "field": "start_time",
+                    "order": "ASC"
+                }]}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def listFlowInstances_V2_1_pagination(accessKey, secretKey, orgId, url, userId, pagination):
+    accessURL = url + "/batch-processing-service/v2.1/flowInstances"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"type": 1,
+            "owner": "dylan.yeo",
+            "fromTriggerTime": "1640995200000",
+            "toTriggerTime": current_Time,
+            "status": "-1,0,1,2,3,4,5,6,7,8,9,10",
+            "pagination": pagination
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/batchProcessing/v2_1/listWorkflowDirectories_V2_1.py b/batchProcessing/v2_1/listWorkflowDirectories_V2_1.py
new file mode 100644
index 0000000..d947a26
--- /dev/null
+++ b/batchProcessing/v2_1/listWorkflowDirectories_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listWorkflowDirectories_V2_1
+ * Author:  Dylan Yeo
+ * Date:    10/03/22
+ * Description: Get all the content in the workflow directory of the current organization (OU), including workflow files and sub-directories
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/list_workflow_dirs.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listWorkFlowDirectories_V2_1(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/batch-processing-service/v2.1/directories"
+    params = {"action": "listWorkFlowDirs", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/loadFlowForEdit_V2_1.py b/batchProcessing/v2_1/loadFlowForEdit_V2_1.py
new file mode 100644
index 0000000..a162931
--- /dev/null
+++ b/batchProcessing/v2_1/loadFlowForEdit_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: loadFlowForEdit_V2_1
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Load the specified workflow to a temporary workflow to get the workflow information
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/load_flow_for_edit.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def loadFlowForEdit_V2_1(accessKey, secretKey, orgId, url, userId, flowId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "loadForEdit", "orgId": orgId, "userId": userId, "flowId": flowId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/batchProcessing/v2_1/saveFlow_V2_1.py b/batchProcessing/v2_1/saveFlow_V2_1.py
new file mode 100644
index 0000000..75e520b
--- /dev/null
+++ b/batchProcessing/v2_1/saveFlow_V2_1.py
@@ -0,0 +1,59 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: saveFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    15/03/22
+ * Description: Save the information of the current workflow
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/trigger_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def saveFlow_V2_1(accessKey, secretKey, orgId, url, userId):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "save", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"id": "13810",
+            "type": 1,
+            "name": "Python_SaveFlow2_1",
+            "freq": "0 0 0 * * ? *",
+            "cycle": "D",
+            "alertMode": 3,
+            "doAs": "db_demomanager",
+            "owners": "dylan.yeo",
+            "desc": "saveFlow_Testing2_1",
+            "startTime": "2022-03-15",
+            "visitors": "dylan.yeo",
+            "active": 1,
+            "queue": "",
+            "parameters": "[]",
+            "tasks": [{"taskId": "613318",
+                       "nodeId": "t_613318",
+                       "taskName": "SaveFlow_TaskNodeShell2_1",
+                       "x": 0.0132,
+                       "y": 0.008100000381469727}],
+            "flows": [{"flowId": "13774",
+                       "nodeId": "t_13774",
+                       "flowName": "Python_FlowName2_1",
+                       "isVirtual": True,
+                       "x": 0.0186,
+                       "y": 0.0016999999046325683}],
+            "relations": [{"cycleGap": "D0",
+                           "source": "t_13774",
+                           "rerun": True,
+                           "target": "t_613318"}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_1/searchFlow_V2_1.py b/batchProcessing/v2_1/searchFlow_V2_1.py
new file mode 100644
index 0000000..a2ac9c0
--- /dev/null
+++ b/batchProcessing/v2_1/searchFlow_V2_1.py
@@ -0,0 +1,49 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Search the basic information of workflows that meet the search criteria (including workflows of other users in the organization (OU))
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/search_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getFlow_V2_1_expression(accessKey, secretKey, orgId, url, userId, expression):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression,
+            "pagination": {"pageNo": 1,
+                           "pageSize": 10,
+                           "sorters": [{"field": "start_time",
+                                        "order": "DESC"
+                                        }]}
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchFlow_V2_1_pagination(accessKey, secretKey, orgId, url, userId, pagination):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "search", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": pagination
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_1/triggerFlowFromTask_V2_1.py b/batchProcessing/v2_1/triggerFlowFromTask_V2_1.py
new file mode 100644
index 0000000..bb91d9c
--- /dev/null
+++ b/batchProcessing/v2_1/triggerFlowFromTask_V2_1.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: triggerFlowFromTask_V2_1
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Manually trigger a workflow schedule (run a specified task and its downstream nodes only)
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/trigger_flow_from_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def triggerFlowFromTask_V2_1(accessKey, secretKey, orgId, url, userId, flowId, taskId, triggerTime):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "triggerFromTask", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId,
+            "taskId": taskId,
+            "triggerTime": triggerTime
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_1/triggerFlow_V2_1.py b/batchProcessing/v2_1/triggerFlow_V2_1.py
new file mode 100644
index 0000000..243b2e4
--- /dev/null
+++ b/batchProcessing/v2_1/triggerFlow_V2_1.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: triggerFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    14/03/22
+ * Description: Manually trigger a workflow schedule
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/trigger_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def triggerFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId, triggerTime):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "trigger", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId,
+            "triggerTime": triggerTime
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/batchProcessing/v2_1/updateAndTriggerFlow_V2_1.py b/batchProcessing/v2_1/updateAndTriggerFlow_V2_1.py
new file mode 100644
index 0000000..b8588a0
--- /dev/null
+++ b/batchProcessing/v2_1/updateAndTriggerFlow_V2_1.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateAndTriggerFlow_V2_1
+ * Author:  Dylan Yeo
+ * Date:    15/03/22
+ * Description: Trigger workflow scheduling with updated parameters (the information of the original workflow is not changed; the updated parameters are only used to generate a workflow instance)
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/v2.1/update_and_trigger_flow.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateAndTriggerFlow_V2_1(accessKey, secretKey, orgId, url, userId, flowId, triggerTime, parameters):
+    accessURL = url + "/batch-processing-service/v2.1/flows"
+    params = {"action": "updateAndTrigger", "orgId": orgId, "userId": userId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"flowId": flowId,
+            "triggerTime": triggerTime,
+            "parameters": parameters}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
+
diff --git a/businessprocessmanagement/Process/__pycache__/getProcessInstance.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/getProcessInstance.cpython-310.pyc
new file mode 100644
index 0000000..f1a8002
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/getProcessInstance.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/__pycache__/getProcessViewColumns.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/getProcessViewColumns.cpython-310.pyc
new file mode 100644
index 0000000..9f0187a
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/getProcessViewColumns.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/__pycache__/queryProcessInstance.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/queryProcessInstance.cpython-310.pyc
new file mode 100644
index 0000000..2cf64d9
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/queryProcessInstance.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/__pycache__/queryProcessInstanceByView.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/queryProcessInstanceByView.cpython-310.pyc
new file mode 100644
index 0000000..c2c5074
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/queryProcessInstanceByView.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/__pycache__/startProcessInstance.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/startProcessInstance.cpython-310.pyc
new file mode 100644
index 0000000..5778227
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/startProcessInstance.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/__pycache__/terminateProcessInstance.cpython-310.pyc b/businessprocessmanagement/Process/__pycache__/terminateProcessInstance.cpython-310.pyc
new file mode 100644
index 0000000..4643f45
Binary files /dev/null and b/businessprocessmanagement/Process/__pycache__/terminateProcessInstance.cpython-310.pyc differ
diff --git a/businessprocessmanagement/Process/getProcessInstance.py b/businessprocessmanagement/Process/getProcessInstance.py
new file mode 100644
index 0000000..84d3b7b
--- /dev/null
+++ b/businessprocessmanagement/Process/getProcessInstance.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getProcessInstance
+ * Author:  Dylan Yeo
+ * Date:    22/03/22
+ * Description: Get the details of a process instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/get_process_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getProcessInstance(accessKey, secretKey, url, accessToken, processInstanceId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/process-instances"
+    params = {"processInstanceId": processInstanceId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/businessprocessmanagement/Process/getProcessViewColumns.py b/businessprocessmanagement/Process/getProcessViewColumns.py
new file mode 100644
index 0000000..122329c
--- /dev/null
+++ b/businessprocessmanagement/Process/getProcessViewColumns.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getProcessViewColumns
+ * Author:  Dylan Yeo
+ * Date:    22/03/22
+ * Description: Get the information of process view columns
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/get_process_view_columns.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getProcessViewColumns(accessKey, secretKey, url, accessToken, displayViewKey):
+    accessURL = url + "/enos-bpm-service/v2.0/work/display-view/" + displayViewKey +"/columns"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/businessprocessmanagement/Process/queryProcessInstance.py b/businessprocessmanagement/Process/queryProcessInstance.py
new file mode 100644
index 0000000..68153da
--- /dev/null
+++ b/businessprocessmanagement/Process/queryProcessInstance.py
@@ -0,0 +1,44 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: queryProcessInstance
+ * Author:  Dylan Yeo
+ * Date:    22/03/22
+ * Description: Query the list of process instances
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/query_process_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+
+current_time = round(time.time()*1000)
+
+def queryProcessInstance(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/enos-bpm-service/v2.0/work/process-instances/queryList"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"processStatus": "inProgress",
+            # Optional Parameters
+            "processName": "Python_ProcessInstance",
+            # "processInstanceId": "54366b8f-ab3d-11ec-8df5-120e04f331d8",
+            # "startedBefore": current_time,
+            # "startedAfter": "1647302400000",
+            # "startBy": "u16473063753681521",
+            "pagination":  {"current": 0,
+                            "pageSize": 5,
+                            "sorts": [{"field": "createdTime",
+                                       "order": "ASC"}]
+                                       }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/Process/queryProcessInstanceByView.py b/businessprocessmanagement/Process/queryProcessInstanceByView.py
new file mode 100644
index 0000000..0f9b094
--- /dev/null
+++ b/businessprocessmanagement/Process/queryProcessInstanceByView.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: queryProcessInstanceByView
+ * Author:  Dylan Yeo
+ * Date:    22/03/22
+ * Description: Query the list of process instance by process view
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/query_process_instance_by_view.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+
+current_time = round(time.time()*1000)
+
+def queryProcessInstanceByView(accessKey, secretKey, url, accessToken, displayViewKey, id):
+    accessURL = url + "/enos-bpm-service/v2.0/work/display-view/" + displayViewKey + "/process-instances/query"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"columns": [{"id": id,
+                         "filter": "inProgress"
+                         }],
+            "pagination":  {"current": 0,
+                            "pageSize": 5,
+                            "sorts": [{"field": "started",
+                                       "order": "DESC"}]
+                                      }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/Process/startProcessInstance.py b/businessprocessmanagement/Process/startProcessInstance.py
new file mode 100644
index 0000000..091ca53
--- /dev/null
+++ b/businessprocessmanagement/Process/startProcessInstance.py
@@ -0,0 +1,35 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: startProcessInstance
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Start a new process instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/start_process_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def startProcessInstance(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/enos-bpm-service/v2.0/work/process-instances"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"processDefinitionId": "312844b2-ab3d-11ec-8df5-120e04f331d8",
+            "values": {"Key":"Value"},
+            # Optional Parameters
+            "name": "Python_ProcessInstance_ByAPI",
+            #"formId": "",
+            "outcome": "Key"
+            }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/Process/terminateProcessInstance.py b/businessprocessmanagement/Process/terminateProcessInstance.py
new file mode 100644
index 0000000..04d296a
--- /dev/null
+++ b/businessprocessmanagement/Process/terminateProcessInstance.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: terminateProcessInstance
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Terminate a process instance
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/terminate_process_instance.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def terminateProcessInstance(accessKey, secretKey, url, accessToken, processInstanceId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/process-instances"
+    params = {"action": "delete", "processInstanceId": processInstanceId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"deleteReason": "YourDeleteReason"}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/businessProcessManagementApp.py b/businessprocessmanagement/businessProcessManagementApp.py
new file mode 100644
index 0000000..2c09e5e
--- /dev/null
+++ b/businessprocessmanagement/businessProcessManagementApp.py
@@ -0,0 +1,66 @@
+import aep.applicationportal.authentication.login as login_py
+import aep.applicationportal.usersandorganization.chooseOrganization as chooseOrganization_py
+import aep.businessprocessmanagement.process.getProcessInstance as getProcessInstance_py
+import aep.businessprocessmanagement.process.getProcessViewColumns as getProcessViewColumns_py
+import aep.businessprocessmanagement.process.queryProcessInstance as queryProcessInstance_py
+import aep.businessprocessmanagement.process.queryProcessInstanceByView as queryProcessInstanceByView_py
+import aep.businessprocessmanagement.process.startProcessInstance as startProcessInstance_py
+import aep.businessprocessmanagement.process.terminateProcessInstance as terminateProcessInstance_py
+import aep.businessprocessmanagement.task.getTask as getTask_py
+import aep.businessprocessmanagement.task.queryTask as queryTask_py
+import aep.businessprocessmanagement.task.claimTask as claimTask_py
+import aep.businessprocessmanagement.task.completeTask as completeTask_py
+import aep.businessprocessmanagement.task.claimAndCompleteTask as claimAndCompleteTask_py
+
+
+def businessProcessManagementGeneral(accessKey, secretKey, orgId, url):
+    accessToken = login_py.login(accessKey, secretKey, url)
+    # accessToken = login_py.login_admin(accessKey, secretKey, url)
+    # refreshToken = chooseOrganization_py.chooseOrganization(accessKey, secretKey, orgId, url, accessToken)
+
+    '''
+    1. Process
+    https://support.envisioniot.com/docs/bpm-api/en/2.3.0/process/index_process.html
+    '''
+    # getProcessInstance_py.getProcessInstance(accessKey, secretKey, url, accessToken, processInstanceId="54366b8f-ab3d-11ec-8df5-120e04f331d8")
+
+    # getProcessViewColumns_py.getProcessViewColumns(accessKey, secretKey, url, accessToken, displayViewKey="PYTHON_VIEWKEY")
+
+    # queryProcessInstance_py.queryProcessInstance(accessKey, secretKey, url, accessToken)
+
+    # queryProcessInstanceByView_py.queryProcessInstanceByView(accessKey, secretKey, url, accessToken, displayViewKey="API230JAVAPWF_KEY", id="adf38f2eea9a211ecad0f8e1ac2659f4c")
+
+    # startProcessInstance_py.startProcessInstance(accessKey, secretKey, url, accessToken)
+
+    # terminateProcessInstance_py.terminateProcessInstance(accessKey, secretKey, url, accessToken, processInstanceId="473e66a9-aa75-11ec-ad0f-8e1ac2659f4c")
+
+    '''
+    2. Task
+    https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/index_task.html
+    '''
+    # getTask_py.getTask(accessKey, secretKey, url, accessToken, taskId="543ab164-ab3d-11ec-8df5-120e04f331d8")
+
+    # queryTask_py.queryTask(accessKey ,secretKey, url, accessToken)
+
+    # claimTask_py.claimTask(accessKey, secretKey, url, accessToken, taskId="543ab164-ab3d-11ec-8df5-120e04f331d8")
+
+    # completeTask_py.completeTask(accessKey, secretKey, url, accessToken, taskId="0f0af846-ab3b-11ec-8df5-120e04f331d8")
+
+    # claimAndCompleteTask_py.claimAndCompleteTask(accessKey, secretKey, url, accessToken, taskId="cc3a2f2f-ab3e-11ec-ad0f-8e1ac2659f4c")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/businessprocessmanagement/task/__pycache__/claimAndCompleteTask.cpython-310.pyc b/businessprocessmanagement/task/__pycache__/claimAndCompleteTask.cpython-310.pyc
new file mode 100644
index 0000000..bd6c1e4
Binary files /dev/null and b/businessprocessmanagement/task/__pycache__/claimAndCompleteTask.cpython-310.pyc differ
diff --git a/businessprocessmanagement/task/__pycache__/claimTask.cpython-310.pyc b/businessprocessmanagement/task/__pycache__/claimTask.cpython-310.pyc
new file mode 100644
index 0000000..012070a
Binary files /dev/null and b/businessprocessmanagement/task/__pycache__/claimTask.cpython-310.pyc differ
diff --git a/businessprocessmanagement/task/__pycache__/completeTask.cpython-310.pyc b/businessprocessmanagement/task/__pycache__/completeTask.cpython-310.pyc
new file mode 100644
index 0000000..dafcc1f
Binary files /dev/null and b/businessprocessmanagement/task/__pycache__/completeTask.cpython-310.pyc differ
diff --git a/businessprocessmanagement/task/__pycache__/getTask.cpython-310.pyc b/businessprocessmanagement/task/__pycache__/getTask.cpython-310.pyc
new file mode 100644
index 0000000..0f481b1
Binary files /dev/null and b/businessprocessmanagement/task/__pycache__/getTask.cpython-310.pyc differ
diff --git a/businessprocessmanagement/task/__pycache__/queryTask.cpython-310.pyc b/businessprocessmanagement/task/__pycache__/queryTask.cpython-310.pyc
new file mode 100644
index 0000000..a285dd4
Binary files /dev/null and b/businessprocessmanagement/task/__pycache__/queryTask.cpython-310.pyc differ
diff --git a/businessprocessmanagement/task/claimAndCompleteTask.py b/businessprocessmanagement/task/claimAndCompleteTask.py
new file mode 100644
index 0000000..948f151
--- /dev/null
+++ b/businessprocessmanagement/task/claimAndCompleteTask.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: claimAndCompleteTask
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Claim a task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/claim_and_complete_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def claimAndCompleteTask(accessKey, secretKey, url, accessToken, taskId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/tasks/" + taskId + "/claim-complete"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"values": {"SingleLine_Variable":"SingleLine_AnswerOnAPI"},
+            "outcome": "Key"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/task/claimTask.py b/businessprocessmanagement/task/claimTask.py
new file mode 100644
index 0000000..19cf59f
--- /dev/null
+++ b/businessprocessmanagement/task/claimTask.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: claimTask
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Claim a task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/claim_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def claimTask(accessKey, secretKey, url, accessToken, taskId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/tasks/claim"
+    params = {"taskId": taskId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header, method="POST")
+    print(response)
diff --git a/businessprocessmanagement/task/completeTask.py b/businessprocessmanagement/task/completeTask.py
new file mode 100644
index 0000000..0efa846
--- /dev/null
+++ b/businessprocessmanagement/task/completeTask.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: completeTask
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Claim a task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/claim_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def completeTask(accessKey, secretKey, url, accessToken, taskId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/tasks/complete"
+    params = {"taskId": taskId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"values": {"SingleLine_Variable":"SingleLine_AnswerOnAPI"},
+            "outcome": "Key"}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/businessprocessmanagement/task/getTask.py b/businessprocessmanagement/task/getTask.py
new file mode 100644
index 0000000..fc7d2a3
--- /dev/null
+++ b/businessprocessmanagement/task/getTask.py
@@ -0,0 +1,27 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getTask
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Get the details of a task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/get_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getTask(accessKey, secretKey, url, accessToken, taskId):
+    accessURL = url + "/enos-bpm-service/v2.0/work/tasks"
+    params = {"taskId": taskId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header)
+    print(response)
diff --git a/businessprocessmanagement/task/queryTask.py b/businessprocessmanagement/task/queryTask.py
new file mode 100644
index 0000000..242514f
--- /dev/null
+++ b/businessprocessmanagement/task/queryTask.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: queryTask
+ * Author:  Dylan Yeo
+ * Date:    23/03/22
+ * Description: Query the list of tasks
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/bpm-api/en/2.3.0/task/query_task.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def queryTask(accessKey, secretKey, url, accessToken):
+    accessURL = url + "/enos-bpm-service/v2.0/work/tasks/query"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + accessToken}
+    print(header)
+
+    body = {"taskStatus": "inProgress",
+            #optional parameters
+            # "processInstanceId": "54366b8f-ab3d-11ec-8df5-120e04f331d8",
+            # "processName": "Python_ProcessInstance",
+            # "taskName": "Python Task 1",
+            "pagination": {"current": 0,
+                           "pageSize": 5,
+                           # "sorts": [{"field": "createdTime",
+                           #            "order": "DESC"}]
+                           }
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/connection/Certificate/applyCertificate.py b/connection/Certificate/applyCertificate.py
new file mode 100644
index 0000000..2aee791
--- /dev/null
+++ b/connection/Certificate/applyCertificate.py
@@ -0,0 +1,56 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: ApplyCertificate
+ * Author:  Dylan Yeo
+ * Date:    27/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/apply_cert.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Certificate
+ *
+ * @author dylan.yeo
+ * @create 27/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+#assetId for Python_Demo_Gateway = gatway1
+
+def ApplyCertificate_assetId(accessKey, secretKey, orgId, url, assetId, csr):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "apply", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+        "csr": csr,
+        "validDay": 1,
+        "issueAuthority": "RSA"
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def ApplyCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, deviceKey, csr):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "apply", "orgId": orgId, "productKey": ProductKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "csr": csr,
+        "validDay": 100,
+        "issueAuthority": "RSA"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url,body)
+    print(response)
\ No newline at end of file
diff --git a/connection/Certificate/connectionCertificateApp.py b/connection/Certificate/connectionCertificateApp.py
new file mode 100644
index 0000000..ade459a
--- /dev/null
+++ b/connection/Certificate/connectionCertificateApp.py
@@ -0,0 +1,44 @@
+import connection.Certificate.listCertificate as ListCertificate_py
+
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+AssetId = "assetId1"
+# Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+ProductKey = "pk1"
+# Device Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+DeviceKey = "dk1"
+
+
+file1 = open('resources/IoTHub/ConnectServiceModel/Certificate/csr (revoked).txt', 'r')
+file2 = open('resources/IoTHub/ConnectServiceModel/Certificate/csr.txt', 'r')
+file3 = open('resources/IoTHub/ConnectServiceModel/Certificate/csrtest.txt', 'r')
+fileGW = open('resources/IoTHub/ConnectServiceModel/Certificate/csrGW.txt', 'r')
+CSR_revoked = file1.read()
+CSR = file2.read()
+CSR2 = file3.read()
+CSR_GW = fileGW.read()
+file1.close()
+file2.close()
+file3.close()
+fileGW.close()
+
+def ConnectionCertificateGeneral(accessKey, secretKey, orgId, url):
+
+    # ApplyCertificate_py.ApplyCertificate_assetId(accessKey, secretKey, orgId, url, AssetId, CSR2)
+    # ApplyCertificate_py.ApplyCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, CSR)
+
+    # RenewCertificate_py.RenewCertificate_assetId(accessKey, secretKey, orgId, url, AssetId, CSR)
+    # RenewCertificate_py.RenewCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, CSR)
+
+    # RevokeCertificate_py.RevokeCertificate_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # RevokeCertificate_py.RevokeCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+    ListCertificate_py.ListCertificate_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # ListCertificate_py.ListCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+
+
+
+
+
diff --git a/connection/Certificate/listCertificate.py b/connection/Certificate/listCertificate.py
new file mode 100644
index 0000000..c10ed37
--- /dev/null
+++ b/connection/Certificate/listCertificate.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: ListCertificate
+ * Author:  Dylan Yeo
+ * Date:    27/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/list_cert.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Certificate
+ *
+ * @author dylan.yeo
+ * @create 27/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def ListCertificate_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "list", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def ListCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, deviceKey):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "list", "orgId": orgId, "productKey": ProductKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/connection/Certificate/renewCertificate.py b/connection/Certificate/renewCertificate.py
new file mode 100644
index 0000000..b400bb9
--- /dev/null
+++ b/connection/Certificate/renewCertificate.py
@@ -0,0 +1,56 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: RenewCertificate
+ * Author:  Dylan Yeo
+ * Date:    27/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/update_cert.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Certificate
+ *
+ * @author dylan.yeo
+ * @create 27/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def RenewCertificate_assetId(accessKey, secretKey, orgId, url, assetId, csr):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "renew", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "csr": csr, #optional
+        "certSn": 54376,
+        "validDay": 10,
+        "issueAuthority": "RSA"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def RenewCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, deviceKey, csr):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "renew", "orgId": orgId, "productKey": ProductKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "csr": csr,
+        "certSn": 54377,
+        "validDay": 10,
+        "issueAuthority": "RSA"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/Certificate/revokeCertificate.py b/connection/Certificate/revokeCertificate.py
new file mode 100644
index 0000000..99364bc
--- /dev/null
+++ b/connection/Certificate/revokeCertificate.py
@@ -0,0 +1,52 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: RevokeCertficate
+ * Author:  Dylan Yeo
+ * Date:    27/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/delete_cert.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Certificate
+ *
+ * @author dylan.yeo
+ * @create 27/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def RevokeCertificate_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "revoke", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "certSn": 54367,
+        "reason": 4,
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def RevokeCertificate_Keys(accessKey, secretKey, orgId, url, ProductKey, deviceKey):
+    accessURL = url + '/connect-service/v2.0/certificates'
+    params = {"action": "revoke", "orgId": orgId, "productKey": ProductKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "certSn": 54376,
+        "reason": 9,
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/Device/batchCreateDevice.py b/connection/Device/batchCreateDevice.py
new file mode 100644
index 0000000..0cf1de7
--- /dev/null
+++ b/connection/Device/batchCreateDevice.py
@@ -0,0 +1,136 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https:// support.envisioniot.com/docs/connection-api/en/2.3.0/create_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def BatchCreateDevice_MandatoryParams(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "batchCreate", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "deviceList":
+            [
+                {
+                    "productKey": "yourProductKey1",
+                    "deviceName":
+                        {
+                            "defaultValue": "Device Name",
+                            "i18nValue":
+                                {
+                                    "zh_CN": "设备名称",
+                                    "en_US": "Device Name"
+                                }
+                        },
+                    "timezone": "+08:00"
+                },
+                {
+                    "productKey": "yourProductKey2",
+                    "deviceName":
+                        {
+                            "defaultValue": "Device Name 2",
+                            "i18nValue":
+                                {
+                                    "zh_CN": "设备名称 2",
+                                    "en_US": "Device Name 2"
+                                }
+                        },
+                    "timezone": "+08:00"
+                }
+            ]
+    }
+
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    assetId = response["data"][0]["data"]["assetId"]
+    deviceKey = response["data"][0]["data"]["deviceKey"]
+
+    return assetId, deviceKey
+
+
+def CreateDevice_OptionalParams(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "batchCreate", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "deviceList":
+            [
+                {
+                    "productKey": "yourProductKey1",
+                    "deviceName":
+                        {
+                            "defaultValue": "Device Name",
+                            "i18nValue":
+                                {
+                                    "zh_CN": "设备名称",
+                                    "en_US": "Device Name"
+                                }
+                        },
+                    "timezone": "+08:00",
+                    "deviceAttributes":
+                        {
+                            "serial": 111111
+                        },
+                    "deviceDesc": "Device description",
+                    "deviceTags":
+                        {
+                            "tag1": "tag value"
+                        }
+                },
+                {
+                    "productKey": "yourProductKey2",
+                    "deviceName":
+                        {
+                            "defaultValue": "Device Name 2",
+                            "i18nValue":
+                                {
+                                    "zh_CN": "设备名称 2",
+                                    "en_US": "Device Name 2"
+                                }
+                        },
+                    "timezone": "+08:00",
+                    "deviceAttributes":
+                        {
+                            "serial": 222222
+                        },
+                    "deviceDesc": "Device description 2",
+                    "deviceTags":
+                        {
+                            "tag2": "tag value"
+                        }
+                }
+            ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    assetId = response["data"][0]["data"]["assetId"]
+    deviceKey = response["data"][0]["data"]["deviceKey"]
+
+    return assetId, deviceKey
diff --git a/connection/Device/connectionDeviceApp.py b/connection/Device/connectionDeviceApp.py
new file mode 100644
index 0000000..45f2664
--- /dev/null
+++ b/connection/Device/connectionDeviceApp.py
@@ -0,0 +1,186 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+Input_modelId = "python_4attri_model"
+
+
+def ConnectionDeviceGeneral(accessKey, secretKey, orgId, url):
+    # Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+    # Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+    # Device Asset Device Key can be found on EnOS portal (Go to Device Management/Device Asset under Device Key)
+
+    '''Creating a product
+    Creating and Deleting Device
+    Deleting a product
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_MandatoryParams(accessKey, secretKey, orgId, url, ProductKey)
+    # DeleteDevice_py.DeleteDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a product
+    Creating, Disabling, Enabling, Updating, Getting, and Deleting a device using AssetId
+    Deleting a product
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # DisableDevice_py.DisableDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # EnableDevice_py.EnableDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # UpdateDevice_py.UpdateDevice_assetId_PatchUpdate(accessKey, secretKey, orgId, url, AssetId)
+    # GetDevice_py.GetDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteDevice_py.DeleteDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating, Disabling, Enabling, Updating, Getting and Deleting a device using ProductKey and DeviceKey
+    Deleting a product
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # DisableDevice_py.DisableDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # EnableDevice_py.EnableDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # UpdateDevice_py.UpdateDevice_Keys_PatchUpdate(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # GetDevice_py.GetDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # DeleteDevice_py.DeleteDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating a device, GettingStatistics overall, GettingStatistics and Deleting Device using ProductKey
+    Deleting a product
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # GetDeviceStatistics_py.GetDeviceStatistics(accessKey, secretKey, orgId, url)
+    # GetDeviceStatistics_py.GetDeviceStatistics_ProductKey(accessKey, secretKey, orgId, url, ProductKey)
+    # DeleteDevice_py.DeleteDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating a device, Replacing DeviceKey and Deleting Device using assetId
+    Deleting a product
+    Note: Replacing a Device would change its Device Key and Device Secret but Asset Id remains unchanged
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # ReplaceDevice_py.ReplaceDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteDevice_py.DeleteDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating a device, Replacing DeviceKey and Deleting Device using ProductKey and DeviceKey
+    Deleting a product
+    Note: Replacing a Device would change its Device Key and Device Secret but Asset Id remains unchanged
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # New_DeviceKey = ReplaceDevice_py.ReplaceDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # DeleteDevice_py.DeleteDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, New_DeviceKey)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating a device, Replacing DeviceKey manually and Deleting Device
+    Deleting a product
+    Note: Replacing a Device would change its Device Key and Device Secret but Asset Id remains unchanged
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # Newer_DeviceKey = ReplaceDevice_py.ReplaceDevice_ManualType(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, "Type_New_Device_Key")
+    # DeleteDevice_py.DeleteDevice_Keys(accessKey, secretKey, orgId, url, ProductKey, Newer_DeviceKey)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating, Update and Deleting a device
+    Deleting a product
+    Note: IsPatchUpdate = False for Updating of Devices
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+    # UpdateDevice_py.UpdateDevice_assetId_NoPatchUpdate(accessKey, secretKey, orgId, url, AssetId)
+    # UpdateDevice_py.UpdateDevice_Keys_NoPatchUpdate(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # DeleteDevice_py.DeleteDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Creating a Product
+    Creating, Searching and Deleting a device
+    Deleting a product
+    '''
+    # ProductKey = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # AssetId, DeviceKey = CreateDevice_py.CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Search Product'''
+    # SearchDevice_py.SearchDevice(accessKey, secretKey, orgId, url)
+
+    '''Search Product Projection'''
+    # SearchDevice_py.SearchDevice_Projection(accessKey, secretKey, orgId, url)
+
+    '''Search Product Pagination'''
+    # SearchDevice_py.SearchDevice_Pagination(accessKey, secretKey, orgId, url)
+
+    '''Search Product Expression with modelId'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "modelId ='" + Input_modelId + "'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "modelId !='" + Input_modelId + "'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "modelId in ('" + Input_modelId + "')")
+
+    '''Search Product Expression with productKey'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "productKey ='" + ProductKey + "'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "productKey in ('" + ProductKey + "')")
+
+    '''Search Product Expression with deviceKey'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceKey ='" + DeviceKey + "'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceKey in ('" + DeviceKey + "')")
+
+    '''Search Product Expression with assetId'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "assetId ='" + AssetId + "'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "assetId in ('" + AssetId + "')")
+
+    '''Search Product Expression with deviceTags'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 = 'DeviceValue1'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 != 'DeviceValue1'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "exists(deviceTags.DeviceKey1)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "not exists(deviceTags.DeviceKey1)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 in ('DeviceValue1')")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 = 'DeviceValue1' and deviceTags.DeviceKey2 = 'DeviceValue2'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 = 'DeviceValue1' and deviceTags.DeviceKey2 = 'DeviceValue2' and deviceTags.DeviceKey3 = 'DeviceValue3'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 = 'DeviceValue1' and deviceTags.DeviceKey123 != 'DeviceValue123'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 = 'DeviceValue1' or deviceTags.DeviceKey1 = 'DeviceValue2'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "exists(deviceTags.DeviceKey1) and exists(deviceTags.DeviceKey3)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "exists(deviceTags.DeviceKey1) or exists(deviceTags.DeviceKey3)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceTags.DeviceKey1 in ('DeviceValue1') and deviceTags.DeviceKey3 in ('DeviceValue3')")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "modelId = 'python_4attri_model' and deviceTags.DeviceKey3 = 'DeviceValue3'")
+
+    '''Search Product Expression with deviceAttributes'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceAttributes.Attribute_Name = 100")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "exists(deviceAttributes.Attribute_Name)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "not exists(deviceAttributes.Attribute_Name)")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceAttributes.Attribute_Name in (100)")
+
+    '''Search Product Expression with productType'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "productType = 'Device'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "productType = 'Gateway'")
+
+    '''Search Product Expression with firmwareVersion'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "firmwareVersion = 'moxa_cross_v2.2.0'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "firmwareVersion in ('moxa_cross_v2.2.0')")
+
+    '''Search Product Expression with deviceName'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName like 'Device_MyDeviceName'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.default like 'MyDeviceName'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.default like 'yDeviceNa'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.en_US like 'Device_MyDeviceName'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.zh_CN like 'Device_我的设备名称'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.zh_CN like '设备名称'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.ja_JP like 'Device_私のデバイス名'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.ja_JP like '私のデバイス'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.es_ES like 'Device_NombreDeMiDispositivo'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "deviceName.es_ES like 'NombreDeMi'")
+
+    '''Search Product Expression with status'''
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status = 'online'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status in ('online')")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status = 'offline'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status = 'inactive'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status = 'disable'")
+    # SearchDevice_py.SearchDevice_expression(accessKey, secretKey, orgId, url, "status = 'mirror'")
+
+    # DeleteDevice_py.DeleteDevice_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey)
+
+
diff --git a/connection/Device/createDevice.py b/connection/Device/createDevice.py
new file mode 100644
index 0000000..170d60d
--- /dev/null
+++ b/connection/Device/createDevice.py
@@ -0,0 +1,72 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https:// support.envisioniot.com/docs/connection-api/en/2.3.0/create_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def CreateDevice_MandatoryParams(accessKey, secretKey, orgId, url, ProductKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productKey": ProductKey,
+        "timezone": "+08:00",
+        "deviceName": {"defaultValue":"Device"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    assetId = response["data"]["assetId"]
+    deviceKey = response["data"]["deviceKey"]
+
+    return assetId, deviceKey
+
+
+def CreateDevice_OptionalParams(accessKey, secretKey, orgId, url, ProductKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productKey": ProductKey,
+        "timezone": "+08:00",
+        "deviceName": {"defaultValue":"MyDeviceName", "i18nValue": {"zh_CN": "Device_我的设备名称", "en_US": "Device_MyDeviceName",
+                                      "ja_JP": "Device_私のデバイス名", "es_ES": "Device_NombreDeMiDispositivo"}},
+        # deviceAttribute Format : {<Attribute Identifier Name>: <Value according to data type>}
+        "deviceAttributes": {"Attribute_Name" : 100},
+        "deviceKey": "Any_DeviceKey.",
+        "deviceDesc": "Standard Device Description",
+        "deviceTags": {"DeviceKey1": "DeviceValue1", "DeviceKey2": "DeviceValue2", "DeviceKey3": "DeviceValue3"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    assetId = response["data"]["assetId"]
+    deviceKey = response["data"]["deviceKey"]
+
+    return assetId, deviceKey
+
diff --git a/connection/Device/deleteDevice.py b/connection/Device/deleteDevice.py
new file mode 100644
index 0000000..2fc081f
--- /dev/null
+++ b/connection/Device/deleteDevice.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: DeleteDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/delete_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def DeleteDevice_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "delete", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def DeleteDevice_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "delete", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Device/disableDevice.py b/connection/Device/disableDevice.py
new file mode 100644
index 0000000..c59da1d
--- /dev/null
+++ b/connection/Device/disableDevice.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: DisableDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/disable_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def DisableDevice_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "disable", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def DisableDevice_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "disable", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Device/enableDevice.py b/connection/Device/enableDevice.py
new file mode 100644
index 0000000..8806bbd
--- /dev/null
+++ b/connection/Device/enableDevice.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: EnableDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/enable_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def EnableDevice_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "enable", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def EnableDevice_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "enable", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Device/getDevice.py b/connection/Device/getDevice.py
new file mode 100644
index 0000000..3414dcb
--- /dev/null
+++ b/connection/Device/getDevice.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def GetDevice_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "get", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def GetDevice_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "get", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Device/getDeviceStatistics.py b/connection/Device/getDeviceStatistics.py
new file mode 100644
index 0000000..c0a7644
--- /dev/null
+++ b/connection/Device/getDeviceStatistics.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetDeviceStatistics
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_device_stats.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def GetDeviceStatistics(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "getStats", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def GetDeviceStatistics_ProductKey(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "getStats", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Device/replaceDevice.py b/connection/Device/replaceDevice.py
new file mode 100644
index 0000000..81c5a13
--- /dev/null
+++ b/connection/Device/replaceDevice.py
@@ -0,0 +1,72 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: ReplaceDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/replace_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+NewDeviceKey = 'The_NewDeviceKey.'
+
+def ReplaceDevice_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "replaceDevice", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "newDeviceKey": NewDeviceKey
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def ReplaceDevice_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "replaceDevice", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "newDeviceKey": NewDeviceKey
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    return NewDeviceKey
+
+
+def ReplaceDevice_ManualType(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, NewerDeviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "replaceDevice", "orgId": orgId, "productKey": ProductKey, "deviceKey": DeviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "newDeviceKey": NewerDeviceKey
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    return NewerDeviceKey
\ No newline at end of file
diff --git a/connection/Device/searchDevice.py b/connection/Device/searchDevice.py
new file mode 100644
index 0000000..a2c9756
--- /dev/null
+++ b/connection/Device/searchDevice.py
@@ -0,0 +1,110 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SearchDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SearchDevice(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchDevice_Projection(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "projection":["orgId",
+                      "assetId",
+                      "modelId",
+                      "modelIdPath",
+                      "productKey",
+                      "productName",
+                      "productType",
+                      "dataFormat",
+                      "deviceKey",
+                      "deviceName",
+                      "deviceSecret",
+                      "deviceDesc",
+                      "timezone",
+                      "deviceAttributes",
+                      "deviceTags",
+                      "mirrorSource",
+                      "firmwareVersion",
+                      "createTime",
+                      "status",
+                      "activeTime",
+                      "lastOnlineTime",
+                      "lastOfflineTime",
+                      "measurepointLastUpdate",
+                      "eventLastUpdate",
+                      "attributeLastUpdate",
+                      "featureLastUpdate"]}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchDevice_Pagination(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "pagination": {
+        "pageNo": 2,
+        "pageSize": 25,}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchDevice_expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/connection/Device/updateDevice.py b/connection/Device/updateDevice.py
new file mode 100644
index 0000000..73a1c1f
--- /dev/null
+++ b/connection/Device/updateDevice.py
@@ -0,0 +1,110 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UpdateDevice
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/update_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def UpdateDevice_assetId_PatchUpdate(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "update", "orgId": orgId, "assetId": assetId, "IsPatchUpdate": True}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "timezone": "+12:00",
+        "deviceName": {"defaultValue": "MyUpdatedDeviceName",
+                       "i18nValue": {"zh_CN": "Device_我更新的设备名称", "en_US": "Device_MyUpdatedDeviceName",
+                                     "ja_JP": "Device_更新したデバイス名", "es_ES": "Device_MiNombreDeDispositivoActualizado"}},
+        "deviceAttributes": {"Attribute_Name": 999},
+        "deviceDesc": "New Device Description",
+        "deviceTags": {"NewDeviceKey10": "NewDeviceValue10", "NewDeviceKey20": "NewDeviceValue20",
+                       "NewDeviceKey30": "NewDeviceValue30"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateDevice_Keys_PatchUpdate(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey, "IsPatchUpdate": True}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "timezone": "+12:00",
+        "deviceName": {"defaultValue": "MyUpdatedDeviceName",
+                       "i18nValue": {"zh_CN": "Device_我更新的设备名称", "en_US": "Device_MyUpdatedDeviceName",
+                                     "ja_JP": "Device_更新したデバイス名", "es_ES": "Device_MiNombreDeDispositivoActualizado"}},
+        "deviceAttributes": {"Attribute_Name": 999},
+        "deviceDesc": "New Device Description",
+        "deviceTags": {"NewDeviceKey10": "NewDeviceValue10", "NewDeviceKey20": "NewDeviceValue20",
+                       "NewDeviceKey30": "NewDeviceValue30"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def UpdateDevice_assetId_NoPatchUpdate(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "update", "orgId": orgId, "assetId": assetId, "IsPatchUpdate": False}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "timezone": "+12:00",
+        "deviceName": {"defaultValue": "MyUpdatedDeviceName",
+                       "i18nValue": {"zh_CN": "Device_我更新的设备名称", "en_US": "Device_MyUpdatedDeviceName",
+                                     "ja_JP": "Device_更新したデバイス名", "es_ES": "Device_MiNombreDeDispositivoActualizado"}},
+        "deviceAttributes": {"Attribute_Name": 999},
+        "deviceDesc": "New Device Description",
+        "deviceTags": {"NewDeviceKey10": "NewDeviceValue10", "NewDeviceKey20": "NewDeviceValue20",
+                       "NewDeviceKey30": "NewDeviceValue30"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateDevice_Keys_NoPatchUpdate(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/devices'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey, "IsPatchUpdate": False}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "timezone": "+12:00",
+        "deviceName": {"defaultValue": "MyUpdatedDeviceName",
+                       "i18nValue": {"zh_CN": "Device_我更新的设备名称", "en_US": "Device_MyUpdatedDeviceName",
+                                     "ja_JP": "Device_更新したデバイス名", "es_ES": "Device_MiNombreDeDispositivoActualizado"}},
+        "deviceAttributes": {"Attribute_Name": 999},
+        "deviceDesc": "New Device Description",
+        "deviceTags": {"NewDeviceKey10": "NewDeviceValue10", "NewDeviceKey20": "NewDeviceValue20",
+                       "NewDeviceKey30": "NewDeviceValue30"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/DeviceData/cancelCommand.py b/connection/DeviceData/cancelCommand.py
new file mode 100644
index 0000000..d78fcb0
--- /dev/null
+++ b/connection/DeviceData/cancelCommand.py
@@ -0,0 +1,61 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CancelCommand
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/cancel_command.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def CancelCommand_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "cancel", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def CancelCommand_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "cancel", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+def CancelCommand_assetId_CommandId(accessKey, secretKey, orgId, url, assetId, commandId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "cancel", "orgId": orgId, "assetId": assetId, "commandId": commandId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def CancelCommand_Keys_CommandId(accessKey, secretKey, orgId, url, productKey, deviceKey, commandId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "cancel", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey, "commandId": commandId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/connection/DeviceData/connectionDeviceDataApp.py b/connection/DeviceData/connectionDeviceDataApp.py
new file mode 100644
index 0000000..4a85905
--- /dev/null
+++ b/connection/DeviceData/connectionDeviceDataApp.py
@@ -0,0 +1,150 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Device Asset Asset ID can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+AssetId = "assetId1"
+# Device Asset Product Key can be found on EnOS portal (Go to Device Management/Products under Product Key)
+ProductKey = "pk1"
+# Device Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+DeviceKey = "dk1"
+
+
+def ConnectionDeviceDataGeneral(accessKey, secretKey, orgId, url):
+    '''Creating MeasurementPoint value'''
+    # CommandId_assetId = SetMeasurementPoint_py.SetMeasurementPoint_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # CommandId_Keys = SetMeasurementPoint_py.SetMeasurementPoint_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+    '''Get command information (delay of 5 seconds as command may not be found directly after creating a command)'''
+    # time.sleep(5)
+    # GetCommand_py.GetCommand_assetId(accessKey, secretKey, orgId, url, AssetId, CommandId_assetId)
+    # GetCommand_py.GetCommand_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, CommandId_Keys)
+
+    '''Cancel Command'''
+    # CancelCommand_py.CancelCommand_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # CancelCommand_py.CancelCommand_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+    # CancelCommand_py.CancelCommand_assetId_CommandId(accessKey, secretKey, orgId, url, AssetId, CommandId_assetId)
+    # CancelCommand_py.CancelCommand_Keys_CommandId(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, CommandId_Keys)
+
+    '''Get an Event'''
+    # GetEvent_py.GetEvent(accessKey, secretKey, orgId, url)
+    # GetEvent_py.GetEvent_ResolveName(accessKey, secretKey, orgId, url)
+
+    '''Get the most updated MeasurementPoint Value'''
+    # GetLatestMeasurementPoints_py.GetLatestMeasurementPoints_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # GetLatestMeasurementPoints_py.GetLatestMeasurementPoints_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+    '''Invoke a service'''
+    # InvokeService_py.InvokeService_assetId(accessKey, secretKey, orgId, url, AssetId)
+    # InvokeService_py.InvokeService_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+
+    '''Search for commands(Asset Id parameters) with projection and pagination'''
+    # SearchCommand_py.SearchCommand_assetId(accessKey, secretKey, orgId, url, AssetId)
+    
+    '''Search for commands(assetId parameters) with expression using state
+    States:
+    1: Created
+    2: Revoked
+    3: Expired
+    4: Sent
+    5: Succeeded
+    6: Failed
+    7: Timed Out
+    Refer to: https://support.envisioniot.com/docs/device-connection/en/2.3.0/howto/device/viewing_command_status.html
+    '''
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "state = 5")
+
+    '''Search for commands(Asset Id parameters) with expression using commandName'''
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.default like 'Service1'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.default like 'Serv'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.default like 'Int_MeasurementPoint'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.default like 'MeasurementPoi'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.en_US like 'Integer Measurement Point'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.en_US like 'Integ'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.zh_CN like '整数测量点'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.zh_CN like '测量点'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.ja_JP like '整数メジャーポイント'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.ja_JP like 'ーポ'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.es_ES like 'Punto de medida entero'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "commandName.es_ES like 'de medida'")
+
+    '''Search for commands(Asset Id parameters) with expression using createTime'''
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "createTime < '2022-01-21 17:27:46'")
+    # SearchCommand_py.SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, AssetId, "createTime >= '2022-01-21 17:27:46'")
+
+
+    '''Search for commands(productKey and deviceKey parameters) with projection and pagination'''
+    # SearchCommand_py.SearchCommand_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey)
+
+    '''Search for commands(Product Key and Device Key parameters) with expression using state
+    States: Refer to "Search for commands(assetId parameters) with expression using state" above
+    Refer to: https://support.envisioniot.com/docs/device-connection/en/2.3.0/howto/device/viewing_command_status.html
+    '''
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey, "state = 5")
+
+    '''Search for commands(Product Key and Device Key parameters) with expression using commandName'''
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.default like 'Service1'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.default like 'Serv'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.default like 'Int_MeasurementPoint'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.default like 'MeasurementPoi'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.en_US like 'Integer Measurement Point'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.en_US like 'Integ'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.zh_CN like '整数测量点'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.zh_CN like '测量点'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.ja_JP like '整数メジャーポイント'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.ja_JP like 'ーポ'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.es_ES like 'Punto de medida entero'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"commandName.es_ES like 'de medida'")
+
+    '''Search for commands(Product Key and Device Key parameters) with expression using createTime'''
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"createTime < '2022-01-21 17:27:46'")
+    # SearchCommand_py.SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, ProductKey, DeviceKey,"createTime >= '2022-01-21 17:27:46'")
+
+
+    '''Search for events with pagination and resolveName'''
+    # SearchEvent_py.SearchEvent(accessKey, secretKey, orgId, url)
+
+    '''Search for events with productKey'''
+    # SearchEvent_py.SearchEvent_productKey(accessKey, secretKey, orgId, url, ProductKey)
+
+    '''Search for events with deviceKey'''
+    # SearchEvent_py.SearchEvent_deviceKey(accessKey, secretKey, orgId, url, DeviceKey)
+
+    '''Search for events with assetId'''
+    # SearchEvent_py.SearchEvent_assetId(accessKey, secretKey, orgId, url, AssetId)
+
+    '''Search for events with tslEventKey'''
+    # SearchEvent_py.SearchEvent_tslEventKey(accessKey, secretKey, orgId, url, "Event1")
+
+    '''Search for events with tslEventType'''
+    # SearchEvent_py.SearchEvent_tslEventType(accessKey, secretKey, orgId, url, "INFO")
+
+    '''Search for events with startTime'''
+    # SearchEvent_py.SearchEvent_startTime(accessKey, secretKey, orgId, url, "2022-01-25 10:32:32")
+
+    '''Search for events with endTime'''
+    # SearchEvent_py.SearchEvent_endTime(accessKey, secretKey, orgId, url, "2022-01-25 10:32:32")
+
+    '''Search for events with expression'''
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "productKey = 'pk1'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "productKey in ('pk1')")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "deviceKey = 'dk1'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "deviceKey in ('dk1')")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "assetId ='assetId1'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "assetId in ('assetId1')")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "tslEventKey = 'event1'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "tslEventKey in ('event1')")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "tslEventType = 'INFO'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "tslEventType in ('INFO')")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "productKey = 'pk1' and deviceKey = 'dk1'")
+    # SearchEvent_py.SearchEvent_expression(accessKey, secretKey, orgId, url, "tslEventKey = 'Event1' or tslEventType = 'WARNING'")
+
+    '''Generate Token for application use'''
+    # Token = GetToken_py.GetToken(accessKey, secretKey, url)
+
+    '''Download File from Device'''
+    # DownloadFile_py.DownloadFile_assetId(orgId, Token, AssetId)
+    # DownloadFile_py.DownloadFile_Keys(orgId, Token, ProductKey, DeviceKey)
+
+    '''Delete File from Device'''
+    # DeleteFile_py.DeleteFile_assetId(accessKey, secretKey, orgId, Token, AssetId)
+    # DeleteFile_py.DeleteFile_Keys(accessKey, secretKey, orgId, Token, ProductKey, DeviceKey)
diff --git a/connection/DeviceData/deleteFile.py b/connection/DeviceData/deleteFile.py
new file mode 100644
index 0000000..ca11acc
--- /dev/null
+++ b/connection/DeviceData/deleteFile.py
@@ -0,0 +1,61 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: InvokeService
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/invoker_service.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import requests
+
+url = "https://iot-http-integration-ppe1.envisioniot.com"
+
+def DeleteFile_assetId(accessKey, secretKey, orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/files'
+    params = {"action": "delete", "orgId": orgId, "assetId": assetId,
+              "fileUri": "enos-connect://2963f0ba2d000000.txt"
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"apim-accesstoken": token
+              }
+    print(header)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
+
+def DeleteFile_Keys(accessKey, secretKey, orgId, token, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/files'
+    params = {"action": "delete", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey,
+              "fileUri": "enos-connect://2963f0b9df000000.txt"
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"apim-accesstoken": token
+              }
+    print(header)
+
+    body = {}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
+
+
+
diff --git a/connection/DeviceData/downloadFile.py b/connection/DeviceData/downloadFile.py
new file mode 100644
index 0000000..cc54df3
--- /dev/null
+++ b/connection/DeviceData/downloadFile.py
@@ -0,0 +1,63 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: InvokeService
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/invoker_service.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import requests
+
+url = "https://iot-http-integration-ppe1.envisioniot.com"
+
+def DownloadFile_assetId(orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/files'
+    params = {"action": "download", "orgId": orgId, "assetId": assetId,
+              "fileUri": "enos-connect://2963ede9f0800000.txt", "category": "feature"
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"apim-accesstoken": token
+              }
+    print(header)
+
+    r = requests.get(req.url, headers=header)
+    content = r.content
+    response = content.decode("UTF-8")
+    print(response)
+
+
+def DownloadFile_Keys(orgId, token, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/files'
+    params = {"action": "download", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey,
+              "fileUri": "enos-connect://2963ede9f0800000.txt", "category": "feature"
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"apim-accesstoken": token
+              }
+    print(header)
+
+    r = requests.get(req.url, headers=header)
+    content = r.content
+    response = content.decode("UTF-8")
+    print(response)
+
+
+
+
diff --git a/connection/DeviceData/getCommand.py b/connection/DeviceData/getCommand.py
new file mode 100644
index 0000000..cd1b7fa
--- /dev/null
+++ b/connection/DeviceData/getCommand.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetCommand
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_command.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def GetCommand_assetId(accessKey, secretKey, orgId, url, assetId, commandId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "get", "orgId": orgId, "assetId": assetId, "commandId": commandId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def GetCommand_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey, commandId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "get", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey, "commandId": commandId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/connection/DeviceData/getEvent.py b/connection/DeviceData/getEvent.py
new file mode 100644
index 0000000..29fac0f
--- /dev/null
+++ b/connection/DeviceData/getEvent.py
@@ -0,0 +1,45 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetEvent
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_event.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+eventId = "202201241563b1c05bdb379928d4e1ae082aca37"
+
+
+def GetEvent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "get", "orgId": orgId, "eventId": eventId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def GetEvent_ResolveName(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "get", "orgId": orgId, "eventId": eventId, "resolveName": "true"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/connection/DeviceData/getLatestMeasurementPoints.py b/connection/DeviceData/getLatestMeasurementPoints.py
new file mode 100644
index 0000000..9f9814c
--- /dev/null
+++ b/connection/DeviceData/getLatestMeasurementPoints.py
@@ -0,0 +1,53 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetLatestMeasurementPoints
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_latest_measurement_points.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+url = "https://apim-ppe1.eniot.io"
+
+def GetLatestMeasurementPoints_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/measurepoints'
+    params = {"action": "queryLatest", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "measurepointIds": ["Int_MeasurementPoint", "Float_MeasurementPoint"]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def GetLatestMeasurementPoints_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/measurepoints'
+    params = {"action": "queryLatest", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "measurepointIds": ["Int_MeasurementPoint"]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/connection/DeviceData/invokeService.py b/connection/DeviceData/invokeService.py
new file mode 100644
index 0000000..746fef1
--- /dev/null
+++ b/connection/DeviceData/invokeService.py
@@ -0,0 +1,55 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: InvokeService
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/invoker_service.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def InvokeService_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "invokeService", "orgId": orgId, "assetId": assetId,
+              "serviceId": "Service1", # Set Service Identifier
+              "pendingTtl": 10,  # Set cache storage time 0 - 172800 seconds, [Optional: Default = 0 seconds]
+              "timeout": 30}  # Set timeout period 1 - 60 seconds, [Optional: Default = 30 seconds]
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body ={"inputData": {"Service1Parameter1": 20, "Service1Parameter2": 40}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def InvokeService_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "invokeService", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey,
+              "serviceId": "Service2",  # Set Service Identifier
+              "pendingTtl": 10,  # Set cache storage time 0 - 172800 seconds, [Optional: Default = 0 seconds]
+              "timeout": 30}  # Set timeout period 1 - 60 seconds, [Optional: Default = 30 seconds]
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"inputData": {"Service2Parameter1":100}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/connection/DeviceData/searchCommand.py b/connection/DeviceData/searchCommand.py
new file mode 100644
index 0000000..4053ca4
--- /dev/null
+++ b/connection/DeviceData/searchCommand.py
@@ -0,0 +1,119 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SearchCommand
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_command.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SearchCommand_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "search", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "projection": ["commandId",
+                       "orgId",
+                       "productKey",
+                       "deviceKey",
+                       "assetId",
+                       "createTime",
+                       "createLocaltime",
+                       "commandType",
+                       "commandName",
+                       "timeout",
+                       "pendingTtl",
+                       "state",
+                       "tslIdentifier",
+                       "inputData",
+                       "outputData"],
+        "pagination": {"pageNo": 1,
+                       "pageSize": 50}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchCommand_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "search", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "projection": ["commandId",
+                       "orgId",
+                       "productKey",
+                       "deviceKey",
+                       "assetId",
+                       "createTime",
+                       "createLocaltime",
+                       "commandType",
+                       "commandName",
+                       "timeout",
+                       "pendingTtl",
+                       "state",
+                       "tslIdentifier",
+                       "inputData",
+                       "outputData"],
+        "pagination": {"pageNo": 1,
+                       "pageSize": 50},
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchCommand_expression_assetId(accessKey, secretKey, orgId, url, assetId, expression):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "search", "orgId": orgId, "assetId": assetId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": expression,
+        "pagination": {"pageNo": 1,
+                       "pageSize": 10}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchCommand_expression_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey, expression):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "search", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": expression,
+        "pagination": {"pageNo": 1,
+                       "pageSize": 10}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/connection/DeviceData/searchEvent.py b/connection/DeviceData/searchEvent.py
new file mode 100644
index 0000000..6658dae
--- /dev/null
+++ b/connection/DeviceData/searchEvent.py
@@ -0,0 +1,170 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SearchEvent
+ * Author:  Dylan Yeo
+ * Date:    26/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_event.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 26/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SearchEvent(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "pagination": {"pageNo": 1,
+                       "pageSize": 25},
+        "resolveName": True
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_productKey(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"productKey": productKey
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_deviceKey(accessKey, secretKey, orgId, url, deviceKey):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"deviceKey": deviceKey
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetId": assetId
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_tslEventKey(accessKey, secretKey, orgId, url, EventKey):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"tslEventKey": EventKey
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_tslEventType(accessKey, secretKey, orgId, url, EventType):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"tslEventType": EventType
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_startTime(accessKey, secretKey, orgId, url, startTime):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"startTime": startTime
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_endTime(accessKey, secretKey, orgId, url, endTime):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"endTime": endTime
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchEvent_expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/events'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "productKey = 'pk1'"
+    # expression = "productKey in ('pk1')"
+    # expression = "deviceKey = 'dk1'"
+    # expression = "deviceKey in ('dk1')"
+    # expression = "assetId ='assetId1'"
+    # expression = "assetId in ('assetId1')"
+    # expression = "tslEventKey = 'Event1'"
+    # expression = "tslEventKey in ('Event1')"
+    # expression = "tslEventType = 'INFO'"
+    # expression = "tslEventType in ('INFO')"
+    # expression = "productKey = 'pk1' and deviceKey = 'dk1'"
+    # expression = "tslEventKey = 'Event1' or tslEventType = 'WARNING'"
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/DeviceData/setMeasurementPoint.py b/connection/DeviceData/setMeasurementPoint.py
new file mode 100644
index 0000000..a7768f2
--- /dev/null
+++ b/connection/DeviceData/setMeasurementPoint.py
@@ -0,0 +1,71 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SetMeasurementPoint
+ * Author:  Dylan Yeo
+ * Date:    21/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/set_measurepoint.html
+ * refer to the resources/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 21/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SetMeasurementPoint_assetId(accessKey, secretKey, orgId, url, assetId):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "setMeasurepoint", "orgId": orgId, "assetId": assetId,
+              "measurepointId": "Int_MeasurementPoint",  # Set MeasurementPoints Identifier
+              "pendingTtl": 172800,  # Set cache storage time 0 - 172800 seconds, [Optional: Default = 0 seconds]
+              "timeout": 30  # Set timeout period 1 - 60 seconds, [Optional: Default = 30 seconds]
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"value": 5000  # Set value of measurepointId
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:  # in case of any error and unable to retrieve data
+        commandId = response["data"]["commandId"]
+    except:
+        commandId = str(None)
+    print("commandId: " + commandId)
+    return (commandId)
+
+
+def SetMeasurementPoint_Keys(accessKey, secretKey, orgId, url, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/commands'
+    params = {"action": "setMeasurepoint", "orgId": orgId, "productKey": productKey, "deviceKey": deviceKey,
+              "measurepointId": "Float_MeasurementPoint",  # Set MeasurementPoints Identifier
+              "pendingTtl": 172800,  # Set cache storage time 0 - 172800 seconds, [Optional: Default = 0 seconds]
+              "timeout": 60  # Set timeout period 1 - 60 seconds, [Optional: Default = 30 seconds]
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"value": 15.5  # Set value of measurepointId
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:  # in case of any error and unable to retrieve data
+        commandId = response["data"]["commandId"]
+    except:
+        commandId = str(None)
+    print("commandId: " + commandId)
+    return (commandId)
diff --git a/connection/FirmwareManagement/connectionFirmwareManagementApp.py b/connection/FirmwareManagement/connectionFirmwareManagementApp.py
new file mode 100644
index 0000000..45e2c9a
--- /dev/null
+++ b/connection/FirmwareManagement/connectionFirmwareManagementApp.py
@@ -0,0 +1,57 @@
+import connection.FirmwareManagement.createFirmwareFile as CreateFirmwareFile_py
+
+import connection.HTTPMessageIntegration.getToken as GetToken_py
+
+ModelId = "Python_Demo_Model"
+ProductKey = "pk1"
+DeviceKey = "dk1"
+AssetId = "assetId1"
+FirmwareId = "firmwareId"
+
+
+def ConnectionFirmwareManagementGeneral(accessKey, secretKey, orgId, url):
+    getToken = GetToken_py.GetToken(accessKey, secretKey, url)
+    # RefreshToken_py.refreshToken(accessKey,secretKey, url, getToken)
+    CreateFirmwareFile_py.createFirmwareFile(secretKey, orgId, url, ProductKey, getToken)
+
+    # DeleteFirmware_py.deleteFirmwareFile(accessKey, secretKey, orgId, url, FirmwareId)
+
+    # GetFirmwareFile_py.getFirmwareFile(accessKey, secretKey, orgId, url, "62046c6182355078ea03cd7a")
+
+    # ListDeviceCurrentFirmware_py.listDeviceCurrentFirmware(accessKey, secretKey, orgId, url, "a")
+
+    '''Search Firmware File with pagination'''
+    # SearchFirmwareFile_py.searchFirmwareFile(accessKey, secretKey, orgId, url)
+
+    '''Search Firmware File with expression using product key'''
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "productKey = '" + ProductKey + "'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "productKey in ('pk1')")
+
+    '''Search Firmware File with expression using isVerified'''
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "isVerified = True")
+
+    '''Search Firmware File with expression using name'''
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name like 'new firm'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.default like 'new firm'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.default like 'firm'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.en_US like 'Contents'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like '内容'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.zh_CN like '内'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like 'コンテンツ'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.ja_JP like 'ンツ'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'Contenido'")
+    # SearchFirmwareFile_py.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "name.es_ES like 'Conten'")
+
+    '''Search Device Upgrade with pagination'''
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade(accessKey, secretKey, orgId, url)
+
+    '''Search Device Upgrade with expression using product key'''
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, "productKey = '" + ProductKey + "'")
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, "productKey in ('A1wKaFX6')")
+
+    '''Search Device Upgrade with expression using firmware version'''
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, "firmwareVersion = '1.0.1'")
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, "firmwareVersion in ('moxa_cross_v2.2.0')")
+
+    '''Search Device Upgrade with expression using isUpgrading'''
+    # SearchDeviceUpgrade_py.searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, "isUpgrading = False")
diff --git a/connection/FirmwareManagement/createFirmwareFile.py b/connection/FirmwareManagement/createFirmwareFile.py
new file mode 100644
index 0000000..a805cd2
--- /dev/null
+++ b/connection/FirmwareManagement/createFirmwareFile.py
@@ -0,0 +1,85 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createFirmwareFile
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/create_firmware.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import requests
+from requests.models import PreparedRequest
+from requests_toolbelt.multipart.encoder import MultipartEncoder
+import time
+import hashlib
+
+import os
+import pathlib
+import sys
+
+currentTime = round(time.time()*1000.0)
+
+def createFirmwareFile(secretKey, orgId, url, productKey, token):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "create", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    filepath = pathlib.Path(sys.path[1]) /"resources/IoTHub/ConnectServiceModel/FirmwareManagement/SampleFirmwareFile.bin"
+    print(filepath)
+
+    file = open(filepath, 'rb')
+
+    paramsData = "".join(x + y for x, y in params.items())
+    print("paramsData:", paramsData)
+
+    signData = token + paramsData + str(currentTime) + secretKey
+    print("signData:", signData)
+
+    encode = signData.encode('UTF-8')
+    print(encode)
+
+    encryption = hashlib.sha256(encode)
+    print(encryption)
+
+    hexadecimal = encryption.hexdigest()
+    print(hexadecimal)
+    signature = hexadecimal.lower()
+
+    body = MultipartEncoder(fields={
+         'Content-Disposition': 'form-data',
+          'metadata': """{'name': {'defaultValue': 'Python_Firmware_V1.2_Veri',
+                        'i18nValue': {'zh_CN': 'Python_固件名称',
+                                      'en_US': 'Python_Firmware_Name',
+                                      'ja_JP': 'Python_ファームウェア名',
+                                      'es_ES': 'Python_NombreDelFirmware'}},
+                        'version': '1.2',
+                        'signMethod': 'md5',
+                        'sign': 'Python_Firmware_Signature',
+                        'desc': 'Python_Firmware_Description',
+                        'enableVerification': True
+                        }""",
+
+    })
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "apim-signature": signature,
+              "apim-timestamp": str(currentTime),
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
diff --git a/connection/FirmwareManagement/deleteFirmware.py b/connection/FirmwareManagement/deleteFirmware.py
new file mode 100644
index 0000000..dba9fa2
--- /dev/null
+++ b/connection/FirmwareManagement/deleteFirmware.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteFirmwareFile
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description: Delete a firmware
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/delete_firmware.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def deleteFirmwareFile(accessKey, secretKey, orgId, url, firmwareId):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "delete", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/FirmwareManagement/getFirmwareFile.py b/connection/FirmwareManagement/getFirmwareFile.py
new file mode 100644
index 0000000..6c86751
--- /dev/null
+++ b/connection/FirmwareManagement/getFirmwareFile.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getFirmwareFile
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_firmware.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getFirmwareFile(accessKey, secretKey, orgId, url, firmwareId):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "get", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/FirmwareManagement/listDeviceCurrentFirmware.py b/connection/FirmwareManagement/listDeviceCurrentFirmware.py
new file mode 100644
index 0000000..208b92b
--- /dev/null
+++ b/connection/FirmwareManagement/listDeviceCurrentFirmware.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listDeviceCurrentFirmware
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description: List the firmware versions of all devices under the specified product
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/list_firmware_version.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def listDeviceCurrentFirmware(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "listVersion", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/FirmwareManagement/searchDeviceUpgrade.py b/connection/FirmwareManagement/searchDeviceUpgrade.py
new file mode 100644
index 0000000..ced3f7e
--- /dev/null
+++ b/connection/FirmwareManagement/searchDeviceUpgrade.py
@@ -0,0 +1,48 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchDeviceUpgrade
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description: Search for the firmware and upgrade status of the device based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_device_upgrade.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def searchDeviceUpgrade(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "searchDeviceUpgrade", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pagination": {"pageNo": 1,
+                         "pageSize": 5,
+    }}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchDeviceUpgrade_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "searchDeviceUpgrade", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"expression": expression
+          }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/connection/FirmwareManagement/searchFirmwareFile.py b/connection/FirmwareManagement/searchFirmwareFile.py
new file mode 100644
index 0000000..d1674a7
--- /dev/null
+++ b/connection/FirmwareManagement/searchFirmwareFile.py
@@ -0,0 +1,48 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchFirmwareFile
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description: Search for firmware files under an OU based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_firmware.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareManagement/Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 18/2/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def searchFirmwareFile(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pagination": {"pageNo": 1,
+                         "pageSize": 5,
+    }}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/ota-firmwares'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"expression": expression
+          }
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/connection/FirmwareOTAUpgradeManagement/cancelOTATask.py b/connection/FirmwareOTAUpgradeManagement/cancelOTATask.py
new file mode 100644
index 0000000..41a540d
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/cancelOTATask.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: cancelOTATask
+ * Author:  Dylan Yeo
+ * Date:    22/2/22
+ * Description: Cancel OTA tasks under the specified OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/cancel_ota_task.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def cancelOTATask(accessKey, secretKey, orgId, url, deviceKeys, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "cancelTask", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"deviceKeys":deviceKeys
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/FirmwareOTAUpgradeManagement/connectionFirmwareOTAUpgradeManagementApp.py b/connection/FirmwareOTAUpgradeManagement/connectionFirmwareOTAUpgradeManagementApp.py
new file mode 100644
index 0000000..1a89ee8
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/connectionFirmwareOTAUpgradeManagementApp.py
@@ -0,0 +1,141 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Product Key can be found on EnOS Portal (Go to Products under Product Key)
+ProductKey = "pk1"
+
+# Device Key can be found on EnOS Portal (Go to Device Assets under Device Key)
+DeviceKey = "dk"
+DeviceKey2 = "dk2"
+DeviceKey3 = "dk3"
+
+# AssetId can be found on EnOS Portal (Go to Device Assets under Asset ID)
+AssetId = "assetId1"
+AssetId2 = "assetId2"
+AssetId3 = "assetId3"
+
+# Firmware Id can be found by running searchFirmwareFile.py API and getting FirmwareId from response returned
+firmwareId_v1_0 = "6214661271125f2bf2b3f78f"
+firmwareId_v1_1 = "62146418d9c7f104ffad7f36"
+firmwareId_v1_2_veri = "6214873771125f2bf2b3f799"
+
+# Job Id can be found by running searchOTAJob API (or its other counterparts) as shown below and getting jobId from response returned
+jobId = "6214ad2171125f2bf2b3f7b4"
+
+'''
+Device details to run simulator
+Instructions:
+Open .env file and replace DEVICE_KEY and DEVICE_SECRET accordingly
+
+Python_Firmware_Test1:
+DEVICE_KEY=wnUdCMJf5a
+DEVICE_SECRET=DDFas5dIB28RVVNgRPql
+
+Python_Firmware_Test2:
+DEVICE_KEY=INQCUhOavq
+DEVICE_SECRET=R5BqjMocOk5AI46OPr90
+
+Python_Firmware_Test3:
+DEVICE_KEY=YrY9DbaHiU
+DEVICE_SECRET=mSCucfKRIPoOYzWy1Yxh
+'''
+def ConnectionFirmwareOTAUpgradeManagementGeneral(accessKey, secretKey, orgId, url):
+    '''Search for Firmware File to get FirmwareId'''
+    # SearchFirmwareId.searchFirmwareFile_Expression(accessKey, secretKey, orgId, url, "productKey = '" + ProductKey + "'")
+    '''Create OTA Job and using Device Key to specify devices'''
+    # jobId = CreateOTAJob_py.createOTAJob_upgrade(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], deviceKeys = [DeviceKey3])
+    # jobId = CreateOTAJob_py.createOTAJob_verify(accessKey, secretKey, orgId, url, firmwareId_v1_2_veri, version = ["1.0"], [DeviceKey, DeviceKey2, DeviceKey3])
+
+    '''Alternative: Create OTA Job and using attributes to specify devices'''
+    # jobId = CreateOTAJob_py.createOTAJob_upgrade_attributes(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], attributes = {'Int_Attribute' : [100,1000]})
+    # jobId = CreateOTAJob_py.createOTAJob_verify_attributes(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.2"], attributes = {'Int_Attribute' : [100]})
+
+    '''Alternative: Create OTA Job and using tags to specify devices'''
+    # jobId = CreateOTAJob_py.createOTAJob_upgrade_tags(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], tags = {"firmwarekey": ["firmware","firmwarevalue"]})
+    # jobId = CreateOTAJob_py.createOTAJob_verify_tags(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.2"], tags = {"firmwarekey": ["firmware","firmwarevalue"]})
+
+    '''Alternative: Create OTA Job and using assetTrees to specify devices'''
+    # jobId = CreateOTAJob_py.createOTAJob_upgrade_assetTrees(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], treeId = "treeId1")
+    # jobId = CreateOTAJob_py.createOTAJob_upgrade_assetTrees(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], treeId = "treeId1", includedNotes = "")
+    # jobId = CreateOTAJob_py.createOTAJob_verify_assetTrees(accessKey, secretKey, orgId, url, firmwareId = firmwareId_v1_1, version = ["1.0","1.2"], treeId = "treeId1", includedNotes = "")
+
+    '''Start OTA Job'''
+    # StartOTAJob_py.startOTAJob(accessKey, secretKey, orgId, url, jobId)
+
+    '''Get OTA Job'''
+    # GetOTAJob_py.getOTAJob(accessKey, secretKey, orgId, url, jobId)
+
+    '''Cancel OTA Task in a job'''
+    # CancelOTATask_py.cancelOTATask(accessKey, secretKey, orgId, url, [DeviceKey2, DeviceKey3], jobId)
+
+    '''Retry OTA Task in a job when the task failed or cancelled'''
+    # RetryOTATask_py.retryOTATask(accessKey, secretKey, orgId,url, [DeviceKey3], jobId)
+
+    '''Stop OTA Job'''
+    # StopOTAJob_py.stopOTAJob(accessKey, secretKey, orgId, url, jobId)
+
+    '''Delete OTA Job'''
+    # DeleteOTAJob_py.deleteOTAJob(accessKey, secretKey, orgId, url, jobId)
+
+
+    '''Search OTA Job with pagination'''
+    # SearchOTAJob_py.searchOTAJob(accessKey, secretKey, orgId, url)
+
+    '''Search OTA Job with expression using product key'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "productKey ='" + ProductKey + "'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "productKey in ('" + ProductKey + "')")
+
+    '''Search OTA Job with expression using firmware ID'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareId ='" + firmwareId_v1_2_veri + "'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareId in ('" + firmwareId_v1_2_veri + "')")
+
+    '''Search OTA Job with expression using firmware version'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareVersion = '1.2'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareVersion in ('1.1','1.2')")
+
+    '''Search OTA Job with expression using type'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "type  = 'upgrade'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "type  = 'verify'")
+
+    '''Search OTA Job with expression using status'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "status = 'started'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "status = 'stopped'")
+
+    '''Search OTA Job with expression using firmware name'''
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName like 'Python_Firmware_V1.2_Veri'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.default like 'Python_Firmware_V1.2_Veri'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.default like 'Python_Firmware_V1.2_Veri'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.en_US like 'Python_Firmware_Name'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.zh_CN like 'Python_固件名称'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.zh_CN like '固件名称'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.ja_JP like 'Python_ファームウェア名'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.ja_JP like 'ウェア名'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.es_ES like 'Python_NombreDelFirmware'")
+    # SearchOTAJob_py.searchOTAJob_Expression(accessKey, secretKey, orgId, url, "firmwareName.es_ES like 'NombreDelFirmware'")
+
+    '''Search OTA Task with pagination'''
+    # SearchOTATask_py.searchOTATask(accessKey, secretKey, orgId, url)
+
+    '''Search OTA Task with expression using job ID'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "jobId ='" + jobId + "'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "jobId in ('" + jobId + "')")
+
+    '''Search OTA Task with expression using device key'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "deviceKey ='" + DeviceKey + "'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "deviceKey in ('dk1', 'dk2', 'dk3')")
+
+    '''Search OTA Task with expression using fromversion'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "fromVersion = '1.0'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "fromVersion in ('1.0','1.2')")
+
+    '''Search OTA Task with expression using toVersion'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "toVersion = '1.2'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "toVersion in ('1.0','1.2')")
+
+    '''Search OTA Task with expression using status'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "status = 'succeeded'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "status in ('succeeded', 'failed')")
+
+    '''Search OTA Task with expression using description'''
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "desc = 'Cancelled by user'")
+    # SearchOTATask_py.searchOTATask_Expression(accessKey, secretKey, orgId, url, "desc in ('Cancelled by user', 'upgrading firmware finished')")
+
diff --git a/connection/FirmwareOTAUpgradeManagement/createOTAJob.py b/connection/FirmwareOTAUpgradeManagement/createOTAJob.py
new file mode 100644
index 0000000..7b8f27f
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/createOTAJob.py
@@ -0,0 +1,315 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Create an OTA job for batch verification or upgrading
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/create_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+
+start_timestamp = round(time.time()*1000)
+hours = 60*60*3 #3 hours in seconds
+end_timestamp = round((time.time() + hours)*1000)
+
+def createOTAJob_verify(accessKey, secretKey, orgId, url, firmwareId, version, deviceKeys):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Verify_Job",
+                     "i18nValue": {"zh_CN": "OTA_验证工作",
+                                   "en_US": "OTA_Verify_Job",
+                                   "ja_JP": "OTA_仕事を確認する",
+                                   "es_ES": "OTA_Verificar_Trabajo"}},
+            "type": "verify",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "deviceKeys": deviceKeys},
+            #optional parameters
+            "upgradeTimeout": "6000"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+def createOTAJob_upgrade(accessKey, secretKey, orgId, url, firmwareId, version, deviceKeys):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Upgrade_Job",
+                     "i18nValue": {"zh_CN": "OTA_升级工作",
+                                   "en_US": "OTA_Upgrade_Job",
+                                   "ja_JP": "OTA_アップグレードジョブ",
+                                   "es_ES": "OTA_Actualizar_Trabajo"}},
+            "type": "upgrade",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "deviceKeys": deviceKeys},
+            "upgradePolicy": "snapshot",
+            "enableUpgradeRequest": True,
+            #optional parameters
+            "upgradeTimeout": "600",
+            "retryPolicy": {"enableRetry": True,
+                            "retryInterval": "10",
+                            "retryCount": 5},
+            "schedulePolicy": {"isRepeatDaily": True,
+                               "startTimestamp": start_timestamp,
+                               "endTimestamp": end_timestamp,
+                               "timezoneOffsetInMinutes": 60
+                               },
+            "maximumConcurrency": "10"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+
+def createOTAJob_verify_attributes(accessKey, secretKey, orgId, url, firmwareId, version, attributes):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Verify_Job",
+                     "i18nValue": {"zh_CN": "OTA_验证工作",
+                                   "en_US": "OTA_Verify_Job",
+                                   "ja_JP": "OTA_仕事を確認する",
+                                   "es_ES": "OTA_Verificar_Trabajo"}},
+            "type": "verify",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "attributes": attributes},
+            #optional parameters
+            "upgradeTimeout": "6000"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+def createOTAJob_upgrade_attributes(accessKey, secretKey, orgId, url, firmwareId, version, attributes):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Upgrade_Job",
+                     "i18nValue": {"zh_CN": "OTA_升级工作",
+                                   "en_US": "OTA_Upgrade_Job",
+                                   "ja_JP": "OTA_アップグレードジョブ",
+                                   "es_ES": "OTA_Actualizar_Trabajo"}},
+            "type": "upgrade",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "attributes": attributes},
+            "upgradePolicy": "snapshot",
+            "enableUpgradeRequest": True,
+            # optional parameters
+            "upgradeTimeout": "600",
+            "retryPolicy": {"enableRetry": True,
+                            "retryInterval": "10",
+                            "retryCount": 5},
+            "schedulePolicy": {"isRepeatDaily": True,
+                               "startTimestamp": start_timestamp,
+                               "endTimestamp": end_timestamp,
+                               "timezoneOffsetInMinutes": 60
+                               },
+            "maximumConcurrency": "10"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+
+def createOTAJob_verify_tags(accessKey, secretKey, orgId, url, firmwareId, version, tags):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Verify_Job",
+                     "i18nValue": {"zh_CN": "OTA_验证工作",
+                                   "en_US": "OTA_Verify_Job",
+                                   "ja_JP": "OTA_仕事を確認する",
+                                   "es_ES": "OTA_Verificar_Trabajo"}},
+            "type": "verify",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "tags": tags},
+            #optional parameters
+            "upgradeTimeout": "6000"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+def createOTAJob_upgrade_tags(accessKey, secretKey, orgId, url, firmwareId, version, tags):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Upgrade_Job",
+                     "i18nValue": {"zh_CN": "OTA_升级工作",
+                                   "en_US": "OTA_Upgrade_Job",
+                                   "ja_JP": "OTA_アップグレードジョブ",
+                                   "es_ES": "OTA_Actualizar_Trabajo"}},
+            "type": "upgrade",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "tags": tags},
+            "upgradePolicy": "snapshot",
+            "enableUpgradeRequest": True,
+            # optional parameters
+            "upgradeTimeout": "600",
+            "retryPolicy": {"enableRetry": True,
+                            "retryInterval": "10",
+                            "retryCount": 5},
+            "schedulePolicy": {"isRepeatDaily": True,
+                               "startTimestamp": start_timestamp,
+                               "endTimestamp": end_timestamp,
+                               "timezoneOffsetInMinutes": 60
+                               },
+            "maximumConcurrency": "10"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+def createOTAJob_verify_assetTrees(accessKey, secretKey, orgId, url, firmwareId, version, treeId, includedNotes):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Verify_Job",
+                     "i18nValue": {"zh_CN": "OTA_验证工作",
+                                   "en_US": "OTA_Verify_Job",
+                                   "ja_JP": "OTA_仕事を確認する",
+                                   "es_ES": "OTA_Verificar_Trabajo"}},
+            "type": "verify",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "assetTrees": [{"treeId": treeId,
+                                            "includedNotes": includedNotes}]},
+            #optional parameters
+            "upgradeTimeout": "6000"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
+
+
+def createOTAJob_upgrade_assetTrees(accessKey, secretKey, orgId, url, firmwareId, version, treeId, includedNotes=None):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "create", "orgId": orgId, "firmwareId": firmwareId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"name": {"defaultValue": "Python_OTA_Upgrade_Job",
+                     "i18nValue": {"zh_CN": "OTA_升级工作",
+                                   "en_US": "OTA_Upgrade_Job",
+                                   "ja_JP": "OTA_アップグレードジョブ",
+                                   "es_ES": "OTA_Actualizar_Trabajo"}},
+            "type": "upgrade",
+            "upgradeScope": {"type": "partial",
+                             "versionNumbers": version,
+                             "assetTrees": [{"treeId": treeId,
+                                            "includedNotes": includedNotes}]},
+            "upgradePolicy": "snapshot",
+            "enableUpgradeRequest": True,
+            # optional parameters
+            "upgradeTimeout": "600",
+            "retryPolicy": {"enableRetry": True,
+                            "retryInterval": "10",
+                            "retryCount": 5},
+            "schedulePolicy": {"isRepeatDaily": True,
+                               "startTimestamp": start_timestamp,
+                               "endTimestamp": end_timestamp,
+                               "timezoneOffsetInMinutes": 60
+                               },
+            "maximumConcurrency": "10"
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        jobId = response["data"]["jobId"]
+        return jobId
+    except:
+        jobId = None
diff --git a/connection/FirmwareOTAUpgradeManagement/deleteOTAJob.py b/connection/FirmwareOTAUpgradeManagement/deleteOTAJob.py
new file mode 100644
index 0000000..97d7ea4
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/deleteOTAJob.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Delete an OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/delete_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def deleteOTAJob(accessKey, secretKey, orgId, url, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "delete", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/FirmwareOTAUpgradeManagement/getOTAJob.py b/connection/FirmwareOTAUpgradeManagement/getOTAJob.py
new file mode 100644
index 0000000..7cf7e14
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/getOTAJob.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Get the details of an OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getOTAJob(accessKey, secretKey, orgId, url, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "get", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/FirmwareOTAUpgradeManagement/retryOTATask.py b/connection/FirmwareOTAUpgradeManagement/retryOTATask.py
new file mode 100644
index 0000000..926a8da
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/retryOTATask.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: retryOTATask
+ * Author:  Dylan Yeo
+ * Date:    22/2/22
+ * Description: Retry OTA tasks under the specified OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/retry_ota_task.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def retryOTATask(accessKey, secretKey, orgId, url, deviceKeys, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "retryTask", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"deviceKeys":deviceKeys
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/FirmwareOTAUpgradeManagement/searchOTAJob.py b/connection/FirmwareOTAUpgradeManagement/searchOTAJob.py
new file mode 100644
index 0000000..b3c8dbb
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/searchOTAJob.py
@@ -0,0 +1,46 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Search for OTA jobs based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def searchOTAJob(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": {"pageNo": 1,
+                           "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchOTAJob_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "search", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/FirmwareOTAUpgradeManagement/searchOTATask.py b/connection/FirmwareOTAUpgradeManagement/searchOTATask.py
new file mode 100644
index 0000000..017176b
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/searchOTATask.py
@@ -0,0 +1,46 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchOTATask
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Search for OTA tasks based on the search criteria
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def searchOTATask(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "searchTask", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": {"pageNo": 1,
+                         "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchOTATask_Expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "searchTask", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/FirmwareOTAUpgradeManagement/startOTAJob.py b/connection/FirmwareOTAUpgradeManagement/startOTAJob.py
new file mode 100644
index 0000000..2690c65
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/startOTAJob.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: startOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Start an OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/start_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def startOTAJob(accessKey, secretKey, orgId, url, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "start", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/FirmwareOTAUpgradeManagement/stopOTAJob.py b/connection/FirmwareOTAUpgradeManagement/stopOTAJob.py
new file mode 100644
index 0000000..b82edf2
--- /dev/null
+++ b/connection/FirmwareOTAUpgradeManagement/stopOTAJob.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: stopOTAJob
+ * Author:  Dylan Yeo
+ * Date:    21/2/22
+ * Description: Stop an OTA job
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/stop_ota_job.html
+ * refer to the resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def stopOTAJob(accessKey, secretKey, orgId, url, jobId):
+    accessURL = url + '/connect-service/v2.1/ota-jobs'
+    params = {"action": "stop", "orgId": orgId, "jobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/GatewayAndSubDevices/addSubDevice.py b/connection/GatewayAndSubDevices/addSubDevice.py
new file mode 100644
index 0000000..f3fa0b8
--- /dev/null
+++ b/connection/GatewayAndSubDevices/addSubDevice.py
@@ -0,0 +1,62 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: AddSubDevice
+ * Author:  Dylan Yeo
+ * Date:    28/1/22
+ * Description: Add new sub-devices to gateway device (creating a topological relationship)
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/add_sub_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 28/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+ModelId = "Python_Demo_Model"
+SubDevice_ProductKey = "pk1"
+
+SubDevice_DeviceKey1 = "dk1"
+SubDevice_AssetId1 = "assetId1"
+SubDevice_DeviceKey2 = "dk2"
+SubDevice_AssetId2 = "assetId2"
+
+
+def AddSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "addSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "subDevices": [{"assetId": SubDevice_AssetId1}, {"assetId": SubDevice_AssetId2}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def AddSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "addSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"productKey":Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "subDevices": [{"productKey": SubDevice_ProductKey, "deviceKey": SubDevice_DeviceKey1},
+                           {"productKey": SubDevice_ProductKey, "deviceKey": SubDevice_DeviceKey2}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/GatewayAndSubDevices/connectionGatewayAndSubDevicesApp.py b/connection/GatewayAndSubDevices/connectionGatewayAndSubDevicesApp.py
new file mode 100644
index 0000000..6d37ce8
--- /dev/null
+++ b/connection/GatewayAndSubDevices/connectionGatewayAndSubDevicesApp.py
@@ -0,0 +1,160 @@
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Gateway Asset Asset ID can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+Gateway_AssetId = "assetId"
+# Gateway Asset Product Key can be found on EnOS portal (Go to Device Management/Products under Product Key)
+Gateway_ProductKey = "pk"
+# Gateway Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+Gateway_DeviceKey = "dk"
+
+# SubDevice Asset ID can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+SubDevice1_AssetId = "assetId2"
+SubDevice2_AssetId = "assetId3"
+
+# SubDevice/Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+SubDevice_ProductKey = "pk2"
+
+# SubDeviceDevice Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+SubDevice1_DeviceKey = "assetId2"
+SubDevice2_DeviceKey = "assetId3"
+
+# These attributes can be found on the EnOS portal (Go to Device Management/Device/View(Device that you choose)/Attributes)
+SubDevice_AttributeName = "Date_Attribute"
+SubDevice_AttributeValue = "2022-01-01"
+
+
+def ConnectionGatewayAndSubDevicesGeneral(accessKey, secretKey, orgId, url):
+    '''Add SubDevice to Gateway, Get Gateway and Remove SubDevice from Gateway using Gateway Asset ID'''
+    # AddSubDevice_py.AddSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId)
+    # GetGateway_py.GetGateway_assetId(accessKey, secretKey, orgId, url)
+    # RemoveSubDevice_py.RemoveSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId)
+
+    '''Add SubDevice to Gateway, Get Gateway and Remove SubDevice from Gateway using Gateway Product Key and Device Key'''
+    # AddSubDevice_py.AddSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey)
+    # GetGateway_py.GetGateway_Keys(accessKey, secretKey, orgId, url)
+    # RemoveSubDevice_py.RemoveSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey)
+
+    '''Add Python_SubDevice1 and Python_SubDevice2 for searching purposes below'''
+    # AddSubDevice_py.AddSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId)
+
+    '''Search SubDevice(Asset Id parameter) with projection and pagination'''
+    # SearchSubDevice_py.SearchSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId)
+
+    '''Search SubDevice(Product Key and Device Key parameters) with projection and pagination'''
+    # SearchSubDevice_py.SearchSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey)
+
+    '''Search SubDevice(Asset Id parameter) with expression using Model Id'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "modelId = '" + ModelId + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "modelId in ('" + ModelId + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "modelId in (\"" + ModelId + "\")")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using Model Id'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "modelId = '" + ModelId + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "modelId in ('" + ModelId + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "modelId in (\"" + ModelId + "\")")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Product Key'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "productKey = '" + SubDevice_ProductKey + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "productKey in ('" + SubDevice_ProductKey + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "productKey in (\"" + SubDevice_ProductKey + "\")")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Product Key'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "productKey = '" + SubDevice_ProductKey + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "productKey in ('" + SubDevice_ProductKey + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "productKey in (\"" + SubDevice_ProductKey + "\")")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Device Key'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceKey = '" + SubDevice1_DeviceKey + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceKey in ('" + SubDevice1_DeviceKey + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceKey in (\"" + SubDevice1_DeviceKey + "\")")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Device Key'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceKey = '" + SubDevice2_DeviceKey + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceKey in ('" + SubDevice2_DeviceKey + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceKey in (\"" + SubDevice2_DeviceKey + "\")")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Asset Id'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "assetId = '" + SubDevice1_AssetId + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "assetId in ('" + SubDevice1_AssetId + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "assetId in (\"" + SubDevice1_AssetId + "\")")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Asset Id'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "assetId = '" + SubDevice2_AssetId + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "assetId in ('" + SubDevice2_AssetId + "')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "assetId in (\"" + SubDevice2_AssetId + "\")")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Device Attributes'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceAttributes." + SubDevice_AttributeName + "='" + SubDevice_AttributeValue + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "exists(deviceAttributes." + SubDevice_AttributeName + ")")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "not exists(deviceAttributes." + "Random_AttributeName" + ")")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceAttributes." + SubDevice_AttributeName + " in ('" + SubDevice_AttributeValue + "')")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Device Attributes'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceAttributes." + SubDevice_AttributeName + "='" + SubDevice_AttributeValue + "'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "exists(deviceAttributes." + SubDevice_AttributeName + ")")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "not exists(deviceAttributes." + "Random_AttributeName" + ")")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceAttributes." + SubDevice_AttributeName + " in ('" + SubDevice_AttributeValue + "')")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Device Tags'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 = 'SubDevice1Value1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "exists(deviceTags.SubDevice1Key1)")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "not exists(deviceTags.SubDevice1Key1)")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 in ('SubDevice1Value1')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' and deviceTags.SubDevice1Key2 = 'SubDevice1Value2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' and deviceTags.SubDevice1Key2 = 'SubDevice1Value2' and deviceTags.SubDevice1Key3 = 'SubDevice1Value3'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' or deviceTags.SubDevice2Key1 = 'SubDevice2Value1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "exists(deviceTags.SubDevice1Key1) and exists(deviceTags.SubDevice1Key3)")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "exists(deviceTags.SubDevice1Key1) or exists(deviceTags.SubDevice1Key3)")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceTags.SubDevice1Key1 in ('SubDevice1Value1') and deviceTags.SubDevice1Key3 in ('SubDevice1Value3')")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "modelId = 'Python_Demo_Model' and deviceTags.SubDevice1Key3 = 'SubDevice1Value3'")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Device Tags'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 = 'SubDevice2Value1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "exists(deviceTags.SubDevice2Key1)")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "not exists(deviceTags.SubDevice2Key1)")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 in ('SubDevice2Value1')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' and deviceTags.SubDevice2Key2 = 'SubDevice2Value2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' and deviceTags.SubDevice2Key2 = 'SubDevice2Value2' and deviceTags.SubDevice2Key3 = 'SubDevice2Value3'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' or deviceTags.SubDevice1Key1 = 'SubDevice1Value1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "exists(deviceTags.SubDevice2Key1) and exists(deviceTags.SubDevice2Key3)")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "exists(deviceTags.SubDevice2Key1) or exists(deviceTags.SubDevice2Key3)")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceTags.SubDevice2Key1 in ('SubDevice2Value1') and deviceTags.SubDevice2Key3 in ('SubDevice2Value3')")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "modelId = 'Python_Demo_Model' and deviceTags.SubDevice2Key3 = 'SubDevice2Value3'")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice Device Name'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName like 'Python_SubDevice1_Default'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.default like 'Python_SubDevice1_Default'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.default like 'SubDevice1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.en_US like 'Python_SubDevice1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.zh_CN like 'Python子设备1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.zh_CN like '子设备1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.ja_JP like 'Pythonサブデバイス1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.ja_JP like 'サブデバイス1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.es_ES like 'SubDispositivoPython1'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "deviceName.es_ES like 'Python1'")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice Device Name'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName like 'Python_SubDevice2_Default'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.default like 'Python_SubDevice2_Default'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.default like 'SubDevice2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.en_US like 'Python_SubDevice2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.zh_CN like 'Python子设备2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.zh_CN like '子设备2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.ja_JP like 'Pythonサブデバイス2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.ja_JP like 'サブデバイス2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.es_ES like 'SubDispositivoPython2'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "deviceName.es_ES like 'Python2'")
+
+    '''Search SubDevice(Asset Id parameter) with expression using SubDevice status'''
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "status = 'inactive'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "status = 'online'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "status = 'offline'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "status = 'disable'")
+    # SearchSubDevice_py.SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_AssetId, "status = 'mirror'")
+
+    '''Search SubDevice(Product Key and Device Key parameters) with expression using SubDevice status'''
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "status = 'inactive'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "status = 'online'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "status = 'offline'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "status = 'disable'")
+    # SearchSubDevice_py.SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_ProductKey, Gateway_DeviceKey, "status = 'mirror'")
diff --git a/connection/GatewayAndSubDevices/getGateway.py b/connection/GatewayAndSubDevices/getGateway.py
new file mode 100644
index 0000000..6b6d9e1
--- /dev/null
+++ b/connection/GatewayAndSubDevices/getGateway.py
@@ -0,0 +1,57 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetGateway
+ * Author:  Dylan Yeo
+ * Date:    28/1/22
+ * Description:
+ * History: Get the gateway information based on the specified sub-device
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_gateway.html
+ * refer to the resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 28/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+ModelId = "Python_Demo_Model"
+SubDevice_ProductKey = "pk1"
+
+SubDevice_DeviceKey1 = "dk1"
+SubDevice_AssetId1 = "assetId1"
+SubDevice_DeviceKey2 = "dk2"
+SubDevice_AssetId2 = "assetid2"
+
+
+def GetGateway_assetId(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "getGateway", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"subDevice": {"assetId": SubDevice_AssetId2}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def GetGateway_Keys(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "getGateway", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"subDevice": {"productKey": SubDevice_ProductKey, "deviceKey": SubDevice_DeviceKey1}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/connection/GatewayAndSubDevices/removeSubDevice.py b/connection/GatewayAndSubDevices/removeSubDevice.py
new file mode 100644
index 0000000..006c27f
--- /dev/null
+++ b/connection/GatewayAndSubDevices/removeSubDevice.py
@@ -0,0 +1,59 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: RemoveSubDevice
+ * Author:  Dylan Yeo
+ * Date:    28/1/22
+ * Description: Remove sub-devices from the gateway
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/remove_sub_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 28/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+ModelId = "Python_Demo_Model"
+SubDevice_ProductKey = "pk1"
+
+SubDevice_DeviceKey1 = "dk1"
+SubDevice_AssetId1 = "assetId1"
+SubDevice_DeviceKey2 = "dk2"
+SubDevice_AssetId2 = "assetId2"
+
+def RemoveSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "removeSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "subDevices": [{"assetId": SubDevice_AssetId1},{"assetId": SubDevice_AssetId2}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def RemoveSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "removeSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "subDevices": [{"productKey": SubDevice_ProductKey, "deviceKey": SubDevice_DeviceKey1},
+                           {"productKey": SubDevice_ProductKey, "deviceKey": SubDevice_DeviceKey2}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/connection/GatewayAndSubDevices/searchSubDevice.py b/connection/GatewayAndSubDevices/searchSubDevice.py
new file mode 100644
index 0000000..8d33f1f
--- /dev/null
+++ b/connection/GatewayAndSubDevices/searchSubDevice.py
@@ -0,0 +1,505 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CancelCommand
+ * Author:  Dylan Yeo
+ * Date:    28/1/22
+ * Description: Search for sub-devices under the specified gateway
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_sub_device.html
+ * refer to the resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
+ *
+ * @author dylan.yeo
+ * @create 28/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+ModelId = "Python_Demo_Model"
+SubDevice_ProductKey = "pk1"
+
+SubDevice_DeviceKey1 = "dk1"
+SubDevice_AssetId1 = "assetId1"
+SubDevice_DeviceKey2 = "dk2"
+SubDevice_AssetId2 = "assetid2"
+
+SubDevice_AttributeName = "Date_Attribute"
+SubDevice_AttributeValue = "2022-01-01"
+
+
+
+def SearchSubDevice_assetId(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "projection": ["orgId",
+                           "assetId",
+                           "modelId",
+                           "modelIdPath",
+                           "productKey",
+                           "productName",
+                           "productType",
+                           "dataFormat",
+                           "deviceKey",
+                           "deviceName",
+                           "deviceSecret",
+                           "deviceDesc",
+                           "timezone",
+                           "deviceAttributes",
+                           "deviceTags",
+                           "mirrorSource",
+                           "firmwareVersion",
+                           "createTime",
+                           "status",
+                           "activeTime",
+                           "lastOnlineTime",
+                           "lastOfflineTime",
+                           "measurepointLastUpdate",
+                           "eventLastUpdate",
+                           "attributeLastUpdate",
+                           "featureLastUpdate"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "projection": ["orgId",
+                          "assetId",
+                          "modelId",
+                          "modelIdPath",
+                          "productKey",
+                          "productName",
+                          "productType",
+                          "dataFormat",
+                          "deviceKey",
+                          "deviceName",
+                          "deviceSecret",
+                          "deviceDesc",
+                          "timezone",
+                          "deviceAttributes",
+                          "deviceTags",
+                          "mirrorSource",
+                          "firmwareVersion",
+                          "createTime",
+                          "status",
+                          "activeTime",
+                          "lastOnlineTime",
+                          "lastOfflineTime",
+                          "measurepointLastUpdate",
+                          "eventLastUpdate",
+                          "attributeLastUpdate",
+                          "featureLastUpdate"],
+            "pagination": {"pageNo": 1,
+                           "pageSize": 5}
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_expression_assetId(accessKey, secretKey, orgId, url, Gateway_assetId, expression):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_expression_Keys(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey, expression):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_modelId(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "modelId = '" + ModelId + "'"
+    # expression = "modelId in ('" + ModelId + "')"
+    # expression = "modelId in (\"" + ModelId + "\")"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_modelId(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "modelId = '" + ModelId + "'"
+    # expression = "modelId in ('" + ModelId + "')"
+    # expression = "modelId in (\"" + ModelId + "\")"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceProductKey(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "productKey = '" + SubDevice_ProductKey + "'"
+    # expression = "productKey in ('" + SubDevice_ProductKey + "')"
+    # expression = "productKey in (\"" + SubDevice_ProductKey + "\")"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceProductKey(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "productKey = '" + SubDevice_ProductKey + "'"
+    # expression = "productKey in ('" + SubDevice_ProductKey + "')"
+    # expression = "productKey in (\"" + SubDevice_ProductKey + "\")"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceDeviceKey(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceKey = '" + SubDevice_DeviceKey1 + "'"
+    # expression = "deviceKey in ('" + SubDevice_DeviceKey1 + "')"
+    # expression = "deviceKey in (\"" + SubDevice_DeviceKey1 + "\")"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceDeviceKey(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceKey = '" + SubDevice_DeviceKey2 + "'"
+    # expression = "deviceKey in ('" + SubDevice_DeviceKey2 + "')"
+    # expression = "deviceKey in (\"" + SubDevice_DeviceKey2 + "\")"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceAssetId(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "assetId = '" + SubDevice_AssetId1 + "'"
+    # expression = "assetId in ('" + SubDevice_AssetId1 + "')"
+    # expression = "assetId in (\"" + SubDevice_AssetId1 + "\")"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceAssetId(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "assetId = '" + SubDevice_AssetId2 + "'"
+    # expression = "assetId in ('" + SubDevice_AssetId2 + "')"
+    # expression = "assetId in (\"" + SubDevice_AssetId2 + "\")"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceDeviceAttributes(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceAttributes." + SubDevice_AttributeName + "='" + SubDevice_AttributeValue + "'"
+    # expression = "exists(deviceAttributes." + SubDevice_AttributeName + ")"
+    # expression = "not exists(deviceAttributes." + "Random_AttributeName" + ")"
+    # expression = "deviceAttributes." + SubDevice_AttributeName + " in ('" + SubDevice_AttributeValue + "')"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceDeviceAttributes(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceAttributes." + SubDevice_AttributeName + "='" + SubDevice_AttributeValue + "'"
+    # expression = "exists(deviceAttributes." + SubDevice_AttributeName + ")"
+    # expression = "not exists(deviceAttributes." + "Random_AttributeName" + ")"
+    # expression = "deviceAttributes." + SubDevice_AttributeName + " in ('" + SubDevice_AttributeValue + "')"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceDeviceTags(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceTags.SubDevice1Key1 = 'SubDevice1Value1'"
+    # expression = "exists(deviceTags.SubDevice1Key1)"
+    # expression = "not exists(deviceTags.SubDevice1Key1)"
+    # expression = "deviceTags.SubDevice1Key1 in ('SubDevice1Value1')"
+    # expression = "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' and deviceTags.SubDevice1Key2 = 'SubDevice1Value2'"
+    # expression = "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' and deviceTags.SubDevice1Key2 = 'SubDevice1Value2' and deviceTags.SubDevice1Key3 = 'SubDevice1Value3'"
+    # expression = "deviceTags.SubDevice1Key1 = 'SubDevice1Value1' or deviceTags.SubDevice2Key1 = 'SubDevice2Value1'"
+    # expression = "exists(deviceTags.SubDevice1Key1) and exists(deviceTags.SubDevice1Key3)"
+    # expression = "exists(deviceTags.SubDevice1Key1) or exists(deviceTags.SubDevice1Key3)"
+    # expression = "deviceTags.SubDevice1Key1 in ('SubDevice1Value1') and deviceTags.SubDevice1Key3 in ('SubDevice1Value3')"
+    # expression = "modelId = 'Python_Demo_Model' and deviceTags.SubDevice1Key3 = 'SubDevice1Value3'"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceDeviceTags(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceTags.SubDevice2Key1 = 'SubDevice2Value1'"
+    # expression = "exists(deviceTags.SubDevice2Key1)"
+    # expression = "not exists(deviceTags.SubDevice2Key1)"
+    # expression = "deviceTags.SubDevice2Key1 in ('SubDevice2Value1')"
+    # expression = "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' and deviceTags.SubDevice2Key2 = 'SubDevice2Value2'"
+    # expression = "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' and deviceTags.SubDevice2Key2 = 'SubDevice2Value2' and deviceTags.SubDevice2Key3 = 'SubDevice2Value3'"
+    # expression = "deviceTags.SubDevice2Key1 = 'SubDevice2Value1' or deviceTags.SubDevice1Key1 = 'SubDevice1Value1'"
+    # expression = "exists(deviceTags.SubDevice2Key1) and exists(deviceTags.SubDevice2Key3)"
+    # expression = "exists(deviceTags.SubDevice2Key1) or exists(deviceTags.SubDevice2Key3)"
+    # expression = "deviceTags.SubDevice2Key1 in ('SubDevice2Value1') and deviceTags.SubDevice2Key3 in ('SubDevice2Value3')"
+    # expression = "modelId = 'Python_Demo_Model' and deviceTags.SubDevice2Key3 = 'SubDevice2Value3'"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceDeviceName(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceName like 'Python_SubDevice1_Default'"
+    # expression = "deviceName.default like 'Python_SubDevice1_Default'"
+    # expression = "deviceName.default like 'SubDevice1'"
+    # expression = "deviceName.en_US like 'Python_SubDevice1'"
+    # expression = "deviceName.zh_CN like 'Python子设备1'"
+    # expression = "deviceName.zh_CN like '子设备1'"
+    # expression = "deviceName.ja_JP like 'Pythonサブデバイス1'"
+    # expression = "deviceName.ja_JP like 'サブデバイス1'"
+    # expression = "deviceName.es_ES like 'SubDispositivoPython1'"
+    # expression = "deviceName.es_ES like 'Python1'"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceDeviceName(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "deviceName like 'Python_SubDevice2_Default'"
+    # expression = "deviceName.default like 'Python_SubDevice2_Default'"
+    # expression = "deviceName.default like 'SubDevice2'"
+    # expression = "deviceName.en_US like 'Python_SubDevice2'"
+    # expression = "deviceName.zh_CN like 'Python子设备2'"
+    # expression = "deviceName.zh_CN like '子设备2'"
+    # expression = "deviceName.ja_JP like 'Pythonサブデバイス2'"
+    # expression = "deviceName.ja_JP like 'サブデバイス2'"
+    # expression = "deviceName.es_ES like 'SubDispositivoPython2'"
+    # expression = "deviceName.es_ES like 'Python2'"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_assetId_SubDeviceStatus(accessKey, secretKey, orgId, url, Gateway_assetId):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "status = 'inactive'"
+    # expression = "status = 'online'"
+    # expression = "status = 'offline'"
+    # expression = "status = 'disable'"
+    # expression = "status = 'mirror'"
+
+    body = {"gateway": {"assetId": Gateway_assetId},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchSubDevice_Keys_SubDeviceStatus(accessKey, secretKey, orgId, url, Gateway_productKey, Gateway_deviceKey):
+    accessURL = url + '/connect-service/v2.1/device-topos'
+    params = {"action": "searchSubDevice", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    expression = "status = 'inactive'"
+    # expression = "status = 'online'"
+    # expression = "status = 'offline'"
+    # expression = "status = 'disable'"
+    # expression = "status = 'mirror'"
+
+    body = {"gateway": {"productKey": Gateway_productKey, "deviceKey": Gateway_deviceKey},
+            "expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/HTTPMessageIntegration/connectionHTTPMessageIntegrationApp.py b/connection/HTTPMessageIntegration/connectionHTTPMessageIntegrationApp.py
new file mode 100644
index 0000000..9ac2785
--- /dev/null
+++ b/connection/HTTPMessageIntegration/connectionHTTPMessageIntegrationApp.py
@@ -0,0 +1,41 @@
+import connection.HTTPMessageIntegration.uploadMeasurementPoints as UploadMeasurementPoints_py
+import connection.HTTPMessageIntegration.getToken as GetToken_py
+
+# Model Id can be found on EnOS portal (Go to Models under Model ID)
+ModelId = "Python_Demo_Model"
+# Device Asset assetId can be found on EnOS portal (Go to Device Management/Device Asset under Asset ID)
+AssetId = "assetId1"
+# Device Asset ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+ProductKey = "pk1"
+# Device Asset Device Key can be found on the EnOS portal (Go to Device Management/Device Asset under Device Key)
+DeviceKey = "dk1"
+
+
+def ConnectionHTTPMessageIntegrationGeneral(accessKey, secretKey, orgId, url):
+
+    Token = GetToken_py.GetToken(accessKey,secretKey, url)
+
+    # UploadAttributes_py.UploadAttributes_assetId(orgId, Token, AssetId)
+    # UploadAttributes_py.UploadAttributes_Keys(orgId, Token, ProductKey, DeviceKey)
+    # UploadAttributes_py.UploadAttributes_multifiles(orgId, Token, AssetId)
+
+
+    # UploadEvents_py.UploadEvents_assetId(orgId, Token, AssetId)
+    # UploadEvents_py.UploadEvents_Keys(orgId, Token, ProductKey, DeviceKey)
+
+    UploadMeasurementPoints_py.UploadMeasurementPoints_assetId(orgId, Token, AssetId)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints_Keys(orgId, Token, ProductKey, DeviceKey)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/connection/HTTPMessageIntegration/getToken.py b/connection/HTTPMessageIntegration/getToken.py
new file mode 100644
index 0000000..9a08700
--- /dev/null
+++ b/connection/HTTPMessageIntegration/getToken.py
@@ -0,0 +1,54 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getToken
+ * Author:  Dylan Yeo
+ * Date:    3/2/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/api/en/2.3.0/token/get_access_token.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+import hashlib
+
+currentTime = round(time.time()*1000.0)
+
+def GetToken(accessKey, secretKey, url):
+    accessURL = url + '/apim-token-service/v2.0/token/get'
+    params={}
+    # params = {"action": "get"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    concat = accessKey + str(currentTime) + secretKey
+    print(concat)
+
+    encode = concat.encode()
+    print(encode)
+
+    encryption = hashlib.sha256(encode)
+    print(encryption)
+
+    hexadecimal = encryption.hexdigest()
+    print(hexadecimal)
+
+
+    body={"appKey": accessKey,
+          "encryption": hexadecimal.lower(),
+          "timestamp": currentTime
+          }
+
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    Token = response["data"]["accessToken"]
+    return Token
+
+
diff --git a/connection/HTTPMessageIntegration/refreshToken.py b/connection/HTTPMessageIntegration/refreshToken.py
new file mode 100644
index 0000000..aa763bf
--- /dev/null
+++ b/connection/HTTPMessageIntegration/refreshToken.py
@@ -0,0 +1,51 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: refreshToken
+ * Author:  Dylan Yeo
+ * Date:    18/2/22
+ * Description: Refresh the generated access token before it expires (the expiring time of the access token is 2 hours by default)
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/api/en/2.3.0/token/refresh_access_token.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+import time
+import hashlib
+
+currentTime = round(time.time()*1000.0)
+
+def refreshToken(accessKey, secretKey, url, token):
+    accessURL = url + '/apim-token-service/v2.0/token/refresh'
+    params={}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    concat = accessKey + str(currentTime) + secretKey
+    print(concat)
+
+    encode = concat.encode()
+    print(encode)
+
+    encryption = hashlib.sha256(encode)
+    print(encryption)
+
+    hexadecimal = encryption.hexdigest()
+    print(hexadecimal)
+
+
+    body={"appKey": accessKey,
+          "encryption": hexadecimal.lower(),
+          "timestamp": currentTime,
+          "accessToken": token
+          }
+
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/connection/HTTPMessageIntegration/uploadAttributes.py b/connection/HTTPMessageIntegration/uploadAttributes.py
new file mode 100644
index 0000000..3bc7720
--- /dev/null
+++ b/connection/HTTPMessageIntegration/uploadAttributes.py
@@ -0,0 +1,166 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UploadAttributes
+ * Author:  Dylan Yeo
+ * Date:    3/2/22
+ * Description: Upload the attribute data of a device or logic asset, including file-type data
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/upload_integration_attributes.html
+ * refer to the resources/IoTHub/ConnectServiceModel/HTTPMessageIntegration
+ *
+ * @author dylan.yeo
+ * @create 3/2/22
+ * @since --
+"""
+import os
+import pathlib
+import sys
+
+import requests
+from requests.models import PreparedRequest
+from requests_toolbelt.multipart.encoder import MultipartEncoder
+
+url = "https://http_integration_url"
+
+def UploadAttributes_assetId(orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postAttribute", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    filepath = pathlib.Path(sys.path[1]) / "resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt"
+
+    file = open(filepath, 'rb')
+    filesize = os.path.getsize(filepath)
+
+    body = MultipartEncoder(fields={
+        'Content-Disposition': 'form-data',
+        'enos-message': """{'method': 'integration.attribute.post', 'id': 123, 'version': '1.1', 
+                    'params': [{'assetId': 'G5M8Ojhd', 'attributes': {'Int_Attribute': 1, 'File_Attribute':'local://UploadFileSample.txt'}}],
+                    'files': { 
+                        'UploadFileSample.txt': {
+                              'featureId': 'File_Attribute',
+                              'originalFilename': 'UploadFileSample.txt',
+                                'fileExt': '.txt',
+                              'assetId' : 'G5M8Ojhd' ,
+                              'md5': 'aa8ea05bdbcbadfcda7300c65c40859f',
+                              'fileLength': 658
+                            }
+                            }
+                    }""",
+        'enos-file': ('UploadFileSample.txt', file, 'text/plain')
+    }
+
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+def UploadAttributes_Keys(orgId, token, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postAttribute", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    filepath = pathlib.Path(sys.path[1]) / "resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt"
+
+    file = open(filepath, 'rb')
+    filesize = os.path.getsize(filepath)
+
+    body = MultipartEncoder(fields={
+        'Content-Disposition': 'form-data',
+        'enos-message': """{'method': 'integration.attribute.post', 'id': 123, 'version': '1.1',
+                        'params': [{'productKey': 'pk1','deviceKey': 'dk1', 'attributes': {'Int_Attribute': 1, 'File_Attribute':'local://SampleFileAttributes.txt'}}],
+                        'files': { 
+                            'SampleFileAttributes.txt': {
+                                  'featureId': 'File_Attribute',
+                                  'originalFilename': 'UploadFileSample.txt',
+                                  'fileExt': '.txt',
+                                  'productKey': 'pk1','deviceKey': 'dk1',
+                                  
+                                  'fileLength': 658
+                                }
+                                }
+                        }""",
+        'enos-file': ('SampleFileAttributes.txt', file, 'text/plain')
+    }
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+def UploadAttributes_multifiles(orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postAttribute", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    filepath = pathlib.Path(sys.path[1]) // "resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt"
+    filepath2 = pathlib.Path(sys.path[1]) / "resources/ConnectServiceModel/HttpMessageIntegration/SampleFileAttributes.txt"
+
+    file = open(filepath, 'rb')
+    file2 = open(filepath2, 'rb')
+    filesize = os.path.getsize(filepath)
+
+    body = MultipartEncoder(fields={
+        'Content-Disposition': 'form-data',
+        'enos-message': """{'method': 'integration.attribute.post', 'id': 123, 'version': '1.1', 
+                    'params': [{'assetId': 'assetId1', 'attributes': {'Int_Attribute': 1, 'File_Attribute':'local://UploadFileSample.txt'}},
+                               {'assetId': 'assetId2', 'attributes': {'Int_Attribute': 1, 'File_Attribute':'local://SampleFileAttributes.txt'}}
+                    ],
+                    'files': { 
+                        'UploadFileSample.txt': {
+                              'featureId': 'File_Attribute',
+                              'originalFilename': 'UploadFileSample.txt',
+                                'fileExt': '.txt',
+                              'assetId' : 'assetId3' ,
+                              
+                              'fileLength': 658
+                            },
+                        'SampleFileAttributes.txt': {
+                              'featureId': 'File_Attribute',
+                              'originalFilename': 'SampleFileAttributes.txt',
+                                'fileExt': '.txt',
+                              'assetId' : 'assetId4' ,
+                              
+                              'fileLength': 23
+                            }    
+                            }
+                    }""",
+        'enos-file': ('UploadFileSample.txt', file,'text/plain') #still cant upload multiple files
+
+
+    }
+
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
\ No newline at end of file
diff --git a/connection/HTTPMessageIntegration/uploadEvents.py b/connection/HTTPMessageIntegration/uploadEvents.py
new file mode 100644
index 0000000..18297a4
--- /dev/null
+++ b/connection/HTTPMessageIntegration/uploadEvents.py
@@ -0,0 +1,94 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UploadEvents
+ * Author:  Dylan Yeo
+ * Date:    3/2/22
+ * Description: Upload the event data of a device or logic asset, including file-type data
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/upload_integration_events.html
+ * refer to the resources/IoTHub/ConnectServiceModel/HTTPMessageIntegration
+ *
+ * @author dylan.yeo
+ * @create 3/2/22
+ * @since --
+"""
+
+import requests
+from requests.models import PreparedRequest
+from requests_toolbelt.multipart.encoder import MultipartEncoder
+import time
+
+url = "https://iot-http-integration-ppe1.envisioniot.com"
+
+currentTime = str(round(time.time()*1000.0))
+
+def UploadEvents_assetId(orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postEvent", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = MultipartEncoder(fields={
+        "Content-Disposition": "form-data",
+        "enos-message": "{'method': 'integration.event.post', "
+                        "'version': '1.1', " #'id': 123, 
+                        "'params': [{'assetId':" + assetId + ", "
+                                     "'time':" + currentTime + ", "
+                                     "'events': {'tempBelow10': {'temperature': 12}"
+                                     
+                                                "}"
+                                     "}]"
+                        "}"}
+        )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+def UploadEvents_Keys(orgId, token, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postEvent", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = MultipartEncoder(fields={
+        "Content-Disposition": "form-data",
+        "enos-message": "{'method': 'integration.event.post', "
+                        "'version': '1.1', "  # 'id': 123, 
+                        "'params': [{'productKey':" + productKey + ", "
+                                    "'deviceKey':" + deviceKey + ", "
+                                    "'time':" + currentTime + ", "
+                                    "'events': {'tempBelow10': {'temperature': 9}"
+
+                                                "}"
+                                    "}]"
+                        "}"}
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+
+
+
diff --git a/connection/HTTPMessageIntegration/uploadMeasurementPoints.py b/connection/HTTPMessageIntegration/uploadMeasurementPoints.py
new file mode 100644
index 0000000..a63659f
--- /dev/null
+++ b/connection/HTTPMessageIntegration/uploadMeasurementPoints.py
@@ -0,0 +1,121 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UploadMeasurementPoints
+ * Author:  Dylan Yeo
+ * Date:    3/2/22
+ * Description: Upload the measurement point data of a device or logic asset, including file-type data
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/upload_integration_measurepoints.html
+ * refer to the resources/IoTHub/ConnectServiceModel/HTTPMessageIntegration
+ *
+ * @author dylan.yeo
+ * @create 3/2/22
+ * @since --
+"""
+
+import requests
+from requests.models import PreparedRequest
+from requests_toolbelt.multipart.encoder import MultipartEncoder
+import time
+
+url = "https://iot-http-integration-ppe1.envisioniot.com"
+
+currentTime = str(round(time.time()*1000.0))
+
+def UploadMeasurementPoints_assetId(orgId, token, assetId):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postMeasurepoint", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = MultipartEncoder(fields={
+        "Content-Disposition": "form-data",
+        "enos-message": "{'method': 'integration.measurepoint.post', "
+                        "'version': '1.1', " #'id': 123, 
+                        "'params': [{'assetId':" + assetId + ", "
+                                     "'time':" + currentTime + ", "
+                                     "'measurepoints': {'Int_Output':1000"
+                                     
+                                                      "}"
+                                     "}]"
+                        "}"}
+        )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+def UploadMeasurementPoints_Keys(orgId, token, productKey, deviceKey):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postMeasurepoint", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = MultipartEncoder(fields={
+        "Content-Disposition": "form-data",
+        "enos-message": "{'method': 'integration.measurepoint.post', "
+                        "'version': '1.1', "  # 'id': 123, 
+                        "'params': [{'productKey':" + productKey + ", "
+                                    "'deviceKey':" + deviceKey + ", "
+                                    "'time':" + currentTime + ", "
+                                    "'measurepoints': {'Float_MeasurementPoint': 2.2"
+
+                                                     "}"
+                                    "}]"
+                        "}"}
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
+def UploadMeasurementPoints(orgId, token, assetId, measurepoints, value, time):
+    accessURL = url + '/connect-service/v2.1/integration'
+    params = {"action": "postMeasurepoint", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = MultipartEncoder(fields={
+        "Content-Disposition": "form-data",
+        "enos-message": "{'method': 'integration.measurepoint.post', "
+                        "'version': '1.1', "  # 'id': 123, 
+                        "'params': [{'assetId':" + assetId + ", "
+                                    "'time':" + time + ", "
+                                    "'measurepoints': {" + measurepoints + ":" + value + "}"
+                                    "}]"
+                        "}"}
+    )
+    print(body)
+
+    header = {"apim-accesstoken": token,
+              "Content-Type": body.content_type
+              }
+    print(header)
+
+    r = requests.post(req.url, headers=header, data=body)
+    content = r.content
+    response = content.decode("ASCII")
+    print(response)
+
+
diff --git a/connection/Product/connectionProductApp.py b/connection/Product/connectionProductApp.py
new file mode 100644
index 0000000..c7ba644
--- /dev/null
+++ b/connection/Product/connectionProductApp.py
@@ -0,0 +1,118 @@
+# Model Id can be found on EnOS portal under MOdelID (Go to Models)
+Input_modelId = "python_4attri_model"
+
+
+def ConnectionProductGeneral(accessKey, secretKey, orgId, url):
+    # ProductKey can be found on EnOS portal (Go to Device Management/Products under Product Key)
+
+    '''Creating, Getting and Deleting of product'''
+    # ProductKey_Basic = CreateProduct_py.CreateProduct_Basic(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_Basic)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_Basic)
+
+    '''Creating, Getting and Deleting of product with biDirectionalAuth setting'''
+    # ProductKey_biDirectionalAuth = CreateProduct_py.CreateProduct_biDirectionalAuth(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_biDirectionalAuth)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_biDirectionalAuth)
+
+    '''Creating, Getting and Deleting of product with dateFormatCustom setting'''
+    # ProductKey_dataFormatCustom = CreateProduct_py.CreateProduct_dataFormatCustom(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_dataFormatCustom)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_dataFormatCustom)
+
+    '''Creating, Getting and Deleting of product with localeNames'''
+    # ProductKey_localeName = CreateProduct_py.CreateProduct_localeName(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_localeName)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_localeName)
+
+    '''Creating, Getting and Deleting of product with productType as Gateway'''
+    # ProductKey_productType_Gateway = CreateProduct_py.CreateProduct_productType_Gateway(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_productType_Gateway)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_productType_Gateway)
+
+    '''Creating, Getting and Deleting of product with dynamicActivateEnabled setting'''
+    # ProductKey_dynamicActivateEnabled = CreateProduct_py.CreateProduct_dynamicActivateEnabled(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_dynamicActivateEnabled)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_dynamicActivateEnabled)
+
+    '''Creating, Getting and Deleting of product with productTags setting'''
+    # ProductKey_productTags = CreateProduct_py.CreateProduct_productTags(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_productTags)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_productTags)
+
+    '''Creating, Getting and Deleting of product with defaultValidDay setting'''
+    # ProductKey_defaultValidDay = CreateProduct_py.CreateProduct_defaultValidDay(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_defaultValidDay)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_defaultValidDay)
+
+    '''Creating, Getting and Deleting of product with maxValidDay setting'''
+    # ProductKey_maxValidDay = CreateProduct_py.CreateProduct_maxValidDay(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_maxValidDay)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_maxValidDay)
+
+    '''Creating, Getting and Deleting of product with default and max valid Day setting'''
+    # ProductKey_defaultandmaxValidDay = CreateProduct_py.CreateProduct_deafaultandmaxValidDay(accessKey, secretKey, orgId, url, Input_modelId)
+    # GetProduct_py.GetProduct(accessKey, secretKey, orgId, url, ProductKey_defaultandmaxValidDay)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_defaultandmaxValidDay)
+
+    '''Searching of product'''
+    # SearchProduct_py.SearchProduct(accessKey, secretKey, orgId, url)
+    # SearchProduct_py.SearchProduct_Pagination(accessKey, secretKey, orgId, url)
+
+    '''Creating, Updating and Deleting of product (Update parameters individually)'''
+    # ProductKey_UpdateTest = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # UpdateProduct_py.UpdateProduct_productDesc(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_biDirectionalAuth(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_dynamicActivateEnabled(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_productName(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_productTags(accessKey,secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_defaultValidDay(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # UpdateProduct_py.UpdateProduct_maxValidDay(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_UpdateTest)
+
+    '''Creating and Updating of product (Update parameters altogether)'''
+    # ProductKey_UpdateTest2 = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+    # UpdateProduct_py.UpdateProduct(accessKey, secretKey, orgId, url, ProductKey_UpdateTest2)
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_UpdateTest2)
+
+    '''Creating, Searching and Deleting of product'''
+    # ProductKey_Test = CreateProduct_py.CreateProduct_ForTesting(accessKey, secretKey, orgId, url, Input_modelId)
+
+    '''Search Product'''
+    # SearchProduct_py.SearchProduct(accessKey, secretKey, orgId, url)
+    #
+    '''Search Product Projection'''
+    # SearchProduct_py.SearchProduct_Pagination(accessKey, secretKey, orgId, url)
+
+    '''Search Product Expression with modelId'''
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "modelId ='" + Input_modelId + "'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "modelId in ('" + Input_modelId + "')")
+
+    '''Search Product Expression with productKey'''
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productKey ='" + ProductKey_Test + "'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productKey in ('" + ProductKey_Test + "')")
+
+    '''Search Product Expression with productTags'''
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productTags.SearchKey1 = 'SearchValue1'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "exists(productTags.SearchKey1)")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "not exists(productTags.SearchKey1)")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productTags.SearchKey1 = 'SearchValue1' and productTags.SearchKey2 = 'SearchValue2'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productTags.SearchKey1 = 'SearchValue1' and productTags.SearchKey2 = 'SearchValue2' and productTags.SearchKey3 = 'SearchValue3'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productTags.SearchKey1 = 'SearchValue1' or productTags.SearchKey1 = 'SearchValue2'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"exists(productTags.SearchKey1) and exists(productTags.SearchKey3)")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"exists(productTags.SearchKey1) or exists(productTags.SearchKey3)")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"modelId = 'python_4attri_model' and productTags.SearchKey3 = 'SearchValue3'")
+
+    '''Search Product Expression with productName'''
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productName like '<Product_Name_ProductTest>'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productName.default like 'ProductTest'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productName.default like 'roductTe'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productName.en_US like 'ProductTest'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productName.zh_CN like 'ProductTest_简体中文'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productName.zh_CN like '中文'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productName.ja_JP like 'ProductTest_日本語'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productName.ja_JP like '日本'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url,"productName.es_ES like 'ProductTest_Español'")
+    # SearchProduct_py.SearchProduct_expression(accessKey, secretKey, orgId, url, "productName.es_ES like 'Español'")
+
+    # DeleteProduct_py.DeleteProduct(accessKey, secretKey, orgId, url, ProductKey_Test)
diff --git a/connection/Product/createProduct.py b/connection/Product/createProduct.py
new file mode 100644
index 0000000..d1da24e
--- /dev/null
+++ b/connection/Product/createProduct.py
@@ -0,0 +1,297 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: CreateProduct
+ * Author:  Dylan Yeo
+ * Date:    18/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/create_product.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 18/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def CreateProduct_Basic(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_Basic>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "Product_Name_Basic"},
+        "productType": "Device"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_biDirectionalAuth(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_biDirectionalAuth>",
+        "biDirectionalAuth": True,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_biDirectionalAuth>"},
+        "productType": "Device"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_dataFormatCustom(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_dataFormatCustom>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Custom",
+        "productName": {"defaultValue": "<Product_Name_dataFormatCustom>"},
+        "productType": "Device"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_localeName(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_localeName>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_localeName>",
+                        "i18nValue": {"zh_CN": "Product_Name_简体中文", "en_US": "Product_Name_English",
+                                      "ja_JP": "Product_Name_日本語", "es_ES": "Product_Name_Español"}},
+        "productType": "Device"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_productType_Gateway(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_productType_Gateway>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_productType_Gateway>"},
+        "productType": "Gateway"
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_dynamicActivateEnabled(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_dynamicActivateEnabled>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_dynamicActivateEnabled>"},
+        "productType": "Device",
+        "dynamicActivateEnabled": True
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_productTags(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_productTags>",
+        "biDirectionalAuth": False,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_productTags>"},
+        "productType": "Device",
+        "productTags": {"Key1": "Value1", "Key2": "Value2", "Key3": "Value3"}
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_defaultValidDay(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_defaultValidDay>",
+        "biDirectionalAuth": True,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_defaultValidDay>"},
+        "productType": "Device",
+        "defaultValidDay": 10
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_maxValidDay(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_maxValidDay>",
+        "biDirectionalAuth": True,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_maxValidDay>"},
+        "productType": "Device",
+        "maxValidDay": 750
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_deafaultandmaxValidDay(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_defaultandmaxValidDay>",
+        "biDirectionalAuth": True,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_defaultandmaxValidDay>"},
+        "productType": "Device",
+        "defaultValidDay": 100,
+        "maxValidDay": 200
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
+
+
+def CreateProduct_ForTesting(accessKey, secretKey, orgId, url, modelId):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "create", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_ForProductTest>",
+        "biDirectionalAuth": True,
+        "modelId": modelId,
+        "dataFormat": "Json",
+        "productName": {"defaultValue": "<Product_Name_ProductTest>",
+                        "i18nValue": {"zh_CN": "ProductTest_简体中文", "en_US": "ProductTest",
+                                      "ja_JP": "ProductTest_日本語", "es_ES": "ProductTest_Español"}},
+        "productType": "Device",
+        "dynamicActivateEnabled": True,
+        "productTags": {"SearchKey1": "SearchValue1", "SearchKey2": "SearchValue2", "SearchKey3": "SearchValue3"},
+        "defaultValidDay": 365,
+        "maxValidDay": 730
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    ProductKey = response["data"]
+    return ProductKey
diff --git a/connection/Product/deleteProduct.py b/connection/Product/deleteProduct.py
new file mode 100644
index 0000000..0a3641e
--- /dev/null
+++ b/connection/Product/deleteProduct.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: DeleteProduct
+ * Author:  Dylan Yeo
+ * Date:    18/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/delete_product.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 18/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def DeleteProduct(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "delete", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Product/getProduct.py b/connection/Product/getProduct.py
new file mode 100644
index 0000000..28a9f9e
--- /dev/null
+++ b/connection/Product/getProduct.py
@@ -0,0 +1,30 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: GetProduct
+ * Author:  Dylan Yeo
+ * Date:    18/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/get_product.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 18/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def GetProduct(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "get", "orgId" : orgId, "productKey" : productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/connection/Product/searchProduct.py b/connection/Product/searchProduct.py
new file mode 100644
index 0000000..8021dca
--- /dev/null
+++ b/connection/Product/searchProduct.py
@@ -0,0 +1,67 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: SearchProduct
+ * Author:  Dylan Yeo
+ * Date:    18/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/search_product.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 18/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def SearchProduct(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchProduct_Pagination(accessKey, secretKey, orgId, url):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"pagination": {
+        "pageNo": 2,
+        "pageSize": 25,
+    }
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def SearchProduct_expression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "search", "orgId": orgId, }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"expression": expression
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/connection/Product/updateProduct.py b/connection/Product/updateProduct.py
new file mode 100644
index 0000000..c5e3131
--- /dev/null
+++ b/connection/Product/updateProduct.py
@@ -0,0 +1,162 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: UpdateProduct
+ * Author:  Dylan Yeo
+ * Date:    18/1/22
+ * Description:
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/connection-api/en/2.3.0/update_product.html
+ * refer to the resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
+ *
+ * @author dylan.yeo
+ * @create 18/1/22
+ * @since --
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def UpdateProduct_productDesc(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_ForSearchProduct>"
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct_biDirectionalAuth(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "biDirectionalAuth": True
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct_dynamicActivateEnabled(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "dynamicActivateEnabled": True
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct_productName(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productName": {"defaultValue": "<Product_Name_SearchProductTest2>",
+                        "i18nValue": {"zh_CN": "SearchProductTest_简体中文2", "en_US": "SearchProductTest2",
+                                      "ja_JP": "SearchProductTest_日本語2", "es_ES": "SearchProductTest_Español2"}}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct_productTags(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productTags": {"SearchKey100": "SearchValue100"}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def UpdateProduct_defaultValidDay(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "biDirectionalAuth": True,
+        "defaultValidDay": "730"
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct_maxValidDay(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "biDirectionalAuth": True,
+        "maxValidDay": "1460"
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def UpdateProduct(accessKey, secretKey, orgId, url, productKey):
+    accessURL = url + '/connect-service/v2.1/products'
+    params = {"action": "update", "orgId": orgId, "productKey": productKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "productDesc": "<Product_Description_ForSearchProduct10>",
+        "biDirectionalAuth": True,
+        "dynamicActivateEnabled": True,
+        "productName": {"defaultValue": "<Product_Name_SearchProductTest10>",
+                        "i18nValue": {"zh_CN": "SearchProductTest10_简体中文", "en_US": "SearchProductTest10",
+                                      "ja_JP": "SearchProductTest10_日本語", "es_ES": "SearchProductTest10_Español"}},
+        "productTags": {"SearchKey10": "SearchValue10", "SearchKey20": "SearchValue20", "SearchKey30": "SearchValue30"},
+        "defaultValidDay": "3640",
+        "maxValidDay": "3650"
+        
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/dataFederation/cancelDownload.py b/dataFederation/cancelDownload.py
new file mode 100644
index 0000000..db16ed9
--- /dev/null
+++ b/dataFederation/cancelDownload.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: cancelDownload
+ * Author:  Dylan Yeo
+ * Date:    09/03/22
+ * Description: Cancel a file download task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/cancel_download.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def cancelDownload(accessKey, secretKey, orgId, url, channelId, taskId):
+    accessURL = url + "/data-federation/v2.0/channels/read/" + channelId + "/download/" + taskId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, method="DELETE")
+    print(response)
+
+
diff --git a/dataFederation/createDownloadRequest.py b/dataFederation/createDownloadRequest.py
new file mode 100644
index 0000000..066a47c
--- /dev/null
+++ b/dataFederation/createDownloadRequest.py
@@ -0,0 +1,40 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: createDownloadRequest
+ * Author:  Dylan Yeo
+ * Date:    09/03/22
+ * Description: Create a file download task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/download_request.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def createDownloadRequest(accessKey, secretKey, orgId, url, channelId, taskName, sourceName, querySql, filePackageName, files=None, callbackURL=None, selfDefineQueuePara=None):
+    accessURL = url + "/data-federation/v2.0/channels/read/" + channelId + "/download-request"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"taskName":taskName,
+          "sourceName":sourceName,
+          "querySql": querySql,
+          "filePackageName": filePackageName,
+          "files": files,
+          "callbackURL": callbackURL,
+          "selfDefineQueuePara": selfDefineQueuePara
+          }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        taskId= response['data']['taskId']
+    except:
+        taskId= str(None)
+
+    return taskId
diff --git a/dataFederation/dataFederationApp.py b/dataFederation/dataFederationApp.py
new file mode 100644
index 0000000..2cddaf4
--- /dev/null
+++ b/dataFederation/dataFederationApp.py
@@ -0,0 +1,158 @@
+import dataFederation.listChannels as ListChannels_py
+import dataFederation.readData as ReadData_py
+import dataFederation.listJobs as ListJobs_py
+import dataFederation.getJobDetails as GetJobDetails_py
+import dataFederation.writeMessage as WriteMessage_py
+import dataFederation.writeChunkFile as WriteChunkFile_py
+import dataFederation.operateChannel as OperateChannel_py
+import dataFederation.createDownloadRequest as CreateDownloadRequest_py
+import dataFederation.getDownloadStatus as GetDownloadStatus_py
+import dataFederation.cancelDownload as CancelDownload_py
+import base64
+
+
+def dataFederationGeneral(accessKey, secretKey, orgId, url):
+    '''List Channels'''
+    # ListChannels_py.listChannels(accessKey, secretKey, orgId, url)
+    # ListChannels_py.listChannels(accessKey, secretKey, orgId, url, channelType="READ")
+    # ListChannels_py.listChannels(accessKey, secretKey, orgId, url, channelType="WRITE")
+    # ListChannels_py.listChannels(accessKey, secretKey, orgId, url, channelType="DOWNLOAD")
+
+    '''Read Data'''
+    # ReadData_py.readData(accessKey, secretKey, orgId, url,
+    #                      channelId="ch-28b1b7",
+    #                      sqlQuery="show schemas",
+    #                      source="demo",
+    #                      queue=None,
+    #                      itemFormat=None)
+    # ReadData_py.readData(accessKey, secretKey, orgId, url,
+    #                      channelId="ch-28b1b7",
+    #                      sqlQuery="SELECT orgid, value FROM db_demomanager.smart_battery_data where measurepoints = 'temp_before'",
+    #                      source="demo",
+    #                      queue=None,
+    #                      itemFormat=None)
+    #
+    # ReadData_py.readData_source(accessKey, secretKey, orgId, url,
+    #                             channelId="ch-28b1b7",
+    #                             sqlQuery="SELECT orgid, value FROM db_demomanager.smart_battery_data where measurepoints = 'temp_before'",
+    #                             source="demo")
+    #
+    # ReadData_py.readData_queue(accessKey, secretKey, orgId, url,
+    #                            channelId="ch-28b1b7",
+    #                            sqlQuery="SELECT orgid, value FROM db_demomanager.smart_battery_data where measurepoints = 'temp_before'",
+    #                            queue="Hot")
+    #
+    # ReadData_py.readData_itemFormat(accessKey, secretKey, orgId, url,
+    #                                 channelId="ch-28b1b7",
+    #                                 sqlQuery="SELECT orgid, value FROM db_demomanager.smart_battery_data where measurepoints = 'temp_before'",
+    #                                 itemFormat=1)
+
+    '''List Jobs'''
+    # ListJobs_py.listJobs(accessKey, secretKey, orgId, url, channelId="ch-28b1b7")
+    # ListJobs_py.listJobs(accessKey, secretKey, orgId, url, channelId="ch-e98adc")
+    # ListJobs_py.listJobs(accessKey, secretKey, orgId, url, channelId="ch-6b98e9")
+
+    '''Get Job Details'''
+    # GetJobDetails_py.getJobDetails(accessKey, secretKey, orgId, url, channelId="ch-28b1b7", jobId="1de0ddb2-fb3a-24a2-7779-f3236f5d67a1")
+
+    '''Operate Channel'''
+    # OperateChannel_py.operateChannels(accessKey, secretKey, orgId, url, channelId="ch-28b1b7", action="start")
+    # OperateChannel_py.operateChannels(accessKey, secretKey, orgId, url, channelId="ch-28b1b7", action="stop")
+
+    # OperateChannel_py.operateChannels_resource(accessKey, secretKey, orgId, url,
+    #                                            channelId="ch-28b1b7",
+    #                                            action="start",
+    #                                            resourceId="federation_6ahw26",
+    #                                            resourceConfig="2",
+    #                                            ifMultiResourceAnalysis=False)
+
+    '''Write Message'''
+    # data = str({'table': 'employees',
+    #             'lines': [{'emp_no': '90909',
+    #                        'birth_date': '2000-01-01 00:00:00',
+    #                        'first_name': 'Mitsuko',
+    #                        'last_name': 'Yuzuki',
+    #                        'gender': 'F',
+    #                        'hire_date': '2022-01-01 00:00:00'}]
+    #             })
+    # WriteMessage_py.writeMessage(accessKey, secretKey, orgId, url,
+    #                              channelId="ch-16637e",
+    #                              dataSourceName="employees",
+    #                              data=data,
+    #                              sync=True)
+
+    '''Write Chunk File'''
+    # contents = 'Test Message'
+    # size = len(contents.encode('utf-8'))
+    # chunkFileData = (base64.b64encode(bytes(contents, 'utf-8'))).decode()
+    #
+    # WriteChunkFile_py.writeChunkFile(accessKey, secretKey, orgId, url,
+    #                                  channelId="ch-16637e",
+    #                                  dataSourceName="HDFS(EnOS)",
+    #                                  fileName="File_Test",
+    #                                  totalSize=size,
+    #                                  chunkOffset=0,
+    #                                  chunkSize=size,
+    #                                  chunkData=chunkFileData)
+
+    '''Create Download Request'''
+    # taskId = CreateDownloadRequest_py.createDownloadRequest(accessKey, secretKey, orgId, url,
+    #                                                channelId="ch-e98adc",
+    #                                                taskName="CreateDownloadReqest_GetEmployee",
+    #                                                sourceName="hive_enos",
+    #                                                querySql="SELECT * FROM db_demomanager.employee",
+    #                                                filePackageName="FilePackageName_Employee")
+
+    # CreateDownloadRequest_py.createDownloadRequest(accessKey, secretKey, orgId, url,
+    #                                                channelId="ch-e98adc",
+    #                                                taskName="CreateDownloadReqest_GetEmployee_FileConfig",
+    #                                                sourceName="hive_enos",
+    #                                                querySql="SELECT * FROM db_demomanager.employee",
+    #                                                filePackageName="FilePackageName_Employee_FileConfig",
+    #                                                files={"split": True,
+    #                                                       "encoding": "utf-8",
+    #                                                       "delimiter": ",",
+    #                                                       "fileHeader": ["c1", "c2", "c3"],
+    #                                                       "fileRename": {"1": "group1",
+    #                                                                      "2": "group2",
+    #                                                                      "3": "group3"}
+    #                                                       })
+    #
+    # CreateDownloadRequest_py.createDownloadRequest(accessKey, secretKey, orgId, url,
+    #                                                channelId="ch-e98adc",
+    #                                                taskName="CreateDownloadReqest_GetEmployee_callback",
+    #                                                sourceName="hive_enos",
+    #                                                querySql="SELECT * FROM db_demomanager.employee",
+    #                                                filePackageName="FilePackageName_Employee_callbackURL",
+    #                                                callbackURL="http://localhost:8080")
+    #
+    # CreateDownloadRequest_py.createDownloadRequest(accessKey, secretKey, orgId, url,
+    #                                                channelId="ch-e98adc",
+    #                                                taskName="CreateDownloadReqest_GetEmployee_SelfParams",
+    #                                                sourceName="hive_enos",
+    #                                                querySql="SELECT * FROM db_demomanager.employee",
+    #                                                filePackageName="FilePackage_Employee_SelfParams",
+    #                                                selfDefineQueuePara="set mapreduce.map.memory.mb=1024;set mapreduce.reduce.memory.mb=2048")
+
+
+    '''Get Download Status'''
+    # GetDownloadStatus_py.getDownloadStatus(accessKey, secretKey, orgId, url,
+    #                                        channelId="ch-e98adc",
+    #                                        taskId="2603e4901038472a8dcd7faf4d1ec336")
+    # GetDownloadStatus_py.getDownloadStatus(accessKey, secretKey, orgId, url,
+    #                                        channelId="ch-e98adc",
+    #                                        taskId=taskId)
+
+    '''Cancel Download'''
+    # CancelDownload_py.cancelDownload(accessKey, secretKey, orgId, url,
+    #                                        channelId="ch-e98adc",
+    #                                        taskId="2546e27eabc6449b91f1fc3989eba9a0")
+
+
+
+
+
+
+
+
+
diff --git a/dataFederation/getDownloadStatus.py b/dataFederation/getDownloadStatus.py
new file mode 100644
index 0000000..e6cde93
--- /dev/null
+++ b/dataFederation/getDownloadStatus.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getDownloadStatus
+ * Author:  Dylan Yeo
+ * Date:    09/03/22
+ * Description: Get the status of a file download task
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/download_status.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getDownloadStatus(accessKey, secretKey, orgId, url, channelId, taskId):
+    accessURL = url + "/data-federation/v2.0/channels/read/" + channelId + "/download/" + taskId + "/status"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/dataFederation/getJobDetails.py b/dataFederation/getJobDetails.py
new file mode 100644
index 0000000..58a6637
--- /dev/null
+++ b/dataFederation/getJobDetails.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getJobDetails
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Get the detailed information of a data reading job or a data writing job
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/get_job_details.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getJobDetails(accessKey, secretKey, orgId, url, channelId, jobId):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId + '/jobs/' + jobId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/dataFederation/listChannels.py b/dataFederation/listChannels.py
new file mode 100644
index 0000000..1ac7b2f
--- /dev/null
+++ b/dataFederation/listChannels.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listChannels
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Get the list of channels (Read and Write) to which the application is authorized
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/list_channels
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listChannels(accessKey, secretKey, orgId, url, channelType=None):
+    accessURL = url + '/data-federation/v2.0/channels'
+    params = {"orgId": orgId, "channelType": channelType}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/dataFederation/listJobs.py b/dataFederation/listJobs.py
new file mode 100644
index 0000000..2011378
--- /dev/null
+++ b/dataFederation/listJobs.py
@@ -0,0 +1,25 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listJobs
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Get the data reading jobs or data writing jobs of a specified channel
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/list_jobs.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listJobs(accessKey, secretKey, orgId, url, channelId):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId + '/jobs'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/dataFederation/operateChannel.py b/dataFederation/operateChannel.py
new file mode 100644
index 0000000..2122643
--- /dev/null
+++ b/dataFederation/operateChannel.py
@@ -0,0 +1,44 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listChannels
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Start or stop a read channel or write channel
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/operate_channel.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def operateChannels(accessKey, secretKey, orgId, url, channelId, action):
+    accessURL = url + '/data-federation/v2.0/channels/' + channelId
+    params = {"orgId": orgId, "action": action}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def operateChannels_resource(accessKey, secretKey, orgId, url, channelId, action, resourceId="", resourceConfig="",ifMultiResourceAnalysis=None):
+    accessURL = url + '/data-federation/v2.0/channels/' + channelId
+    params = {"orgId": orgId, "action": action}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"resource": {"resourceId":resourceId,
+                       "resourceConfig":resourceConfig,
+                       "ifMultiResourceAnalysis":ifMultiResourceAnalysis}}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/dataFederation/readData.py b/dataFederation/readData.py
new file mode 100644
index 0000000..1e7275c
--- /dev/null
+++ b/dataFederation/readData.py
@@ -0,0 +1,88 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: readData
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Read data by providing SQL query through the specified channel
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/read_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def readData(accessKey, secretKey, orgId, url, channelId, sqlQuery, source, queue, itemFormat):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"sqlQuery": sqlQuery,
+            "source": source,
+            "queue": queue,
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def readData_source(accessKey, secretKey, orgId, url, channelId, sqlQuery, source):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Content-Type": "application/json"}
+
+    body = {"sqlQuery": sqlQuery,
+            "source": source
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, headers=header)
+    print(response)
+
+
+def readData_queue(accessKey, secretKey, orgId, url, channelId, sqlQuery, queue):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Content-Type": "application/json"}
+
+    body = {"sqlQuery": sqlQuery,
+            "source": "demo",
+            "queue": queue,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, headers=header)
+    print(response)
+
+
+def readData_itemFormat(accessKey, secretKey, orgId, url, channelId, sqlQuery, itemFormat):
+    accessURL = url + '/data-federation/v2.0/channels/read/' + channelId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Content-Type": "application/json"}
+
+    body = {"sqlQuery": sqlQuery,
+            "source": "demo",
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, headers=header)
+    print(response)
+
+
diff --git a/dataFederation/writeChunkFile.py b/dataFederation/writeChunkFile.py
new file mode 100644
index 0000000..070c9fd
--- /dev/null
+++ b/dataFederation/writeChunkFile.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: writeChunkFile
+ * Author:  Dylan Yeo
+ * Date:    09/03/22
+ * Description: Write file chunks to data source through a specified channel
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/write_chunk_file.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def writeChunkFile(accessKey, secretKey, orgId, url, channelId, dataSourceName, fileName, totalSize, chunkOffset, chunkSize, chunkData):
+    accessURL = url + '/data-federation/v2.0/channels/write/' + channelId + "/chunk-file"
+    params = {"orgId": orgId, "dataSourceName": dataSourceName}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"fileName": fileName,
+            "totalSize": totalSize,
+            "chunkOffset": chunkOffset,
+            "chunkSize": chunkSize,
+            "chunkData": chunkData
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/dataFederation/writeMessage.py b/dataFederation/writeMessage.py
new file mode 100644
index 0000000..bb33b73
--- /dev/null
+++ b/dataFederation/writeMessage.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: writeMessage
+ * Author:  Dylan Yeo
+ * Date:    08/03/22
+ * Description: Write message to data source through a specified channel
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/write_message.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def writeMessage(accessKey, secretKey, orgId, url, channelId, dataSourceName, data, sync):
+    accessURL = url + '/data-federation/v2.0/channels/write/' + channelId + "/msg"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"dataSourceName": dataSourceName,
+            "data": data,
+            "sync": sync
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/environment_variables.md b/environment_variables.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/environment_variables.md
@@ -0,0 +1 @@
+
diff --git a/iam/getOrganization.py b/iam/getOrganization.py
new file mode 100644
index 0000000..0aaf09c
--- /dev/null
+++ b/iam/getOrganization.py
@@ -0,0 +1,29 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getOrganization
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: Get the organization’s information
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/iam-api/en/2.3.0/get_org.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getOrganization(accessKey, secretKey, orgId, url, sessoinId):
+    accessURL = url + "/enos-iam-service/v2.0/organization/info"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Authorization": "Bearer " + sessoinId}
+    print(header)
+
+    body = {"id": orgId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
\ No newline at end of file
diff --git a/iam/getSessionInformation.py b/iam/getSessionInformation.py
new file mode 100644
index 0000000..0a00d2d
--- /dev/null
+++ b/iam/getSessionInformation.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getSessionInformation
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: Get the login session information after logging in to EnOS
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/iam-api/en/2.3.0/get_session_information.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getSessionInformation(accessKey, secretKey, url, sessoinId):
+    accessURL = url + "/enos-iam-service/v2.0/session/info"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header ={"Authorization": "Bearer " + sessoinId}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header, method="POST")
+    print(response)
\ No newline at end of file
diff --git a/iam/iamApp.py b/iam/iamApp.py
new file mode 100644
index 0000000..c5302b8
--- /dev/null
+++ b/iam/iamApp.py
@@ -0,0 +1,35 @@
+import aep.iam.login as login_py
+import aep.iam.getSessionInformation as getSessionInformation_py
+import aep.iam.getOrganization as getOrganization_py
+import aep.iam.listUserOrganization as listUserOrganization_py
+
+
+def iamGeneral(accessKey, secretKey, orgId, url):
+
+    sessionId = login_py.login(accessKey, secretKey, url)
+
+    getSessionInformation_py.getSessionInformation(accessKey, secretKey, url, sessionId)
+
+    getOrganization_py.getOrganization(accessKey, secretKey, orgId, url, sessionId)
+
+    listUserOrganization_py.listUserOrganization(accessKey, secretKey, url, sessionId)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iam/listUserOrganization.py b/iam/listUserOrganization.py
new file mode 100644
index 0000000..1e29569
--- /dev/null
+++ b/iam/listUserOrganization.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listUserOrganization
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: List the organization to which a user belongs
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/iam-api/en/2.3.0/list_user_organization.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listUserOrganization(accessKey, secretKey, url, sessoinId):
+    accessURL = url + "/enos-iam-service/v2.0/user/organization/list"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header ={"Authorization": "Bearer " + sessoinId}
+    print(header)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, headers=header, method="POST")
+    print(response)
\ No newline at end of file
diff --git a/iam/login.py b/iam/login.py
new file mode 100644
index 0000000..6662cd8
--- /dev/null
+++ b/iam/login.py
@@ -0,0 +1,41 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: login
+ * Author:  Dylan Yeo
+ * Date:    24/03/22
+ * Description: Log in to EnOS
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/iam-api/en/2.3.0/login
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def login(accessKey, secretKey, url):
+    accessURL = url + "/enos-iam-service/v2.0/login"
+    params = {}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"authType": 0,
+            "principal": "",
+            "credentials": "",
+            # optional paraemeters
+            # "linkName": "",
+            # "keyId": "",
+            # "captcha": "",
+            # "clientIp": "",
+            # "expireInterval": ""
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    try:
+        sessionId = response["sessionId"]
+    except:
+        sessionId = ""
+    return sessionId
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..ccd94e4
--- /dev/null
+++ b/main.py
@@ -0,0 +1,111 @@
+# This is a sample Python script.
+
+# Press Shift+F10 to execute it or replace it with your code.
+# Press Double Shift to search everywhere for classes, files, tool windows, actions, and settings.
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+
+# Press the green button in the gutter to run the script.
+if __name__ == '__main__':
+    accessKey = os.getenv('accessKey')
+    secretKey = os.getenv('secretKey')
+    orgId = os.getenv('orgId')
+    url = os.getenv('url')
+
+    # Model Service
+    # https://support.envisioniot.com/docs/model-api/en/2.3.0/overview.html
+    # IoTHub.model.modelApp.modelGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/overview.html
+
+    # Connection Service - Product
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_product.html
+    # IoTHub.connection.Product.connectionProductApp.ConnectionProductGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Device
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_device.html
+    # IoTHub.connection.Device.connectionDeviceApp.ConnectionDeviceGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Device Data
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_device_data.html
+    # IoTHub.connection.DeviceData.connectionDeviceDataApp.ConnectionDeviceDataGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Certificate
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_certificate.html
+    # IoTHub.connection.Certificate.connectionCertificateApp.ConnectionCertificateGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Gateway and Sub-Device
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_gateway_subdevice.html
+    # IoTHub.connection.GatewayAndSubDevices.connectionGatewayAndSubDevicesApp.ConnectionGatewayAndSubDevicesGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - HTTP Message Integration
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_integration.html
+    # IoTHub.connection.HTTPMessageIntegration.connectionHTTPMessageIntegrationApp.ConnectionHTTPMessageIntegrationGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Firmware Management
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_firmware.html
+    # IoTHub.connection.FirmwareManagement.connectionFirmwareManagementApp.ConnectionFirmwareManagementGeneral(accessKey, secretKey, orgId, url)
+
+    # Connection Service - Firmware OTA Upgrade Management
+    # https://support.envisioniot.com/docs/connection-api/en/2.3.0/index_ota.html
+    # IoTHub.connection.FirmwareOTAUpgradeManagement.connectionFirmwareOTAUpgradeManagementApp.ConnectionFirmwareOTAUpgradeManagementGeneral(accessKey, secretKey, orgId, url)
+
+    # Asset Service
+    # https://support.envisioniot.com/docs/asset-api/en/2.3.0/overview.html
+    # IoTHub.asset.assetApp.AssetGeneral(accessKey, secretKey, orgId, url)
+
+    # Asset Tree Service - Asset Tree
+    # https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/index_asset_tree.html
+    # IoTHub.assetTree.assetTree.assetTreeApp.AssetTreeGeneral(accessKey, secretKey, orgId, url)
+
+    # Asset Tree Service - Asset Tree Node
+    # https://support.envisioniot.com/docs/asset-tree-api/en/2.3.0/index_asset_node.html
+    # IoTHub.assetTree.assetTreeNode.assetTreeNodeApp.AssetTreeNodeGeneral(accessKey, secretKey, orgId, url)
+
+    # Alert Service (Severity/Type/Content/Rule/Record)
+    # https://support.envisioniot.com/docs/alert-api/en/2.3.0/overview.html
+    # IoTHub.alert.alertApp.alertGeneral(accessKey, secretKey, orgId, url)
+
+    # Stream Processing Service
+    # https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/overview.html
+    # edp.streamprocessing.streamProcessingApp.streamProcessingGeneral(accessKey, secretKey, orgId, url)
+
+    # TSDB Policy Service
+    # https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/overview.html
+    # edp.tsdbPolicy.tsdbPolicyApp.tsdbPolicyGeneral(accessKey, secretKey, orgId, url)
+
+    # TSDB Data Service
+    # https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/overview.html
+    # edp.tsdbData.tsdbDataApp.tsdbDataGeneral(accessKey, secretKey, orgId, url)
+
+    # Data Federation Service
+    # https://support.envisioniot.com/docs/data-federation-api/en/2.3.0/overview.html
+    # edp.dataFederation.dataFederationApp.dataFederationGeneral(accessKey, secretKey, orgId, url)
+
+    # Batch Processing Service
+    # https://support.envisioniot.com/docs/batch-processing-api/en/2.3.0/overview.html#
+    # edp.batchProcessing.batchProcessingApp.batchProcessingGeneral(accessKey, secretKey, orgId, url)
+
+    # Application Portal Service
+    # https://support.envisioniot.com/docs/app-portal-api/en/2.3.0/overview.html
+    # aep.applicationportal.applicationPortalApp.applicationPortalGeneral(accessKey, secretKey, orgId, url)
+
+    # Business Process Management Service
+    # https://support.envisioniot.com/docs/bpm-api/en/2.3.0/overview.html
+    # aep.businessprocessmanagement.businessProcessManagementApp.businessProcessManagementGeneral(accessKey, secretKey, orgId, url)
+
+    # Notification Service
+    # https://support.envisioniot.com/docs/notification-mgmt-api/en/2.3.0/overview.html
+    # aep.notificationmanagement.notificationManagementApp.notificationManagementGeneral(accessKey, secretKey, orgId, url)
+
+    # IAM Service
+    # https://support.envisioniot.com/docs/iam-api/en/2.3.0/overview.html
+    # aep.iam.iamApp.iamGeneral(accessKey, secretKey, orgId, url)
+
+
+
+
+# See PyCharm help at https://www.jetbrains.com/help/pycharm/
\ No newline at end of file
diff --git a/metric/metricQueryGet.py b/metric/metricQueryGet.py
new file mode 100644
index 0000000..76f6504
--- /dev/null
+++ b/metric/metricQueryGet.py
@@ -0,0 +1,21 @@
+from poseidon import poseidon
+
+access_key = 'accessKey'
+secret_key = 'secretKey'
+apigw = ''
+org_id = ''
+
+
+def _metric_query_get(metrics, mdm_ids, start_time, end_time, extra_fields, format):
+    url = 'https://' + apigw + '/metric-center/v2.2/customer-metric/data?orgId=' + org_id + \
+          '&metrics=' + metrics + \
+          '&mdmIds=' + mdm_ids + \
+          '&start_time=' + start_time + \
+          '&end_time=' + end_time + \
+          '&extra_fields=' + extra_fields + \
+          '&format=' + format
+
+    header = {"Content-Type": "application/x-www-form-urlencoded"}
+
+    req = poseidon.urlopen(access_key, secret_key, url, header, 'GET')
+    print(req)
diff --git a/metric/metricQueryPost.py b/metric/metricQueryPost.py
new file mode 100644
index 0000000..483c698
--- /dev/null
+++ b/metric/metricQueryPost.py
@@ -0,0 +1,25 @@
+from poseidon import poseidon
+
+access_key = 'accessKey'
+secret_key = 'secretKey'
+apigw = ''
+org_id = ''
+
+
+def _metric_query_post(metrics, mdm_ids, start_time, end_time, extra_fields, format):
+    url = 'https://' + apigw + '/metric-center/v2.2/customer-metric/data?orgId=' + org_id
+
+    header = {"Content-Type": "application/x-www-form-urlencoded"}
+
+    body = {
+        "orgId": org_id,
+        "metrics": metrics,
+        "mdmIds": mdm_ids,
+        "startTime": start_time,
+        "endTime": end_time,
+        "extraFields": extra_fields,
+        "format": format
+    }
+
+    req = poseidon.urlopen(access_key, secret_key, url, body, header, 'POST')
+    print(req)
diff --git a/model/getThings.py b/model/getThings.py
new file mode 100644
index 0000000..6610b4f
--- /dev/null
+++ b/model/getThings.py
@@ -0,0 +1,11 @@
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getThings(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "get", "orgId": orgId, 'modelId': 'demo_lift_model', 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/model/modelApp.py b/model/modelApp.py
new file mode 100644
index 0000000..ec24f9c
--- /dev/null
+++ b/model/modelApp.py
@@ -0,0 +1,39 @@
+import model.getThings
+
+
+def modelGeneral(accessKey, secretKey, orgId, url):
+
+    #Get Thing Model
+
+    model.getThings.getThings(accessKey, secretKey, orgId, url)
+
+    #Search Thing Model
+
+    searchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "modelId in ( \"demo_lift_model\" )");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url,"modelId in ( \"EnOS_Solar_Site\", \"ESSHVAC\" )");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "modelId in ( \"EnOS_Solar_Site\" )");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url,"tags.amc_solar_o15952073792221_product = 'tA4ZSAFR' ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "attribute_tags.location = \"singapore\" ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "measurepoint_tags.location = \"floor\" ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "service_tags.function = \"toogle\" ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "event_tags.type = \"temp\" ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "service_tags.function = 'toogle' and event_tags.type = 'temp' ");
+
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "event_tags.type like 'temp' ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "exists(event_tags.type) ");
+    #SearchThingModel.searchmodel_withexpression(accessKey, secretKey, orgId, url, "not exists(event_tags.type) ");
+
+    #SearchThingModel.searchmodel_projection(accessKey, secretKey, orgId, url);
+
+    #SearchThingModel.searchmodel_noprojection(accessKey, secretKey, orgId, url)
+
+    #SearchThingModel.searchmodel_name(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_publicmodels(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_features_pagination(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_tag_pagination(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_attributeTags(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_serviceTags(accessKey, secretKey, orgId, url);
+    #SearchThingModel.searchmodel_eventTags(accessKey, secretKey, orgId, url);
+
+    #Update Thing Model
+    #UpdateThingModel.updateThingModel(accessKey, secretKey, orgId, url)
diff --git a/model/searchThingModel.py b/model/searchThingModel.py
new file mode 100644
index 0000000..4e907fa
--- /dev/null
+++ b/model/searchThingModel.py
@@ -0,0 +1,266 @@
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def searchmodel_withexpression(accessKey, secretKey, orgId, url, expression):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": expression,
+        "projection": [
+            "modelId",
+            "name",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_projection(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "event_tags.type = 'temp' ",
+        "projection": [
+            "modelId",
+            "name",
+            "events",
+            "modelIdPath",
+            "orgId",
+            "desc",
+            "tags",
+            "attributes",
+            "measurepoints",
+            "services",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_pagination(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "event_tags.type = 'temp' ",
+        "projection": [
+            "modelId",
+            "name",
+            "event",
+        ],
+        "pagination": {
+            "pageNo": 1,
+            "pageSize": 20,
+            # Sorter not supported
+            # "sorters": [{
+            # "field": "modelId",
+            # "order": "ASC"
+            # }]
+        }
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_name(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "modelId in ( 'python_4attri_model' )",
+       "projection": [
+            "modelId",
+            "name",
+            "events",
+            "modelIdPath",
+            "orgId",
+            "desc",
+            "tags",
+            "attributes",
+            "measurepoints",
+            "services",
+            #"category",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_publicmodels(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "modelId in ( 'EnOS_Solar_Site' , 'ESSHVAC' )",
+        "projection": [
+            "modelId",
+            "name",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_features_pagination(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "modelId in ( 'EnOS_Solar_Site' )",
+        "projection": [
+            "modelId",
+            "name",
+            "attributes",
+            "measurepoints",
+            "services",
+            "events"
+        ],
+        "pagination": {
+            "pageNo": 1,
+            "pageSize": 10,
+        }
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_tag_pagination(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "tags.amc_solar_o15952073792221_product = 'tA4ZSAFR' ",
+        "projection": [
+            "modelId",
+            "name",
+            "attributes",
+            "measurepoints",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_attributeTags(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "attribute_tags.location = 'singapore' ",
+        "projection": [
+            "modelId",
+            "name",
+            "attributes",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_serviceTags(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "service_tags.function = 'toogle' ",
+        "projection": [
+            "modelId",
+            "name",
+            "services",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_eventTags(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "event_tags.type = 'temp' ",
+        "projection": [
+            "modelId",
+            "name",
+            "events",
+            "modelIdPath",
+            "orgId",
+            "desc",
+            "tags",
+            "attributes",
+            "measurepoints",
+            "services",
+        ]
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def searchmodel_noprojection(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "search", "orgId": orgId, 'scope': 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+        "expression": "event_tags.type = 'temp' ",
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
diff --git a/model/updateThingModel.py b/model/updateThingModel.py
new file mode 100644
index 0000000..3f7df20
--- /dev/null
+++ b/model/updateThingModel.py
@@ -0,0 +1,196 @@
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def updateThingModel(accessKey, secretKey, orgId, url):
+    accessURL = url + '/model-service/v2.1/thing-models'
+    params = {"action": "update", "orgId": orgId, "isPatchUpdate": "false"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    body = {
+        "modelId": "yourModelId",
+        "name": {
+            "defaultValue": "Device Name",
+            "i18nValue": {
+                "zh_CN": "设备名称",
+                "en_US": "Device Name"
+            }
+        },
+        "desc": "jw-1112",
+        "category": "system",
+        "tags": {
+            "group": "1"
+        },
+        "attributes": {
+            "capacity": {
+                "identifier": "capacity",
+                "name": {
+                    "defaultValue": "capacity",
+                    "i18nValue": {
+                        "en_US": "capacity",
+                        "zh_CN": "容量"
+                    }
+                },
+                "desc": "Capacity",
+                "i18nDesc": {
+                    "defaultValue": "Capacity description",
+                    "i18nValue": {
+                        "en_US": "Capacity description",
+                        "zh_CN": "容量描述"
+                    }
+                },
+                "tags": {
+                    "cap": "1"
+                },
+                "stdElementId": "urn:user:modelelement:std:atom-property-int:1.0",
+                "isStdElement": True,
+                "dataType": "INT",
+                "unit": {
+                    "unitId": "G",
+                    "multiplier": "ONE"
+                },
+                "isRequired": True,
+                "defaultValue": 111
+            }
+        },
+        "measurepoints": {
+            "ActiveSC": {
+                "identifier": "ActiveSC",
+                "name": {
+                    "defaultValue": "活动状态字",
+                    "i18nValue": {
+                        "en_US": "ActiveSC_Name"
+                    }
+                },
+                "desc": "ActiveSC desc",
+                "i18nDesc": {
+                    "defaultValue": "ActiveSC desc",
+                    "i18nValue": {
+                        "en_US": "ActiveSC desc",
+                        "zh_CN": "活动状态描述"
+                    }
+                },
+                "tags": {},
+                "isStdElement": False,
+                "dataType": "INT",
+                "hasQuality": False,
+                "signalType": "DI"
+            }
+        },
+        "services": {
+            "speedup": {
+                "identifier": "speedup",
+                "name": {
+                    "defaultValue": "speedup",
+                    "i18nValue": {
+                        "en_US": "speedup"
+                    }
+                },
+                "desc": "Speedup",
+                "i18nDesc": {
+                    "defaultValue": "Speedup",
+                    "i18nValue": {
+                        "en_US": "Speedup",
+                        "zh_CN": "加速"
+                    }
+                },
+                "isStdElement": False,
+                "outputData": [
+                    {
+                        "identifier": "delta",
+                        "name": {
+                            "defaultValue": "delta",
+                            "i18nValue": {
+                                "en_US": "delta"
+                            }
+                        },
+                        "desc": "Delta",
+                        "i18nDesc": {
+                            "defaultValue": "Delta",
+                            "i18nValue": {
+                                "en_US": "Delta",
+                                "zh_CN": "Delta 描述"
+                            }
+                        },
+                        "tags": {},
+                        "isStdElement": False,
+                        "dataType": "INT",
+                    }
+                ],
+                "inputData": [
+                    {
+                        "identifier": "delta",
+                        "name": {
+                            "defaultValue": "delta",
+                            "i18nValue": {
+                                "en_US": "delta"
+                            }
+                        },
+                        "desc": "Delta",
+                        "i18nDesc": {
+                            "defaultValue": "Delta",
+                            "i18nValue": {
+                                "en_US": "Delta",
+                                "zh_CN": "Delta 描述"
+                            }
+                        },
+                        "tags": {},
+                        "isStdElement": False,
+                        "dataType": "INT",
+                        "unit": {
+                            "unitId": "rpm",
+                            "multiplier": "ONE"
+                        },
+                    }
+                ],
+                "callType": "ASYNC"
+            }
+        },
+        "events": {
+            "alert": {
+                "identifier": "alert",
+                "name": {
+                    "defaultValue": "alert",
+                    "i18nValue": {
+                        "en_US": "alert"
+                    }
+                },
+                "desc": "Alert",
+                "i18nDesc": {
+                    "defaultValue": "Alert",
+                    "i18nValue": {
+                        "en_US": "Alert",
+                        "zh_CN": "告警"
+                    }
+                },
+                "isStdElement": False,
+                "outputData": [
+                    {
+                        "identifier": "event1",
+                        "name": {
+                            "defaultValue": "event1",
+                            "i18nValue": {
+                                "en_US": "event1"
+                            }
+                        },
+                        "desc": "Event 1",
+                        "i18nDesc": {
+                            "defaultValue": "Event 1",
+                            "i18nValue": {
+                                "en_US": "Event 1",
+                                "zh_CN": "事件"
+                            }
+                        },
+                        "tags": {},
+                        "isStdElement": False,
+                        "dataType": "INT",
+                    }
+                ],
+                "eventType": "ERROR"
+            }
+        }
+    }
+    print(body)
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/notificationmanagement/notificationManagementApp.py b/notificationmanagement/notificationManagementApp.py
new file mode 100644
index 0000000..2575ebc
--- /dev/null
+++ b/notificationmanagement/notificationManagementApp.py
@@ -0,0 +1,33 @@
+import aep.notificationmanagement.sendTemplateMail as sendTemplateMail_py
+import aep.notificationmanagement.sendTemplateSMS as sendTemplateSMS_py
+import aep.notificationmanagement.searchSendResult as searchSendResult_py
+
+
+def notificationManagementGeneral(accessKey, secretKey, orgId, url):
+
+    # sendTemplateMail_py.sendTemplateMail(accessKey, secretKey, orgId, url)
+
+    # sendTemplateSMS_py.sendTemplateSMS(accessKey, secretKey, orgId, url)
+
+    '''eventId will be returned when running sendTemplateMail/sendTemplateSMS'''
+    searchSendResult_py.searchSendResult(accessKey, secretKey, orgId, url, eventId="evt16481907951941900")
+    searchSendResult_py.searchSendResult(accessKey, secretKey, orgId, url, eventId="evt16481917406771004")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/notificationmanagement/searchSendResult.py b/notificationmanagement/searchSendResult.py
new file mode 100644
index 0000000..af9c0a3
--- /dev/null
+++ b/notificationmanagement/searchSendResult.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: searchSendResult
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: When the above two interfaces are successfully invoked, the user receives the return result containing eventId, which can be used to search for the actual sent result of the message in this interface
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/notification-mgmt-api/en/2.3.0/api_reference/search_send_result.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def searchSendResult(accessKey, secretKey, orgId, url, eventId):
+    accessURL = url + "/notification-center-service/v2.0/search/message"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"eventId": eventId}
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/notificationmanagement/sendTemplateMail.py b/notificationmanagement/sendTemplateMail.py
new file mode 100644
index 0000000..24ae38a
--- /dev/null
+++ b/notificationmanagement/sendTemplateMail.py
@@ -0,0 +1,42 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: sendTemplateMail
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: This interface can send a specific template message through a designated mailbox. There are custom parameters in the template message that can be replaced by the caller. When the request is successfully sent, the message sending request will be put into a message queue, and the user can receive an eventId, through which the actual sending result can be viewed later
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/notification-mgmt-api/en/2.3.0/api_reference/send_template_mail.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+variables= {"USER": "User_Name",
+            "CURRENT_STEP": "Current_Step",
+            "NEXT_STEP": "Next_Step",
+            "URL_LINK": "URL_LINK",
+            "ORGANIZATION": "Org_Name",
+            "SITE": "Site",
+            "REMARK": "Insert_Remarks"}
+
+def sendTemplateMail(accessKey, secretKey, orgId, url):
+    accessURL = url + "/notification-center-service/v2.0/template/email"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"variables": variables,
+            "templateCode": "AMC_MAIL_EN_STEP_NOTIFI",
+            "toAddresses": ["dylan.yeo@envision-digital.com"],
+            "senderCode": "EnOS_Cloud",
+            # optional parameters
+            # "ccAddresses": "",
+            # "priority": "P2",
+            # "extras": ""
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/notificationmanagement/sendTemplateSMS.py b/notificationmanagement/sendTemplateSMS.py
new file mode 100644
index 0000000..d3d62c6
--- /dev/null
+++ b/notificationmanagement/sendTemplateSMS.py
@@ -0,0 +1,39 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: sendTemplateSMS
+ * Author:  Dylan Yeo
+ * Date:    25/03/22
+ * Description: This interface for operators by specified text messages sent a particular template text messages, custom template text of parameters for the caller to replace part of the text operators can increase the message signature, before the body of the request is sent successfully, SMS sending requests will be put into the message queue, users can receive a eventId, follow-up can be sent via eventId view the actual results
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/notification-mgmt-api/en/2.3.0/api_reference/send_template_sms.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+variables = {"SUMMARY": "Summary Content",
+             "START_TIME": "Time",
+             "STATUS": "Status",
+             "DETAIL": "Details"}
+
+def sendTemplateSMS(accessKey, secretKey, orgId, url):
+    accessURL = url + "/notification-center-service/v2.0/template/sms"
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"variables": variables,
+            "templateCode": "AXS_SMS_CN_DAILY_REPORT",
+            "phones": [{"area": "65",
+                        "number": "91603123"}],
+            "tunnelCode": "NOTICE_NEXMO",
+            # optional parameters
+            # "signatureCode": "",
+            # "priority": "P2",
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..b31ca9b
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,6 @@
+enos-poseidon==0.1.6
+python-dotenv==0.19.2
+requests==2.27.1
+requests_toolbelt==0.9.1
+python-dateutil==2.8.2
+python-dotenv==0.19.2
\ No newline at end of file
diff --git a/resources/IoTHub/AssetServiceModel/model_Python_Demo_Model.json b/resources/IoTHub/AssetServiceModel/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/AssetServiceModel/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/AssetTreeService/AssetTree.png b/resources/IoTHub/AssetTreeService/AssetTree.png
new file mode 100644
index 0000000..4d18221
Binary files /dev/null and b/resources/IoTHub/AssetTreeService/AssetTree.png differ
diff --git a/resources/IoTHub/AssetTreeService/model_Python_Demo_Model.json b/resources/IoTHub/AssetTreeService/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/AssetTreeService/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/Certificate/csr (revoked).txt b/resources/IoTHub/ConnectServiceModel/Certificate/csr (revoked).txt
new file mode 100644
index 0000000..b2fb747
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Certificate/csr (revoked).txt	
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC2TCCAcECAQAwezELMAkGA1UEBhMCNjUxEjAQBgNVBAgMCVNpbmdhcG9yZTES
+MBAGA1UEBwwJU2luZ2Fwb3JlMRkwFwYDVQQKDBBFbnZpc2lvbiBEaWdpdGFsMRAw
+DgYDVQQLDAdSJkQgSW9UMRcwFQYDVQQDDA5QeXRob25UZXN0TmFtZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1enukVFByV2ZCpSU6MB4gR1X5vw0zK
+AWBg3vNicJkiioi9HkZVnUyqyy0ZykLKBkepwOMKrWFuP4MuRlCIFZP4sgYq6QGS
+A7cE+dqZyXTdc1WC9ehZ+Il5JCsULaMvoIcRxaSH86wAWxvfwWKrpoTcAg0lFG5I
+Ot/7mb6qMc/Hf3DwQl031myM+7dSzf+EjsPLPiswvIq5KY/QJuMjmkOmR884mao2
+1EhBFeligIP53XE0BdcB4KK6B/XJwq9qE7pI6bbgF3+kddoRhz/b+Fnzrgh3DqDo
+qFmj2RJfMF/x8vJoGbI/usBB25TSuFEyEd0XDHFqBfzfzNj0TY1SLLkCAwEAAaAZ
+MBcGCSqGSIb3DQEJBzEKDAhwQHNzdzByZDANBgkqhkiG9w0BAQsFAAOCAQEAbXN2
+TRm5itnrGT8dxkugR0BYmLJrygzLcsLUYUY4OnQTzuOadVsXM4MKUR9Q8KDXfvo9
+xlSDWsRmVULCj/wn80B9e/V3qvkO+7bBRKyUh0WXlbpXrPmV8/DUUQ4hHDTPrizQ
+5DU19+eA3v90n2PFrGtLK87s0l8vTsd3tPxz7n2hLVkusj+TGfyxygI1x2f39SMa
+0K0dl0OMEchALvHx2Q3vt/uuKm8ygGPXwEv/JhOb2CM1WuAorub+sArGFUuN3Cpq
+05TUn7GiRNKYy4ugnPtolU8He1WwRuoY1GPLrtFC8cqFVHMYDyepXp8pqoRlqlIE
+Ttsd5/YhNhoKY5lRbg==
+-----END CERTIFICATE REQUEST-----
diff --git a/resources/IoTHub/ConnectServiceModel/Certificate/csr.txt b/resources/IoTHub/ConnectServiceModel/Certificate/csr.txt
new file mode 100644
index 0000000..51be3c6
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Certificate/csr.txt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICsTCCAZkCAQAwbDELMAkGA1UEBhMCNjUxEjAQBgNVBAgMCVNpbmdhcG9yZTES
+MBAGA1UEBwwJU2luZ2Fwb3JlMREwDwYDVQQKDAhFbnZpc2lvbjEMMAoGA1UECwwD
+SW9UMRQwEgYDVQQDDAtQeXRob25fVGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALUbylZ6f+9x9cDbdfQoyuneg+W6F70nOIV/rUeEmF45WpYcS56d
+H5+8iYTYrucHBcLcFXnbXQvmjJos6egJaowqg3V4YqPkRvFBWvP7a3K6GW7QemM0
+Ww1MW+5b90Bgz/otpjObV5EYjg4RbjlYUY3Q4EpiXo1QRwdEy34rcX8ZoZDlKaK6
+wHncTHMsD0dVflbaKleggTr4EXDTTBbPVaVQ9UClZx3mZyNkj0mM+NgdnWmLz1ak
+8dXFHqReUlxGegIFjbHBuelF5RHfwBMejYIFYBdilAKdwP03P5MjJh55us0ihl7d
+QSuLjjFfwd8VntkqinN9nhjtALGx1+8+A9kCAwEAAaAAMA0GCSqGSIb3DQEBCwUA
+A4IBAQBTzoVbNC6U3nEnbVPvtI3yVtszMOjbj2RcV+BGuSs/aChyPymC+bSoVfiL
+QXfWnJ5e0bV83mSJPNoDjGJkLziV8uICMippQTDu0OxjQ8Bf8lWNZkS/EZPOMIoY
+pW/Y6OcToc695tlZdmXDrqQcEni1Bpw39K8UHC63pz2dGw5XaWIa4lspobraMEW3
+4SZ/2CAcZWNLf0FSRjaOpsIU71bpDzTSYjA84WoSCihfVAiHAfj/77hamHn/hPrq
+b/yL4Qa2dc1uNoEpaxg42JgRQrP/HZmdkuaXyzdCGXeurSbHZclrHfQJHJcrODFD
+FFYENI0aP8rRina49g5nfvuEoOi3
+-----END CERTIFICATE REQUEST-----
diff --git a/resources/IoTHub/ConnectServiceModel/Certificate/csrGW.txt b/resources/IoTHub/ConnectServiceModel/Certificate/csrGW.txt
new file mode 100644
index 0000000..a0e4d35
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Certificate/csrGW.txt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICsjCCAZoCAQAwbTELMAkGA1UEBhMCNjUxEjAQBgNVBAgMCVNpbmdhcG9yZTES
+MBAGA1UEBwwJU2luZ2Fwb3JlMREwDwYDVQQKDAhFbnZpc2lvbjEMMAoGA1UECwwD
+SW9UMRUwEwYDVQQDDAxQeXRob25UZXN0R1cwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCltILROhcbmbDQiaqat2GGQWWWcCnSBfh7e9IFXnqYPWqbN4+i
+DR1HT7eUcJZRdRynUnSp6Pc62MEErL0GX0CV3OUbPDC8KgFoNWOo6ck8G53gO2lX
+gU+icPXoTwuu0lJuNGTAF9RLIIJRzqEmCStFpo8mYqhL08txYTkK+S6f3UeRdiOz
+w8FcWxadjW6tLjNNZuGUgE1QceBzuW8pK4G5Xyr/qDZfVw8wWRgxjk83T4E+JWzV
+Gx8NBEIVuSTSW7KLXMnkySdox6tzETfuU8p3LC6kj8d6jfsGKISLMsX+pBb6246u
+ERfCdpM4gkeNzKBCzRGFAD4tWz41eBDIzrKzAgMBAAGgADANBgkqhkiG9w0BAQsF
+AAOCAQEAKy9kdHZTds7kOa+BpUOmxCJRXmwema1/ooey6f3KTCMZ+F148ZewGrFg
+C0ZyoBi2yE2ISxW0C0jKRntV6hW+gdM39D0Vp4mFiHRSI2TpG2YlOaenjWpkUzgv
+0TQUMMz/nfeSA5ZMTCODmScKuREf6F5CtmS99YpW6mOj8nCG2BIyNY8KYD2ftJZo
+/Qa7f+9Cjef9E2dH9RqJ8FFALDXZJmOUZbXL+iI78jo3CoznQdw+UWKJz68ZzkW+
+WCz/mx0/mVEcFDJL89pMrVZ104juWHviPzILa9VvN9FeKgjjzr+sFcV1vjqTvwE5
+L5UqFHALiwl1BbDEtvXysy+GbT8QnA==
+-----END CERTIFICATE REQUEST-----
diff --git a/resources/IoTHub/ConnectServiceModel/Certificate/csrtest.txt b/resources/IoTHub/ConnectServiceModel/Certificate/csrtest.txt
new file mode 100644
index 0000000..1b98c37
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Certificate/csrtest.txt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICsDCCAZgCAQAwazELMAkGA1UEBhMCU0cxEjAQBgNVBAgMCVNpbmdhcG9yZTES
+MBAGA1UEBwwJU2luZ2Fwb3JlMREwDwYDVQQKDAhFbnZpc2lvbjEMMAoGA1UECwwD
+SW9UMRMwEQYDVQQDDAo0YXR0cml0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxXTPUIpQJ2rm0796ScxbhQPmnKKoiQw0pX54BI9JVCu+jvdyC3sf
+/+8xKkqmQ8MsAcMvtNLDaLzjoJoaA687aD2pU+UnXggZI3MhIYjCEwIUxTSw7+Jf
+U6GJPc+zKEnC2zINQQTM5ViqYugMyjemL5y/IyjfQV1ae6FuXHfdxVMobLznWY0W
+X6z4y7N5D2W+UZVQPLL/rxNUQhNk9/28MgSYJzlQ7dFHnNOXQIUXBrmA7/1puIXO
+ScT7p98EFhbNerbCVtJ+GWEM4KNwzXROBOyN2z1e1sqcr3R36nCxWriOvfSDhOuo
+A5pYztq8QJXoL+qhW1Fn0a97X6LFXC+HwwIDAQABoAAwDQYJKoZIhvcNAQELBQAD
+ggEBACyzUEjmPJ2rLCu5i5eWasC9Nyfqo3iyo2Op9cdLTA6UxF4UEoIQQ11oqcQa
+kl6YAUowCtKdl3gZlisOCO1+NFT30PQhLSeqd0rBw4FVkpFJ60VY3X22Ruy361Ct
+eSynU4PVGbhBM4K0NY3EAKFiNEjvj777uYR91PehX27xIyQKl1nV+UPgmCwwWHTK
+Iw3Mk4BmqNjtsTOMkHbXyPPkNUg2Lj3HXmCq21NjkEavsBcwLVyEKt0SlmzYC+nZ
+XSL9xq97Z4+pT8yVshe6W1Vsk1N/qv/cCqJ47hS+DN6Moxx0NoghaUX1jI0qzbuM
+D5Q37SMFoOXq/dP3YoVAa5UHzsw=
+-----END CERTIFICATE REQUEST-----
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/Certificate/model_Python_Demo_Model.json b/resources/IoTHub/ConnectServiceModel/Certificate/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Certificate/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json b/resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
new file mode 100644
index 0000000..70981f8
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Device/model_python_4attri_model.json
@@ -0,0 +1,184 @@
+{
+  "thingModelId": "python_4attri_model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "python_4attri_model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Attribute_Name": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Attribute_Name",
+      "name": {
+        "defaultValue": "Attribute_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124397844",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Measurement_Points_Name": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Measurement_Points_Name",
+      "name": {
+        "defaultValue": "Measurement_Points_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124424902",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service_Name": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service_data2",
+          "name": {
+            "defaultValue": "Service_data2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1642128735746",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service_data",
+          "name": {
+            "defaultValue": "Service_data",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1642128735746",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service_Name",
+      "name": {
+        "defaultValue": "Service_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124440580",
+      "priority": 1
+    }
+  },
+  "thingEventMap": {
+    "Event_Name": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event_Name",
+      "name": {
+        "defaultValue": "Event_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124460850",
+      "priority": 1
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": true,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642124304332",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1642128738740",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json b/resources/IoTHub/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/DeviceData/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/FirmwareManagement/SampleFirmwareFile.bin b/resources/IoTHub/ConnectServiceModel/FirmwareManagement/SampleFirmwareFile.bin
new file mode 100644
index 0000000..e69de29
diff --git a/resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement/model_Python_Demo_Model.json b/resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/FirmwareOTAUpgradeManagement/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json b/resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
new file mode 100644
index 0000000..35e5610
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/GatewayAndSubDevice/model_Python_Demo_Model.json
@@ -0,0 +1,929 @@
+{
+  "thingModelId": "Python_Demo_Model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "Python_Demo_Model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Int_Attribute": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_Attribute",
+      "name": {
+        "defaultValue": "Int_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750532533",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    },
+    "Float_Attribute": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_Attribute",
+      "name": {
+        "defaultValue": "Float_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750552849",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFloatAttribute"
+    },
+    "Double_Attribute": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_Attribute",
+      "name": {
+        "defaultValue": "Double_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750571137",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDoubleAttribute"
+    },
+    "Enum_Attribute": {
+      "specsMap": {
+        "EnumValue1": "{\"defaultValue\":\"String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_Attribute",
+      "name": {
+        "defaultValue": "Enum_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750613693",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLEnumAttribute"
+    },
+    "Boolean_Attribute": {
+      "trueDesc": "True",
+      "falseDesc": "False",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Boolean_Attribute",
+      "name": {
+        "defaultValue": "Boolean_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750643989",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLBoolAttribute"
+    },
+    "String_Attribute": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_Attribute",
+      "name": {
+        "defaultValue": "String_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750664153",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTextAttribute"
+    },
+    "TimeStamp_Attribute": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_Attribute",
+      "name": {
+        "defaultValue": "TimeStamp_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750718150",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLTimestampAttribute"
+    },
+    "Date_Attribute": {
+      "defaultValue": "2022-01-01",
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_Attribute",
+      "name": {
+        "defaultValue": "Date_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750734724",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLDateAttribute"
+    },
+    "Struct_Attribute": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_Attribute",
+      "name": {
+        "defaultValue": "Struct_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750751994",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLStructAttribute"
+    },
+    "Array_Attribute": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642750806330",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_Attribute",
+      "name": {
+        "defaultValue": "Array_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750806330",
+      "priority": 10,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLArrayAttribute"
+    },
+    "File_Attribute": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_Attribute",
+      "name": {
+        "defaultValue": "File_Attribute",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750830510",
+      "priority": 11,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    },
+    "File_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "File_MeasurementPoint",
+      "name": {
+        "defaultValue": "File_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751056912",
+      "priority": 12,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLFileAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Int_MeasurementPoint": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Int_MeasurementPoint",
+      "name": {
+        "defaultValue": "Int_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Integer Measurement Point",
+          "zh_CN": "整数测量点",
+          "es_ES": "Punto de medida entero",
+          "ja_JP": "整数メジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750854064",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLIntMeasurepoint"
+    },
+    "Float_MeasurementPoint": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Float_MeasurementPoint",
+      "name": {
+        "defaultValue": "Float_MeasurementPoint",
+        "i18nValue": {
+          "en_US": "Float Measurement Point",
+          "zh_CN": "浮动测量点",
+          "es_ES": "Punto de medida flotante",
+          "ja_JP": "フロートメジャーポイント"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750904151",
+      "priority": 2,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    },
+    "Double_MeasurementPoint": {
+      "minimum": -1.7976931348623157E308,
+      "maximum": 1.7976931348623157E308,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Double_MeasurementPoint",
+      "name": {
+        "defaultValue": "Double_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750917262",
+      "priority": 3,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDoubleMeasurepoint"
+    },
+    "Enum_MeasurementPoint": {
+      "specsMap": {
+        "MP_EnumValue1": "{\"defaultValue\":\"MP_String1\",\"i18nValue\":{}}"
+      },
+      "valueType": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Enum_MeasurementPoint",
+      "name": {
+        "defaultValue": "Enum_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750959927",
+      "priority": 4,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLEnumMeasurepoint"
+    },
+    "String_MeasurementPoint": {
+      "maxLength": 128,
+      "required": false,
+      "accessMode": true,
+      "identifier": "String_MeasurementPoint",
+      "name": {
+        "defaultValue": "String_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750977718",
+      "priority": 5,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTextMeasurepoint"
+    },
+    "TimeStamp_MeasurementPoint": {
+      "minimum": "0",
+      "maximum": "9223372036854775807",
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "TimeStamp_MeasurementPoint",
+      "name": {
+        "defaultValue": "TimeStamp_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642750997916",
+      "priority": 6,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLTimestampMeasurepoint"
+    },
+    "Date_MeasurementPoint": {
+      "required": false,
+      "accessMode": true,
+      "identifier": "Date_MeasurementPoint",
+      "name": {
+        "defaultValue": "Date_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751016887",
+      "priority": 7,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLDateMeasurepoint"
+    },
+    "Struct_MeasurementPoint": {
+      "struct": {},
+      "tslStructType": "COMMON",
+      "allowAdditionalItem": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Struct_MeasurementPoint",
+      "name": {
+        "defaultValue": "Struct_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751032546",
+      "priority": 8,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLStructMeasurepoint"
+    },
+    "Array_MeasurementPoint": {
+      "innerType": {
+        "minimum": -2147483648,
+        "maximum": 2147483647,
+        "exclusiveMinimum": false,
+        "exclusiveMaximum": false,
+        "hasQuality": false,
+        "required": false,
+        "accessMode": true,
+        "name": {
+          "i18nValue": {}
+        },
+        "desc": "",
+        "i18nDesc": {
+          "i18nValue": {}
+        },
+        "tags": {
+          "tagMap": {}
+        },
+        "createTime": "1642751046216",
+        "priority": 0,
+        "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+      },
+      "required": false,
+      "accessMode": true,
+      "identifier": "Array_MeasurementPoint",
+      "name": {
+        "defaultValue": "Array_MeasurementPoint",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751046216",
+      "priority": 9,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLArrayMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service1": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService1",
+          "name": {
+            "defaultValue": "OutputService1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter2",
+          "name": {
+            "defaultValue": "Service1Parameter2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "cm/s",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service1Parameter1",
+          "name": {
+            "defaultValue": "Service1Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099802470",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service1",
+      "name": {
+        "defaultValue": "Service1",
+        "i18nValue": {
+          "en_US": "Service1",
+          "zh_CN": "服务1",
+          "es_ES": "Servicio1",
+          "ja_JP": "サービス1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751178120",
+      "priority": 1
+    },
+    "Service2": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "OutputService2",
+          "name": {
+            "defaultValue": "OutputService2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "MW/m²",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service2Parameter1",
+          "name": {
+            "defaultValue": "Service2Parameter1",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643099833185",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service2",
+      "name": {
+        "defaultValue": "Service2",
+        "i18nValue": {
+          "en_US": "Service2",
+          "zh_CN": "服务2",
+          "es_ES": "Servicio2",
+          "ja_JP": "サービス2"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643085596777",
+      "priority": 2
+    }
+  },
+  "thingEventMap": {
+    "Event1": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event1",
+      "name": {
+        "defaultValue": "Event1",
+        "i18nValue": {
+          "en_US": "Event1",
+          "zh_CN": "活动一",
+          "es_ES": "Evento1",
+          "ja_JP": "イベント1"
+        }
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642751233346",
+      "priority": 1
+    },
+    "tempExceed27": {
+      "outputData": [
+        {
+          "minimum": -1.7976931348623157E308,
+          "maximum": 1.7976931348623157E308,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLDouble"
+        },
+        {
+          "required": false,
+          "accessMode": true,
+          "identifier": "fileParameter",
+          "name": {
+            "defaultValue": "fileParameter",
+            "i18nValue": {}
+          },
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016225145",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFile"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempExceed27",
+      "name": {
+        "defaultValue": "tempExceed27",
+        "i18nValue": {}
+      },
+      "i18nDesc": {
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016225145",
+      "priority": 2
+    },
+    "tempBelow10": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "°C",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "temperature",
+          "name": {
+            "defaultValue": "temperature",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        },
+        {
+          "minimum": -3.4028235E38,
+          "maximum": 3.4028235E38,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "floatParam",
+          "name": {
+            "defaultValue": "floatParam",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1643016277759",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLFloat"
+        }
+      ],
+      "type": "WARN",
+      "required": false,
+      "identifier": "tempBelow10",
+      "name": {
+        "defaultValue": "tempBelow10",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1643016277759",
+      "priority": 3
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": false,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642750345311",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1643177908273",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileAttributes.txt b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileAttributes.txt
new file mode 100644
index 0000000..72f3da0
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileAttributes.txt
@@ -0,0 +1 @@
+File: Upload Attributes
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileEvents.txt b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileEvents.txt
new file mode 100644
index 0000000..9704d77
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileEvents.txt
@@ -0,0 +1 @@
+File: Upload Events
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileMeasurementPoints.txt b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileMeasurementPoints.txt
new file mode 100644
index 0000000..167f41b
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/SampleFileMeasurementPoints.txt
@@ -0,0 +1 @@
+File: Upload Measurement Points
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt
new file mode 100644
index 0000000..66284f7
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/HttpMessageIntegration/UploadFileSample.txt
@@ -0,0 +1,6 @@
+Envision Digital is committed to becoming the world’s leading net zero technology partner for enterprises, governments,
+and cities alike. Its world-class AIoT technology helps governments and companies across the world accelerate progress
+toward a net zero future and improve their citizens’ quality of life. Having established itself as a leading solutions
+provider for intelligent renewable energy generation, consumption efficiency and smart and flexible storage,
+Envision Digital has extended its capabilities beyond energy to enable and optimise applications
+– notably in smart renewables, city infrastructure and carbon management solutions.
\ No newline at end of file
diff --git a/resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json b/resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
new file mode 100644
index 0000000..70981f8
--- /dev/null
+++ b/resources/IoTHub/ConnectServiceModel/Product/model_python_4attri_model.json
@@ -0,0 +1,184 @@
+{
+  "thingModelId": "python_4attri_model",
+  "ou": "o15520323695671",
+  "thingModelName": {
+    "defaultValue": "python_4attri_model",
+    "i18nValue": {}
+  },
+  "thingModelDesc": "",
+  "thingModelCatagory": "",
+  "thingAttributeMap": {
+    "Attribute_Name": {
+      "minimum": -2147483648,
+      "maximum": 2147483647,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Attribute_Name",
+      "name": {
+        "defaultValue": "Attribute_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124397844",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.attribute.TSLIntAttribute"
+    }
+  },
+  "thingMeasurepointMap": {
+    "Measurement_Points_Name": {
+      "minimum": -3.4028235E38,
+      "maximum": 3.4028235E38,
+      "exclusiveMinimum": false,
+      "exclusiveMaximum": false,
+      "signalType": "UNKNOWN",
+      "hasQuality": false,
+      "required": false,
+      "accessMode": true,
+      "identifier": "Measurement_Points_Name",
+      "name": {
+        "defaultValue": "Measurement_Points_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124424902",
+      "priority": 1,
+      "$class": "com.envisioniot.enos.model_service.share.data.tsl.measurepoint.TSLFloatMeasurepoint"
+    }
+  },
+  "thingServiceMap": {
+    "Service_Name": {
+      "outputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service_data2",
+          "name": {
+            "defaultValue": "Service_data2",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1642128735746",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "inputData": [
+        {
+          "minimum": -2147483648,
+          "maximum": 2147483647,
+          "exclusiveMinimum": false,
+          "exclusiveMaximum": false,
+          "unit": {
+            "unitId": "A/W",
+            "multiplier": "ONE"
+          },
+          "hasQuality": false,
+          "required": false,
+          "accessMode": true,
+          "identifier": "Service_data",
+          "name": {
+            "defaultValue": "Service_data",
+            "i18nValue": {}
+          },
+          "desc": "",
+          "i18nDesc": {
+            "i18nValue": {}
+          },
+          "tags": {
+            "tagMap": {}
+          },
+          "createTime": "1642128735746",
+          "priority": 0,
+          "$class": "com.envisioniot.enos.model_service.share.data.tsl.datapoint.TSLInt"
+        }
+      ],
+      "required": false,
+      "callType": "ASYNC",
+      "identifier": "Service_Name",
+      "name": {
+        "defaultValue": "Service_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124440580",
+      "priority": 1
+    }
+  },
+  "thingEventMap": {
+    "Event_Name": {
+      "outputData": [],
+      "type": "INFO",
+      "required": false,
+      "identifier": "Event_Name",
+      "name": {
+        "defaultValue": "Event_Name",
+        "i18nValue": {}
+      },
+      "desc": "",
+      "i18nDesc": {
+        "defaultValue": "",
+        "i18nValue": {}
+      },
+      "tags": {
+        "tagMap": {}
+      },
+      "createTime": "1642124460850",
+      "priority": 1
+    }
+  },
+  "tag": {
+    "tagMap": {}
+  },
+  "allowAdditionalAttribute": false,
+  "allowAdditionalMeasurepoint": true,
+  "inheritedAttributeIds": [],
+  "inheritedMeasurepointIds": [],
+  "inheritedServiceIds": [],
+  "inheritedEventIds": [],
+  "extraInfo": {
+    "createBy": "dylan.yeo",
+    "createTime": "1642124304332",
+    "updateBy": "dylan.yeo",
+    "updateTime": "1642128738740",
+    "ns": "o15520323695671"
+  }
+}
\ No newline at end of file
diff --git a/streamprocessing/deleteStageState.py b/streamprocessing/deleteStageState.py
new file mode 100644
index 0000000..498773c
--- /dev/null
+++ b/streamprocessing/deleteStageState.py
@@ -0,0 +1,34 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteStageState
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Delete the intermediate state data of a specified operator (stage) in a stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/delete_stage_state.html
+
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def deleteStageState(accessKey, secretKey, orgId, url, pipelineId, stageInstanceName, assetIds, pointIds):
+    accessURL = url + '/streaming/v2.0/stage-state'
+    params = {"action": "delete", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pipelineId": pipelineId,
+          "stageInstanceName": stageInstanceName,
+          "assetIds": assetIds,
+          "pointIds": pointIds
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/streamprocessing/getPipelineDetails.py b/streamprocessing/getPipelineDetails.py
new file mode 100644
index 0000000..8b28aeb
--- /dev/null
+++ b/streamprocessing/getPipelineDetails.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getPipelineDetails
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Get the details of a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/get_pipeline_details.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getPipelineDetails(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"orgId": orgId, "ifReleased": False}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/streamprocessing/getPipelineOffsetAndLag.py b/streamprocessing/getPipelineOffsetAndLag.py
new file mode 100644
index 0000000..5672bf6
--- /dev/null
+++ b/streamprocessing/getPipelineOffsetAndLag.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getPipelineOffsetAndLag
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Get the Kafka Offset and Lag of a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/get_pipeline_offset_lag.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getPipelineOffsetAndLag(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId + '/offset-lag'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
diff --git a/streamprocessing/getStageState.py b/streamprocessing/getStageState.py
new file mode 100644
index 0000000..ddfb7a7
--- /dev/null
+++ b/streamprocessing/getStageState.py
@@ -0,0 +1,33 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getStageState
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Get the intermediate state data of a specified operator (stage) in a stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/get_stage_state.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getStageState(accessKey, secretKey, orgId, url, pipelineId, stageInstanceName, assetIds, pointIds):
+    accessURL = url + '/streaming/v2.0/stage-state'
+    params = {"action": "get", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"pipelineId": pipelineId,
+          "stageInstanceName": stageInstanceName,
+          "assetIds": assetIds,
+          "pointIds": pointIds
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/streamprocessing/listPipelines.py b/streamprocessing/listPipelines.py
new file mode 100644
index 0000000..72f7fd1
--- /dev/null
+++ b/streamprocessing/listPipelines.py
@@ -0,0 +1,39 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: listPipeline
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Get the list of stream processing pipelines in the organization by pages
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/list_pipelines.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def listPipeline(accessKey, secretKey, orgId, url,):
+    accessURL = url + '/streaming/v2.0/streaming/pipelines'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def listPipeline_optionalParameters(accessKey, secretKey, orgId, url):
+    accessURL = url + '/streaming/v2.0/streaming/pipelines'
+    params = {"orgId": orgId,
+              "pageSize": "5",
+              "pageNo": "1",
+              "isSystem": False,
+              "ifReleased": True}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/streamprocessing/operatepipeline/pausePipeline.py b/streamprocessing/operatepipeline/pausePipeline.py
new file mode 100644
index 0000000..2539d7c
--- /dev/null
+++ b/streamprocessing/operatepipeline/pausePipeline.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: pausePipeline
+ * Author:  Dylan Yeo
+ * Date:    24/02/22
+ * Description: Pause a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/pause_pipeline.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def pausePipeline(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"action": "pause", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {
+    }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/streamprocessing/operatepipeline/releasePipeline.py b/streamprocessing/operatepipeline/releasePipeline.py
new file mode 100644
index 0000000..4a4f895
--- /dev/null
+++ b/streamprocessing/operatepipeline/releasePipeline.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: releasePipeline
+ * Author:  Dylan Yeo
+ * Date:    24/02/22
+ * Description: Release a specific stream processing pipeline online
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/release_pipeline.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def releasePipeline(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"action": "release", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/streamprocessing/operatepipeline/savePipeline.py b/streamprocessing/operatepipeline/savePipeline.py
new file mode 100644
index 0000000..d0a66eb
--- /dev/null
+++ b/streamprocessing/operatepipeline/savePipeline.py
@@ -0,0 +1,79 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: savePipeline
+ * Author:  Dylan Yeo
+ * Date:    24/02/22
+ * Description: Save the configuration of a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/save_pipeline.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def savePipeline(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"action": "save", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"version": "0.1.0",
+          "name": "Python_PipelineTest2",
+          "templateType": "5",
+          "templateName": "Time Window Aggregation",
+          "messageChannel": "0",
+          "pipelineJson": {
+              "piDetail": True,
+              "points": [{
+                  "minValue": "0",
+                  "outputPointId": "Python_Demo_Model :: Int_MeasurementPoint",
+                  "exceptionPolicy": "1",
+                  "maxValue": "",
+                  "minValueInclude": True,
+                  "piDetailWindowSize": "FIVE_MINUTE",
+                  "maxValueInclude": False,
+                  "inputPointId": "Python_Demo_Model :: Int_MeasurementPoint",
+                  "detailOutputPointId": "Python_Demo_Model :: Int_MeasurementPoint"
+              }]
+          }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def createPipeline(accessKey, secretKey, orgId, url):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + "null"
+    params = {"action": "save", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"version": "0.1.0",
+          "name": "Python_PipelineTest2",
+          "templateType": "5",
+          "templateName": "Time Window Aggregation",
+          "messageChannel": "0",
+          "pipelineJson": {
+              "piDetail": True,
+              "points": [{
+                  "minValue": "0",
+                  "outputPointId": "Python_Demo_Model :: Int_MeasurementPoint",
+                  "exceptionPolicy": "1",
+                  "maxValue": "",
+                  "minValueInclude": True,
+                  "piDetailWindowSize": "FIVE_MINUTE",
+                  "maxValueInclude": False,
+                  "inputPointId": "Python_Demo_Model :: Int_MeasurementPoint",
+                  "detailOutputPointId": "Python_Demo_Model :: Int_MeasurementPoint"
+              }]
+          }
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/streamprocessing/operatepipeline/startPipeline.py b/streamprocessing/operatepipeline/startPipeline.py
new file mode 100644
index 0000000..c90a9de
--- /dev/null
+++ b/streamprocessing/operatepipeline/startPipeline.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: startPipeline
+ * Author:  Dylan Yeo
+ * Date:    24/02/22
+ * Description: Start a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/start_pipeline.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def startPipeline(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"action": "start", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={"executionMode": "0",
+          "kafkaRate": "500",
+          "resourceConfig": {"server": "0.5"}
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/streamprocessing/operatepipeline/stopPipeline.py b/streamprocessing/operatepipeline/stopPipeline.py
new file mode 100644
index 0000000..c122561
--- /dev/null
+++ b/streamprocessing/operatepipeline/stopPipeline.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: stopPipeline
+ * Author:  Dylan Yeo
+ * Date:    24/02/22
+ * Description: Stop a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/stop_pipeline.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def stopPipeline(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId
+    params = {"action": "stop", "orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={
+        }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+
diff --git a/streamprocessing/resetPipelineOffset.py b/streamprocessing/resetPipelineOffset.py
new file mode 100644
index 0000000..0b5c764
--- /dev/null
+++ b/streamprocessing/resetPipelineOffset.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: resetPipelineOffset
+ * Author:  Dylan Yeo
+ * Date:    25/02/22
+ * Description: Reset the Kafka Offset of a specific stream processing pipeline
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/reset_pipeline_offset.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def resetPipelineOffset(accessKey, secretKey, orgId, url, pipelineId):
+    accessURL = url + '/streaming/v2.0/streaming/pipeline/' + pipelineId + '/offset'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
diff --git a/streamprocessing/streamProcessingApp.py b/streamprocessing/streamProcessingApp.py
new file mode 100644
index 0000000..5b3e704
--- /dev/null
+++ b/streamprocessing/streamProcessingApp.py
@@ -0,0 +1,61 @@
+import streamprocessing.getStageState as GetStageState_py
+import streamprocessing.deleteStageState as DeleteStageState_py
+import streamprocessing.listPipelines as ListPipelines_py
+import streamprocessing.getPipelineDetails as GetPipelineDetails_py
+import streamprocessing.getPipelineOffsetAndLag as GetPipelineOffsetAndLag
+import streamprocessing.resetPipelineOffset as ResetPipelineOffset
+import streamprocessing.operatepipeline.startPipeline as StartPipeline_py
+import streamprocessing.operatepipeline.pausePipeline as PausePipeline_py
+import streamprocessing.operatepipeline.stopPipeline as StopPipeline_py
+import streamprocessing.operatepipeline.savePipeline as SavePipeline_py
+import streamprocessing.operatepipeline.releasePipeline as ReleasePipeline_py
+
+pipeline_Id= "1010eac9-7770-4769-8011-2b02d761d5e0"
+
+def streamProcessingGeneral(accessKey, secretKey, orgId, url):
+    # GetPipelineDetails_py.getPipelineDetails(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # ListPipelines_py.listPipeline(accessKey, secretKey, orgId, url)
+    # ListPipelines_py.listPipeline_optionalParameters(accessKey, secretKey, orgId, url)
+
+    # GetStageState_py.getStageState(accessKey, secretKey, orgId, url,
+    #                                pipelineId= "ade78e6a-0df6-4312-9afd-574959278286",
+    #                                stageInstanceName= "LatePointTagger_01",
+    #                                assetIds= "ChahG3d9",
+    #                                pointIds= "temp")
+
+    # DeleteStageState_py.deleteStageState(accessKey, secretKey, orgId, url,
+    #                                pipelineId="1010eac9-7770-4769-8011-2b02d761d5e0",
+    #                                stageInstanceName=  "LatePointTagger_01",
+    #                                assetIds="ChahG3d9",
+    #                                pointIds="temp")
+
+    # GetPipelineOffsetAndLag.getPipelineOffsetAndLag(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # ResetPipelineOffset.resetPipelineOffset(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+
+    '''
+    Operating Pipeline
+    https://support.envisioniot.com/docs/stream-processing-api/en/2.3.0/operate_pipeline.html
+    '''
+    # StartPipeline_py.startPipeline(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # PausePipeline_py.pausePipeline(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # StopPipeline_py.stopPipeline(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # SavePipeline_py.savePipeline(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # ReleasePipeline_py.releasePipeline(accessKey, secretKey, orgId, url, pipelineId= pipeline_Id)
+
+    # SavePipeline_py.createPipeline(accessKey, secretKey, orgId, url)
+
+
+
+
+
+
+
+
+
diff --git a/tsdbData/tsdbDataApp.py b/tsdbData/tsdbDataApp.py
new file mode 100644
index 0000000..acb15d5
--- /dev/null
+++ b/tsdbData/tsdbDataApp.py
@@ -0,0 +1,841 @@
+import time
+from datetime import datetime
+
+start_time = "2022-03-01 00:00:00"
+end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+currentTime = str(round(time.time() * 1000.0))
+
+
+def tsdbDataGeneral(accessKey, secretKey, orgId, url):
+    '''Upload Measurement Points for testing'''
+    # Token = GetToken_py.GetToken(accessKey, secretKey, url)
+    #
+    # number = random.randrange(1, 99999)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "AI_Int_Power", str(number), currentTime)
+    #
+    # number = round(random.uniform(1.0, 99999.99), 2)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "AI_Double_Power", str(number), currentTime)
+    #
+    # number = round(random.uniform(1.0, 99999.99),2)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "PI_Double_Power", str(number), currentTime)
+    #
+    # number = random.randrange(1, 99999)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "DI_Int_Power", str(number), currentTime)
+    #
+    # number = round(random.uniform(1.0, 99999.99),2)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "Generic_Double_Power", str(number), currentTime)
+    #
+    # number = random.randrange(1, 99999)
+    # UploadMeasurementPoints_py.UploadMeasurementPoints(orgId, Token, "G5M8Ojhd", "Generic_Int_Power", str(number), currentTime)
+    '''
+    V2.0
+    https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/overview.html
+    '''
+
+    '''Filter Asset Latest Data'''
+    '''Operator: eq (Equals to)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="G5M8Ojhd,Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter=999)
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter=999)
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Double_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter="999.99")
+
+    '''Operator: nq (Not equals to)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="nq",
+    #                                                          valueFilter=1)
+
+    '''Operator: gt (Greater than)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="gt",
+    #                                                          valueFilter=100)
+
+    '''Operator: lt (Less than)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="lt",
+    #                                                          valueFilter=1000)
+
+    '''Operator: ge (Greater than or equals to)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="ge",
+    #                                                          valueFilter=999)
+
+    '''Operator: le (Less than or equals to)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="le",
+    #                                                          valueFilter=999)
+
+    '''Operator: Between (Interval of 2 values)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="between",
+    #                                                          valueFilter="1,1000")
+
+    '''Operator: In (One of the multiple values stated)'''
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          measurepoint="Generic_Int_Power",
+    #                                                          operator="in",
+    #                                                          valueFilter="1,500,999")
+
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0_timeWindow(accessKey, secretKey, orgId, url,
+    #                                                                     timeWindow=120)
+
+    # FilterAssetLatestData_V2_0_py.filterAssetLatestData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset AI Data With Aggregation Logic'''
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds="G5M8Ojhd",
+    #                                                                                    measurepointsWithLogic="count(AI_Double_Power)",
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time,
+    #                                                                                    modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_AI_WithLogic = "count(Int_Output),avg(AI_Int_Power),sum(AI_Double_Power),max(AI_Int_Power),min(AI_Int_Power)"
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds="G5M8Ojhd",
+    #                                                                                    measurepointsWithLogic=multiplePointIds_AI_WithLogic,
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time)
+    #
+    # multipleAssetIds_AI_WithLogic="G5M8Ojhd,Re2qPON3"
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds=multipleAssetIds_AI_WithLogic,
+    #                                                                                    measurepointsWithLogic="count(AI_Double_Power)",
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time)
+    #
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0_interval(accessKey, secretKey, orgId, url,
+    #                                                                                             measurepointsWithLogic="avg(Int_Output),count(AI_Int_Power)",
+    #                                                                                             interval=10)
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0_interval(accessKey, secretKey,
+    #                                                                                             orgId, url,
+    #                                                                                             measurepointsWithLogic="Int_Output,AI_Int_Power",
+    #                                                                                             interval=0)
+    #
+    # GetAssetAIDataWithAggregationLogic_V2_0_py.getAssetAIDataWithAggregationLogic_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset AI Raw Data'''
+    # GetAssetAIRawData_V2_0_py.getAssetAIRawData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                  assetIds="G5M8Ojhd",
+    #                                                  measurepoints="AI_Int_Power",
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time,
+    #                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_AI = "Int_Output,AI_Int_Power,AI_Double_Power"
+    # GetAssetAIRawData_V2_0_py.getAssetAIRawData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                  assetIds="G5M8Ojhd",
+    #                                                  measurepoints=multiplePointIds_AI,
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time)
+    #
+    # multipleAssetIds_AI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetAIRawData_V2_0_py.getAssetAIRawData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                  assetIds=multipleAssetIds_AI,
+    #                                                  measurepoints="AI_Int_Power",
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time)
+    #
+    # GetAssetAIRawData_V2_0_py.getAssetAIRawData_V2_0_withQuality(accessKey, secretKey, orgId, url,
+    #                                                              withQuality=True)
+    #
+    # GetAssetAIRawData_V2_0_py.getAssetAIRawData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset Current Day Electric Power'''
+    # GetAssetCurrentDayElectricPower_V2_0_py.getAssetCurrentDayElectricPower_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds="G5M8Ojhd",
+    #                                                                              measurepoints="PI_Double_Power",
+    #                                                                              modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_PI = "PI_Double_Power,outputPower,power2"
+    # GetAssetCurrentDayElectricPower_V2_0_py.getAssetCurrentDayElectricPower_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds="G5M8Ojhd",
+    #                                                                              measurepoints=multiplePointIds_PI)
+    #
+    # multipleAssetIds_PI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetCurrentDayElectricPower_V2_0_py.getAssetCurrentDayElectricPower_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds=multipleAssetIds_PI,
+    #                                                                              measurepoints="PI_Double_Power")
+    #
+    # GetAssetCurrentDayElectricPower_V2_0_py.getAssetCurrentDayElectricPower_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset DI Data'''
+    # GetAssetDIData_V2_0_py.getAssetDIData_V2_0(accessKey, secretKey, orgId, url,
+    #                                            assetIds="G5M8Ojhd",
+    #                                            measurepoints="DI_Int_Power",
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    # 
+    # multiplePointIds_DI = "DI_Int_Power,DIPower2"
+    # GetAssetDIData_V2_0_py.getAssetDIData_V2_0(accessKey, secretKey, orgId, url,
+    #                                            assetIds="G5M8Ojhd",
+    #                                            measurepoints=multiplePointIds_DI,
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    # 
+    # multipleAssetIds_DI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetDIData_V2_0_py.getAssetDIData_V2_0(accessKey, secretKey, orgId, url,
+    #                                            assetIds=multipleAssetIds_DI,
+    #                                            measurepoints="DI_Int_Power",
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    # 
+    # GetAssetDIData_V2_0_py.getAssetDIData_V2_0_autoInterpolate(accessKey, secretKey, orgId, url,
+    #                                                            autoInterpolate=True)
+    # 
+    # GetAssetDIData_V2_0_py.getAssetDIData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset DI Data Duration'''
+    # GetAssetDIDataDuration_V2_0_py.getAssetDIDataDuration_V2_0(accessKey, secretKey, orgId, url,
+    #                                                            assetIds="G5M8Ojhd",
+    #                                                            measurepoints="DI_Int_Power",
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_DI_Duration = "DI_Int_Power,DIPower2"
+    # GetAssetDIDataDuration_V2_0_py.getAssetDIDataDuration_V2_0(accessKey, secretKey, orgId, url,
+    #                                                            assetIds="G5M8Ojhd",
+    #                                                            measurepoints=multiplePointIds_DI_Duration,
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_DI_Duration = "G5M8Ojhd,Re2qPON3"
+    # GetAssetDIDataDuration_V2_0_py.getAssetDIDataDuration_V2_0(accessKey, secretKey, orgId, url,
+    #                                                            assetIds=multipleAssetIds_DI_Duration,
+    #                                                            measurepoints="DI_Int_Power",
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # GetAssetDIDataDuration_V2_0_py.getAssetDIDataDuration_V2_0_status(accessKey, secretKey, orgId, url,
+    #                                                                   status="9341")
+    #
+    # GetAssetDIDataDuration_V2_0_py.getAssetDIDataDuration_V2_0_Unknown(accessKey, secretKey, orgId, url,
+    #                                                                   unknown= False)
+
+    '''Get Asset Electric Power Data'''
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  measurepointsWithLogic="sum(PI_Double_Power)",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIdsWithLogic_PI = "sum(PI_Double_Power),count(outputPower),avg(power2)"
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  measurepointsWithLogic=multiplePointIdsWithLogic_PI,
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multipleAssetIdsWithLogic_PI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds=multipleAssetIdsWithLogic_PI,
+    #                                                                  measurepointsWithLogic="sum(PI_Double_Power)",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0_interval(accessKey, secretKey, orgId, url,
+    #                                                                           measurepointsWithLogic="sum(PI_Double_Power),count(outputPower),avg(power2)",
+    #                                                                           interval=10)
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0_interval(accessKey, secretKey, orgId, url,
+    #                                                                           measurepointsWithLogic="PI_Double_Power,outputPower,power2",
+    #                                                                           interval=0)
+    #
+    # GetAssetElectricPowerData_V2_0_py.getAssetElectricPowerData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset Generic Data'''
+    # GetAssetGenericData_V2_0_py.getAssetGenericData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                      assetIds="G5M8Ojhd",
+    #                                                      measurepoints="Generic_Int_Power",
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_Generic = "Generic_Int_Power,Generic_Double_Power"
+    # GetAssetGenericData_V2_0_py.getAssetGenericData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                      assetIds="G5M8Ojhd",
+    #                                                      measurepoints=multiplePointIds_Generic,
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_Generic = "G5M8Ojhd,Re2qPON3"
+    # GetAssetGenericData_V2_0_py.getAssetGenericData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                      assetIds=multipleAssetIds_Generic,
+    #                                                      measurepoints="Generic_Int_Power",
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    #
+    # GetAssetGenericData_V2_0_py.getAssetGenericData_V2_0_withQuality(accessKey, secretKey, orgId, url,
+    #                                                                  withQuality=True)
+    #
+    # GetAssetGenericData_V2_0_py.getAssetGenericData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset Latest Data'''
+    # GetAssetLatestData_V2_0_py.getAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                    assetIds="G5M8Ojhd",
+    #                                                    measurepoints="Generic_Int_Power",
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_Latest = "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power"
+    # GetAssetLatestData_V2_0_py.getAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                    assetIds="G5M8Ojhd",
+    #                                                    measurepoints=multiplePointIds_Latest,
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_Latest = "G5M8Ojhd,Re2qPON3"
+    # GetAssetLatestData_V2_0_py.getAssetLatestData_V2_0(accessKey, secretKey, orgId, url,
+    #                                                    assetIds=multipleAssetIds_Latest,
+    #                                                    measurepoints="Generic_Int_Power",
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # GetAssetLatestData_V2_0_py.getAssetLatestData_V2_0_withLocalTime(accessKey, secretKey, orgId, url,
+    #                                                                  LocalTime=True)
+    #
+    # GetAssetLatestData_V2_0_py.getAssetLatestData_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''Get Asset Raw Data by Time Range'''
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  measurepoints="Generic_Int_Power",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_time = "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power"
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  measurepoints=multiplePointIds_time,
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_time = "G5M8Ojhd,Re2qPON3"
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds=multipleAssetIds_time,
+    #                                                                  measurepoints="Generic_Int_Power",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0_order(accessKey, secretKey, orgId, url,
+    #                                                                          orderBy="timestamp desc")
+    #
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0_withQuality(accessKey, secretKey, orgId, url,
+    #                                                                                withQuality=True)
+    #
+    # GetAssetRawDataByTimeRange_V2_0_py.getAssetRawDataByTimeRange_V2_0_accessKey(accessKey, secretKey, orgId, url)
+
+    '''
+    V2.1
+    https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/overview.html
+    '''
+
+    '''Filter Asset Latest Data'''
+    '''Operator: eq (Equals to)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="G5M8Ojhd,Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter=999)
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter=999)
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="G5M8Ojhd",
+    #                                                          pointId="Generic_Double_Power",
+    #                                                          operator="eq",
+    #                                                          valueFilter="999.99")
+
+    '''Operator: nq (Not equals to)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="nq",
+    #                                                          valueFilter=1)
+
+    '''Operator: gt (Greater than)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="gt",
+    #                                                          valueFilter=100)
+
+    '''Operator: lt (Less than)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="lt",
+    #                                                          valueFilter=1000)
+
+    '''Operator: ge (Greater than or equals to)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="ge",
+    #                                                          valueFilter=999)
+
+    '''Operator: le (Less than or equals to)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="le",
+    #                                                          valueFilter=999)
+
+    '''Operator: Between (Interval of 2 values)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="between",
+    #                                                          valueFilter="1,1000")
+
+    '''Operator: In (One of the multiple values stated)'''
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                          modelId="Python_Demo_Model",
+    #                                                          assetIds="Re2qPON3",
+    #                                                          pointId="Generic_Int_Power",
+    #                                                          operator="in",
+    #                                                          valueFilter="1,500,999")
+
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1_timeWindow(accessKey, secretKey, orgId, url,
+    #                                                                     timeWindow=120)
+
+    # FilterAssetLatestData_V2_1_py.filterAssetLatestData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                     itemFormat=2)
+
+    '''Get Asset AI Data With Aggregation Logic'''
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds="G5M8Ojhd",
+    #                                                                                    pointsIdsWithLogic="count(AI_Double_Power)",
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time,
+    #                                                                                    modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_AI_WithLogic = "count(Int_Output),avg(AI_Int_Power),sum(AI_Double_Power),max(AI_Int_Power),min(AI_Int_Power)"
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds="G5M8Ojhd",
+    #                                                                                    pointsIdsWithLogic=multiplePointIds_AI_WithLogic,
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time)
+    #
+    # multipleAssetIds_AI_WithLogic="G5M8Ojhd,Re2qPON3"
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                                    assetIds=multipleAssetIds_AI_WithLogic,
+    #                                                                                    pointsIdsWithLogic="count(AI_Double_Power)",
+    #                                                                                    startTime=start_time,
+    #                                                                                    endTime=end_time)
+    #
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1_interval(accessKey, secretKey, orgId, url,
+    #                                                                                             pointIdsWithLogic="count(Int_Output),avg(AI_Int_Power)",
+    #                                                                                             interval=10)
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1_interval(accessKey, secretKey,
+    #                                                                                             orgId, url,
+    #                                                                                             pointIdsWithLogic="Int_Output,AI_Int_Power",
+    #                                                                                             interval=0)
+    #
+    # GetAssetAIDataWithAggregationLogic_V2_1_py.getAssetAIDataWithAggregationLogic_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                                               itemFormat=2)
+
+    '''Get Asset AI Raw Data'''
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                  assetIds="G5M8Ojhd",
+    #                                                  pointIds="AI_Int_Power",
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time,
+    #                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_AI = "Int_Output,AI_Int_Power,AI_Double_Power"
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                  assetIds="G5M8Ojhd",
+    #                                                  pointIds=multiplePointIds_AI,
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time)
+    #
+    # multipleAssetIds_AI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                  assetIds=multipleAssetIds_AI,
+    #                                                  pointIds="AI_Int_Power",
+    #                                                  startTime=start_time,
+    #                                                  endTime=end_time)
+    #
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                             itemFormat=2)
+    #
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1_withQuality(accessKey, secretKey, orgId, url,
+    #                                                              withQuality=True)
+    #
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                               boundaryType="outside")
+    # GetAssetAIRawData_V2_1_py.getAssetAIRawData_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                               boundaryType="sample",
+    #                                                               interval="120",
+    #                                                               interpolation="linear")
+
+    '''Get Asset Current Day Electric Power'''
+    # GetAssetCurrentDayElectricPower_V2_1_py.getAssetCurrentDayElectricPower_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds="G5M8Ojhd",
+    #                                                                              pointIds="PI_Double_Power",
+    #                                                                              modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_PI = "PI_Double_Power,outputPower,power2"
+    # GetAssetCurrentDayElectricPower_V2_1_py.getAssetCurrentDayElectricPower_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds="G5M8Ojhd",
+    #                                                                              pointIds=multiplePointIds_PI)
+    #
+    # multipleAssetIds_PI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetCurrentDayElectricPower_V2_1_py.getAssetCurrentDayElectricPower_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                              assetIds=multipleAssetIds_PI,
+    #                                                                              pointIds="PI_Double_Power")
+    #
+    # GetAssetCurrentDayElectricPower_V2_1_py.getAssetCurrentDayElectricPower_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                                         itemFormat=2)
+
+    '''Get Asset DI Data'''
+    # GetAssetDIData_V2_1_py.getAssetDIData_V2_1(accessKey, secretKey, orgId, url,
+    #                                            assetIds="G5M8Ojhd",
+    #                                            pointIds="DI_Int_Power",
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_DI = "DI_Int_Power,DIPower2"
+    # GetAssetDIData_V2_1_py.getAssetDIData_V2_1(accessKey, secretKey, orgId, url,
+    #                                            assetIds="G5M8Ojhd",
+    #                                            pointIds=multiplePointIds_DI,
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_DI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetDIData_V2_1_py.getAssetDIData_V2_1(accessKey, secretKey, orgId, url,
+    #                                            assetIds=multipleAssetIds_DI,
+    #                                            pointIds="DI_Int_Power",
+    #                                            startTime=start_time,
+    #                                            endTime=end_time,
+    #                                            modelId="Python_Demo_Model")
+    #
+    # GetAssetDIData_V2_1_py.getAssetDIData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                       itemFormat=2)
+    #
+    # GetAssetDIData_V2_1_py.getAssetDIData_V2_1_autoInterpolate(accessKey, secretKey, orgId, url,
+    #                                                            autoInterpolate=True)
+
+    '''Get Asset DI Data Duration'''
+    # GetAssetDIDataDuration_V2_1_py.getAssetDIDataDuration_V2_1(accessKey, secretKey, orgId, url,
+    #                                                            assetIds="G5M8Ojhd",
+    #                                                            pointIds="DI_Int_Power",
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_DI_Duration = "DI_Int_Power,DIPower2"
+    # GetAssetDIDataDuration_V2_1_py.getAssetDIDataDuration_V2_1(accessKey, secretKey, orgId, url,
+    #                                                            assetIds="G5M8Ojhd",
+    #                                                            pointIds=multiplePointIds_DI_Duration,
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_DI_Duration = "G5M8Ojhd,Re2qPON3"
+    # GetAssetDIDataDuration_V2_1_py.getAssetDIDataDuration_V2_1(accessKey, secretKey, orgId, url,
+    #                                                            assetIds=multipleAssetIds_DI_Duration,
+    #                                                            pointIds="DI_Int_Power",
+    #                                                            startTime=start_time,
+    #                                                            endTime=end_time,
+    #                                                            modelId="Python_Demo_Model")
+    #
+    # GetAssetDIDataDuration_V2_1_py.getAssetDIDataDuration_V2_1_Status(accessKey, secretKey, orgId, url,
+    #                                                                   status="9341")
+    #
+    # GetAssetDIDataDuration_V2_1_py.getAssetDIDataDuration_V2_1_Unknown(accessKey, secretKey, orgId, url,
+    #                                                                   unknown= False)
+
+    '''Get Asset Electric Power Data'''
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  pointIdsWithLogic="sum(PI_Double_Power)",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIdsWithLogic_PI = "sum(PI_Double_Power),count(outputPower),avg(power2)"
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  pointIdsWithLogic=multiplePointIdsWithLogic_PI,
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multipleAssetIdsWithLogic_PI = "G5M8Ojhd,Re2qPON3"
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds=multipleAssetIdsWithLogic_PI,
+    #                                                                  pointIdsWithLogic="sum(PI_Double_Power)",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1_interval(accessKey, secretKey, orgId, url,
+    #                                                                           pointIdsWithLogic="sum(PI_Double_Power),count(outputPower),avg(power2)",
+    #                                                                           interval=10)
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1_interval(accessKey, secretKey, orgId, url,
+    #                                                                           pointIdsWithLogic="PI_Double_Power,outputPower,power2",
+    #                                                                           interval=0)
+    #
+    # GetAssetElectricPowerData_V2_1_py.getAssetElectricPowerData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                             itemFormat=2)
+
+    '''Get Asset Generic Data'''
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                      assetIds="G5M8Ojhd",
+    #                                                      pointIds="Generic_Int_Power",
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    # 
+    # multiplePointIds_Generic = "Generic_Int_Power,Generic_Double_Power"
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                      assetIds="G5M8Ojhd",
+    #                                                      pointIds=multiplePointIds_Generic,
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_Generic = "G5M8Ojhd,Re2qPON3"
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                      assetIds=multipleAssetIds_Generic,
+    #                                                      pointIds="Generic_Int_Power",
+    #                                                      startTime=start_time,
+    #                                                      endTime=end_time,
+    #                                                      modelId="Python_Demo_Model")
+    #
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                 itemFormat=2)
+    #
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1_withQuality(accessKey, secretKey, orgId, url,
+    #                                                                  withQuality=True)
+    #
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                                  boundaryType="outside")
+    # GetAssetGenericData_V2_1_py.getAssetGenericData_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                                   boundaryType="sample",
+    #                                                                   interval="120",
+    #                                                                   interpolation="linear")
+
+    '''Get Asset Latest Data'''
+    # GetAssetLatestData_V2_1_py.getAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                    assetIds="G5M8Ojhd",
+    #                                                    pointIds="Generic_Int_Power",
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_Latest = "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power"
+    # GetAssetLatestData_V2_1_py.getAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                    assetIds="G5M8Ojhd",
+    #                                                    pointIds=multiplePointIds_Latest,
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_Latest = "G5M8Ojhd,Re2qPON3"
+    # GetAssetLatestData_V2_1_py.getAssetLatestData_V2_1(accessKey, secretKey, orgId, url,
+    #                                                    assetIds=multipleAssetIds_Latest,
+    #                                                    pointIds="Generic_Int_Power",
+    #                                                    timeWindow=None,
+    #                                                    modelId="Python_Demo_Model")
+    #
+    # GetAssetLatestData_V2_1_py.getAssetLatestData_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                          itemFormat=2)
+    #
+    # GetAssetLatestData_V2_1_py.getAssetLatestData_V2_1_withLocalTime(accessKey, secretKey, orgId, url,
+    #                                                             LocalTime=True)
+
+    '''Get Asset Raw Data by Time Range'''
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  pointIds="Generic_Int_Power",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multiplePointIds_time = "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power"
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds="G5M8Ojhd",
+    #                                                                  pointIds=multiplePointIds_time,
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # multipleAssetIds_time = "G5M8Ojhd,Re2qPON3"
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1(accessKey, secretKey, orgId, url,
+    #                                                                  assetIds=multipleAssetIds_time,
+    #                                                                  pointIds="Generic_Int_Power",
+    #                                                                  startTime=start_time,
+    #                                                                  endTime=end_time,
+    #                                                                  modelId="Python_Demo_Model")
+    #
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                               itemFormat=0)
+    #
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_order(accessKey, secretKey, orgId, url,
+    #                                                                          orderBy="timestamp desc")
+    #
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_withQuality(accessKey, secretKey, orgId, url,
+    #                                                                                withQuality=True)
+    #
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url,
+    #                                                                         storage_type="ai")
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url,
+    #                                                                         storage_type="ai_normalized")
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url,
+    #                                                                         storage_type="di")
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url,
+    #                                                                         storage_type="pi")
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url,
+    #                                                                         storage_type="generic")
+    #
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                                                 boundaryType="outside")
+    # GetAssetRawDataByTimeRange_V2_1_py.getAssetRawDataByTimeRange_V2_1_boundaryType(accessKey, secretKey, orgId, url,
+    #                                                                                 boundaryType="sample",
+    #                                                                                 interval="120",
+    #                                                                                 interpolation="linear")
+
+    '''Get Asset Unformatted Data''' #Incomplete
+    # GetAssetUnformattedData_V2_1_py.getAssetUnformattedData(accessKey, secretKey, orgId, url,
+    #                                                              assetIds="",
+    #                                                              pointIds="",
+    #                                                              startTime=start_time,
+    #                                                              endTime=end_time)
+    #
+    # GetAssetUnformattedData_py.getAssetUnformattedData_orderBy(accessKey, secretKey, orgId, url,
+    #                                                                      orderBy="timestamp desc")
+    #
+    # GetAssetUnformattedData_py.getAssetUnformattedData_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                                         itemFormat=2)
+
+    '''Delete Asset Latest Data'''
+    # DeleteAssetLatestData_py.deleteAssetLatestData(accessKey, secretKey, orgId, url,
+    #                                                assetIds="G5M8Ojhd",
+    #                                                pointIds="AI_Int_Power")
+
+    multiplePointIds_Delete="AI_Int_Power,AI_Double_Power"
+    # DeleteAssetLatestData_py.deleteAssetLatestData(accessKey, secretKey, orgId, url,
+    #                                                assetIds="G5M8Ojhd",
+    #                                                pointIds=multiplePointIds_Delete)
+    #
+    multipleAssetIds_Delete = "G5M8Ojhd,Re2qPON3"
+    # DeleteAssetLatestData_py.deleteAssetLatestData(accessKey, secretKey, orgId, url,
+    #                                                assetIds=multipleAssetIds_Delete,
+    #                                                pointIds="AI_Int_Power")
+
+    # DeleteAssetLatestData_py.deleteAssetLatestData(accessKey, secretKey, orgId, url,
+    #                                                assetIds=multipleAssetIds_Delete,
+    #                                                pointIds=multiplePointIds_Delete)
+
+    '''Get Last Changed Data'''
+    # GetLastChangedData_py.getLastChangedData(accessKey, secretKey, orgId, url,
+    #                                          assetIds="G5M8Ojhd",
+    #                                          pointIds="AI_Double_Power")
+    #
+    # multipleAssetIds_LastChange = "G5M8Ojhd,Re2qPON3"
+    # GetLastChangedData_py.getLastChangedData(accessKey, secretKey, orgId, url,
+    #                                          assetIds=multipleAssetIds_LastChange,
+    #                                          pointIds="AI_Double_Power")
+    #
+    # multiplePointIds_LastChange = "AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power"
+    # GetLastChangedData_py.getLastChangedData(accessKey, secretKey, orgId, url,
+    #                                          assetIds="G5M8Ojhd",
+    #                                          pointIds=multiplePointIds_LastChange)
+    #
+    # GetLastChangedData_py.getLastChangedData_withLocalTime(accessKey, secretKey, orgId, url,
+    #                                                        True)
+    #
+    # GetLastChangedData_py.getLastChangedData_itemFormat(accessKey, secretKey, orgId, url,
+    #                                                     itemFormat=2)
+
+    '''Check Dead Data'''
+    # CheckDeadData_py.checkDeadData(accessKey, secretKey, orgId, url,
+    #                                assetId="G5M8Ojhd",
+    #                                pointId="AI_Double_Power")
+
+    '''Submit Data Deletion Job'''
+    # jobId = SubmitDataDeletionJob_py.submitDataDeletionJob(accessKey, secretKey, orgId, url,
+    #                                                        modelId="Python_Demo_Model",
+    #                                                        pointId="AI_Int_Power",
+    #                                                        assetIds="G5M8Ojhd",
+    #                                                        startTime="1643760000000",
+    #                                                        endTime="1646006400000")
+    # jobId = SubmitDataDeletionJob_py.submitDataDeletionJob(accessKey, secretKey, orgId, url,
+    #                                                        modelId="Python_Demo_Model",
+    #                                                        pointId=None,
+    #                                                        assetIds="G5M8Ojhd",
+    #                                                        startTime="1643760000000",
+    #                                                        endTime="1646006400000")
+
+    # '''Get Data Deletion Details'''
+    # GetDataDeletionDetails_py.getDataDeletionDetails(accessKey, secretKey, orgId, url,
+    #                                                  queryId=jobId)
+    # GetDataDeletionDetails_py.getDataDeletionDetails(accessKey, secretKey, orgId, url,
+    #                                                  queryId="419807391670087680")
+
+    '''Resubmit Data Deletion Job'''
+    # ResubmitDataDeletionJob_py.resubmitDataDeletionJob(accessKey, secretKey, orgId, url,
+    #                                                    jobId=jobId)
+    # ResubmitDataDeletionJob_py.resubmitDataDeletionJob(accessKey, secretKey, orgId, url,
+    #                                                    jobId="419807391670087680")
+
+
diff --git a/tsdbData/v2_0/filterAssetLatestData_V2_0.py b/tsdbData/v2_0/filterAssetLatestData_V2_0.py
new file mode 100644
index 0000000..d86f9eb
--- /dev/null
+++ b/tsdbData/v2_0/filterAssetLatestData_V2_0.py
@@ -0,0 +1,72 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: filterAssetLatestData_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Filter and query the latest data of a single measurement point for multiple devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/filter_asset_latest_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def filterAssetLatestData_V2_0(accessKey, secretKey, orgId, url, modelId, assetIds, measurepoint, operator, valueFilter):
+    accessURL = url + '/tsdb-service/v2.0/latest/filter'
+    params = {"orgId": orgId,
+              "modelId": modelId,
+              "assetIds": assetIds,
+              "measurepoint": measurepoint,
+              "operator": operator,
+              "valueFilter": valueFilter,
+              "timeWindow": None,
+              "accessKey": accessKey,
+              "ifWithLocalTime": True,
+              "localTimeAccuracy": False
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def filterAssetLatestData_V2_0_timeWindow(accessKey, secretKey, orgId, url, timeWindow):
+    accessURL = url + '/tsdb-service/v2.0/latest/filter'
+    params = {"orgId": orgId,
+              "modelId": "Python_Demo_Model",
+              "assetIds": "Re2qPON3",
+              "measurepoint": "Generic_Int_Power",
+              "operator": "eq",
+              "valueFilter": 999,
+              "timeWindow": timeWindow}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def filterAssetLatestData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/latest/filter'
+    params = {"orgId": orgId,
+              "modelId": "Python_Demo_Model",
+              "assetIds": "Re2qPON3",
+              "measurepoint": "Generic_Int_Power",
+              "operator": "eq",
+              "valueFilter": 999,
+              "accessKey": accessKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetAIDataWithAggregationLogic_V2_0.py b/tsdbData/v2_0/getAssetAIDataWithAggregationLogic_V2_0.py
new file mode 100644
index 0000000..2581dcb
--- /dev/null
+++ b/tsdbData/v2_0/getAssetAIDataWithAggregationLogic_V2_0.py
@@ -0,0 +1,73 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIDataWithAggregationLogic_V2_0
+ * Author:  Dylan Yeo
+ * Date:    04/03/22
+ * Description: Get the AI normalized data of specified measurement points of specified devices within a certain period. The queried data can also be aggregated by the specified logic
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_ai_data_with_aggregation_logic.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetAIDataWithAggregationLogic_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepointsWithLogic, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/ai-normalized'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepointsWithLogic": measurepointsWithLogic,
+              "interval": 10,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "pageSize": 10,
+              "accessKey": accessKey,
+              "localTimeAccuracy": False,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetAIDataWithAggregationLogic_V2_0_interval(accessKey, secretKey, orgId, url, measurepointsWithLogic, interval):
+    accessURL = url + '/tsdb-service/v2.0/ai-normalized'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepointsWithLogic": measurepointsWithLogic,
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "interval": interval
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetAIDataWithAggregationLogic_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/ai-normalized'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepointsWithLogic": "count(AI_Int_Power)",
+              "interval": 10,
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetAIRawData_V2_0.py b/tsdbData/v2_0/getAssetAIRawData_V2_0.py
new file mode 100644
index 0000000..31dbf1b
--- /dev/null
+++ b/tsdbData/v2_0/getAssetAIRawData_V2_0.py
@@ -0,0 +1,72 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIRawData_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the original AI data of specified measurement points of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_ai_raw_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetAIRawData_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/ai'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "pageSize": 10,
+              "accessKey": accessKey,
+              "withQuality": False,
+              "localTimeAccuracy": False
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetAIRawData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/ai'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Int_Output,AI_Int_Power,AI_Double_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetAIRawData_V2_0_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.0/ai'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Int_Output,AI_Int_Power,AI_Double_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "withQuality": withQuality
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetCurrentDayElectricPower_V2_0.py b/tsdbData/v2_0/getAssetCurrentDayElectricPower_V2_0.py
new file mode 100644
index 0000000..d8451af
--- /dev/null
+++ b/tsdbData/v2_0/getAssetCurrentDayElectricPower_V2_0.py
@@ -0,0 +1,49 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIDataWithAggregationLogic_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the accumulated power consumption/production data of specified devices from 00:00 (local time) of the current day
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_current_day_electric_power.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetCurrentDayElectricPower_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/electric-power/current-day'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "modelId": modelId,
+              "accessKey": accessKey,
+              "localTimeAccuracy": False,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetCurrentDayElectricPower_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/electric-power/current-day'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "PI_Double_Power,outputPower,power2",
+              "accessKey": accessKey,
+
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetDIDataDuration_V2_0.py b/tsdbData/v2_0/getAssetDIDataDuration_V2_0.py
new file mode 100644
index 0000000..b716775
--- /dev/null
+++ b/tsdbData/v2_0/getAssetDIDataDuration_V2_0.py
@@ -0,0 +1,67 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetDIDateDuration_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the duration of different status (DI) data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_di_data_durations.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetDIDataDuration_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/di/duration'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "status": None,
+              "ifWithUnknown": True}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetDIDataDuration_V2_0_status(accessKey, secretKey, orgId, url, status):
+    accessURL = url + '/tsdb-service/v2.0/di/duration'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd",
+              "measurepoints": "DI_Int_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "status": status}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetDIDataDuration_V2_0_Unknown(accessKey, secretKey, orgId, url, unknown):
+    accessURL = url + '/tsdb-service/v2.0/di/duration'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "DI_Int_Power,DIPower2",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "ifWithUnknown": unknown}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/tsdbData/v2_0/getAssetDIData_V2_0.py b/tsdbData/v2_0/getAssetDIData_V2_0.py
new file mode 100644
index 0000000..f3ebb47
--- /dev/null
+++ b/tsdbData/v2_0/getAssetDIData_V2_0.py
@@ -0,0 +1,68 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetDIDate_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the status change (DI) data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_di_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetDIData_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/di'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "accessKey": accessKey,
+              "localTimeAccuracy": False,
+              "autoInterpolate": False}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetDIData_V2_0_autoInterpolate(accessKey, secretKey, orgId, url, autoInterpolate):
+    accessURL = url + '/tsdb-service/v2.0/di'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "DI_Int_Power,DIPower2",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "autoInterpolate": autoInterpolate}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetDIData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/di'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "DI_Int_Power,DIPower2",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetElectricPowerData_V2_0.py b/tsdbData/v2_0/getAssetElectricPowerData_V2_0.py
new file mode 100644
index 0000000..fff5514
--- /dev/null
+++ b/tsdbData/v2_0/getAssetElectricPowerData_V2_0.py
@@ -0,0 +1,73 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetElectricPowerData_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the power consumption/production data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_electric_power_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetElectricPowerData_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepointsWithLogic, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/electric-power'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepointsWithLogic": measurepointsWithLogic,
+              "startTime": startTime,
+              "endTime": endTime,
+              "interval": 10,
+              "modelId": modelId,
+              "pageSize": 10,
+              "accessKey": accessKey,
+              "localTimeAccuracy": False,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetElectricPowerData_V2_0_interval(accessKey, secretKey, orgId, url, measurepointsWithLogic, interval):
+    accessURL = url + '/tsdb-service/v2.0/electric-power'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepointsWithLogic": measurepointsWithLogic,
+              "interval": interval,
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59"
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetElectricPowerData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/electric-power'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepointsWithLogic": "sum(PI_Double_Power),count(outputPower),avg(power2)",
+              "interval": 10,
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetGenericData_V2_0.py b/tsdbData/v2_0/getAssetGenericData_V2_0.py
new file mode 100644
index 0000000..1c20fb0
--- /dev/null
+++ b/tsdbData/v2_0/getAssetGenericData_V2_0.py
@@ -0,0 +1,73 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetGenericData_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the generic data of specified measurement points of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_generic_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetGenericData_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/generic'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "pageSize": 10,
+              "accessKey": accessKey,
+              "withQuality": False,
+              "localTimeAccuracy": False
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetGenericData_V2_0_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.0/generic'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "withQuality": withQuality
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetGenericData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/generic'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/tsdbData/v2_0/getAssetLatestData_V2_0.py b/tsdbData/v2_0/getAssetLatestData_V2_0.py
new file mode 100644
index 0000000..456bc21
--- /dev/null
+++ b/tsdbData/v2_0/getAssetLatestData_V2_0.py
@@ -0,0 +1,66 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetLatestData_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the latest data of the specified measurement points of specified devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_latest_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetLatestData_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, timeWindow, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/latest'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "modelId": modelId,
+              "timeWindow": timeWindow,
+              "accessKey": accessKey,
+              "ifWithLocalTime": False,
+              "localTimeAccuracy": False,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetLatestData_V2_0_withLocalTime(accessKey, secretKey, orgId, url, LocalTime):
+    accessURL = url + '/tsdb-service/v2.0/latest'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+              "ifWithLocalTime": LocalTime,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetLatestData_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/latest'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+              "accessKey": accessKey,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_0/getAssetRawDataByTimeRange_V2_0.py b/tsdbData/v2_0/getAssetRawDataByTimeRange_V2_0.py
new file mode 100644
index 0000000..8ba0250
--- /dev/null
+++ b/tsdbData/v2_0/getAssetRawDataByTimeRange_V2_0.py
@@ -0,0 +1,92 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetRawDataByTimeRange_V2_0
+ * Author:  Dylan Yeo
+ * Date:    07/03/22
+ * Description: Get the original data of specified measurement points of specified devices within a certain period (covering AI, AI Normalized, DI, PI, and Generic data types) and perform application development
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.0/get_asset_raw_data_by_time_range.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetRawDataByTimeRange_V2_0(accessKey, secretKey, orgId, url, assetIds, measurepoints, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.0/raw'
+    params = {"orgId": orgId,
+              "assetIds": assetIds,
+              "measurepoints": measurepoints,
+              "startTime": startTime,
+              "endTime": endTime,
+              "modelId": modelId,
+              "pageSize": 10,
+              "accessKey": accessKey,
+              "orderBy": "timestamp asc",
+              "withQuality": False,
+              "localTimeAccuracy": False,
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_0_order(accessKey, secretKey, orgId, url, orderBy):
+    accessURL = url + '/tsdb-service/v2.0/raw'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "orderBy": orderBy
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_0_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.0/raw'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "withQuality": withQuality
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_0_accessKey(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-service/v2.0/raw'
+    params = {"orgId": orgId,
+              "assetIds": "G5M8Ojhd,Re2qPON3",
+              "measurepoints": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+              "startTime": "2022-01-01 00:00:00",
+              "endTime": "2022-12-31 23:59:59",
+              "accessKey": accessKey
+              }
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+    print(params)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
diff --git a/tsdbData/v2_1/checkDeadData.py b/tsdbData/v2_1/checkDeadData.py
new file mode 100644
index 0000000..4f8d416
--- /dev/null
+++ b/tsdbData/v2_1/checkDeadData.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: checkDeadData
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Check whether data of the specified measurement point of specified device is dead data and return the last changed data of the measurement point
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/check_dead_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def checkDeadData(accessKey, secretKey, orgId, url, assetId, pointId):
+    accessURL = url + '/tsdb-service/v2.1/data/latest/check-dead'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"payload": [{"assetId": assetId,
+                        "pointId": pointId,
+                        "interval": 100}]
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/tsdbData/v2_1/deleteAssetLatestData.py b/tsdbData/v2_1/deleteAssetLatestData.py
new file mode 100644
index 0000000..e9549e6
--- /dev/null
+++ b/tsdbData/v2_1/deleteAssetLatestData.py
@@ -0,0 +1,32 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: deleteAssetLatestData
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Delete the latest data of the specified measurement points of specified devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/delete_asset_latest_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def deleteAssetLatestData(accessKey, secretKey, orgId, url, assetIds, pointIds):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId, "action": "delete"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    header = {"Content-Type": "application/json"}
+
+    body = {"assetIds": assetIds,
+            "pointIds": pointIds,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/filterAssetLatestData_V2_1.py b/tsdbData/v2_1/filterAssetLatestData_V2_1.py
new file mode 100644
index 0000000..7ca4c30
--- /dev/null
+++ b/tsdbData/v2_1/filterAssetLatestData_V2_1.py
@@ -0,0 +1,78 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: filterAssetLatestData_V2_1
+ * Author:  Dylan Yeo
+ * Date:    04/03/22
+ * Description: Filter and query the latest data of a single measurement point for multiple devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/filter_asset_latest_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def filterAssetLatestData_V2_1(accessKey, secretKey, orgId, url, modelId, assetIds, pointId, operator, valueFilter):
+    accessURL = url + '/tsdb-service/v2.1/latest/filter'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointId": pointId,
+            "operator": operator,
+            "valueFilter": valueFilter,
+            "timeWindow": None,
+            "ifWithLocalTime": True,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def filterAssetLatestData_V2_1_timeWindow(accessKey, secretKey, orgId, url, timeWindow):
+    accessURL = url + '/tsdb-service/v2.1/latest/filter'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": "Python_Demo_Model",
+            "assetIds": "Re2qPON3",
+            "pointId": "Generic_Int_Power",
+            "operator": "eq",
+            "valueFilter": 999,
+            "timeWindow": timeWindow,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def filterAssetLatestData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/latest/filter'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": "Python_Demo_Model",
+            "assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointId": "Generic_Int_Power",
+            "operator": "eq",
+            "valueFilter": 999,
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetAIDataWithAggregationLogic_V2_1.py b/tsdbData/v2_1/getAssetAIDataWithAggregationLogic_V2_1.py
new file mode 100644
index 0000000..8f12b43
--- /dev/null
+++ b/tsdbData/v2_1/getAssetAIDataWithAggregationLogic_V2_1.py
@@ -0,0 +1,77 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIDataWithAggregationLogic_V2_1
+ * Author:  Dylan Yeo
+ * Date:    01/03/22
+ * Description: Get the AI normalized data of specified measurement points of specified devices within a certain period. The queried data can also be aggregated by the specified logic
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_ai_data_with_aggregation_logic.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetAIDataWithAggregationLogic_V2_1(accessKey, secretKey, orgId, url, assetIds, pointsIdsWithLogic, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/ai-normalized'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIdsWithLogic": pointsIdsWithLogic,
+            "startTime": startTime,
+            "endTime": endTime,
+            "interval": 10,
+            "pageSize": 10,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetAIDataWithAggregationLogic_V2_1_interval(accessKey, secretKey, orgId, url, pointIdsWithLogic, interval):
+    accessURL = url + '/tsdb-service/v2.1/ai-normalized'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIdsWithLogic": pointIdsWithLogic,
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "interval": interval
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetAIDataWithAggregationLogic_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/ai-normalized'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIdsWithLogic": "count(Int_Output),avg(AI_Int_Power)",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "interval": 10,
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetAIRawData_V2_1.py b/tsdbData/v2_1/getAssetAIRawData_V2_1.py
new file mode 100644
index 0000000..bfc1d7c
--- /dev/null
+++ b/tsdbData/v2_1/getAssetAIRawData_V2_1.py
@@ -0,0 +1,100 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIRawData_V2_1
+ * Author:  Dylan Yeo
+ * Date:    01/03/22
+ * Description: Get the original AI data of specified measurement points of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_ai_raw_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetAIRawData_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/ai'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "pageSize": 10,
+            "withQuality": False,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0,
+            "boundaryType": None,
+            "interval": None,
+            "interpolation": None
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetAIRawData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/ai'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Int_Output,AI_Int_Power,AI_Double_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetAIRawData_V2_1_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.1/ai'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Int_Output,AI_Int_Power,AI_Double_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "withQuality": withQuality,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetAIRawData_V2_1_boundaryType(accessKey, secretKey, orgId, url, boundaryType, interval=None, interpolation=None):
+    accessURL = url + '/tsdb-service/v2.1/ai'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd",
+            "pointIds": "AI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "boundaryType": boundaryType,
+            "interval": interval,
+            "interpolation": interpolation
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetCurrentDayElectricPower_V2_1.py b/tsdbData/v2_1/getAssetCurrentDayElectricPower_V2_1.py
new file mode 100644
index 0000000..c8e32ed
--- /dev/null
+++ b/tsdbData/v2_1/getAssetCurrentDayElectricPower_V2_1.py
@@ -0,0 +1,51 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetAIDataWithAggregationLogic_V2_1
+ * Author:  Dylan Yeo
+ * Date:    01/03/22
+ * Description: Get the accumulated power consumption/production data of specified devices from 00:00 (local time) of the current day
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_current_day_electric_power.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetCurrentDayElectricPower_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/electric-power/current-day'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetCurrentDayElectricPower_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/electric-power/current-day'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "PI_Double_Power,outputPower,power2",
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetDIDataDuration_V2_1.py b/tsdbData/v2_1/getAssetDIDataDuration_V2_1.py
new file mode 100644
index 0000000..e0dbf9a
--- /dev/null
+++ b/tsdbData/v2_1/getAssetDIDataDuration_V2_1.py
@@ -0,0 +1,73 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetDIDateDuration_V2_1
+ * Author:  Dylan Yeo
+ * Date:    02/03/22
+ * Description: Get the duration of different status (DI) data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_di_data_durations.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetDIDataDuration_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/di/duration'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "status": None,
+            "ifWithUnknown": True,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetDIDataDuration_V2_1_Status(accessKey, secretKey, orgId, url, status):
+    accessURL = url + '/tsdb-service/v2.1/di/duration'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd",
+            "pointIds": "DI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "status": status,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetDIDataDuration_V2_1_Unknown(accessKey, secretKey, orgId, url, unknown):
+    accessURL = url + '/tsdb-service/v2.1/di/duration'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "DI_Int_Power,DIPower2",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "ifWithUnknown": unknown,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/tsdbData/v2_1/getAssetDIData_V2_1.py b/tsdbData/v2_1/getAssetDIData_V2_1.py
new file mode 100644
index 0000000..e192fed
--- /dev/null
+++ b/tsdbData/v2_1/getAssetDIData_V2_1.py
@@ -0,0 +1,82 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetDIDate_V2_1
+ * Author:  Dylan Yeo
+ * Date:    01/03/22
+ * Description: Get the status change (DI) data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_di_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetDIData_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/di'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "interval": 10,
+            "pageSize": 10,
+            "localTimeAccuracy": False,
+            "autoInterpolate": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetDIData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/di'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "DI_Int_Power,DIPower2",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "interval": 10,
+            "pageSize": 10,
+            "localTimeAccuracy": False,
+            "autoInterpolate": False,
+            "localTimeFormat": 1,
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetDIData_V2_1_autoInterpolate(accessKey, secretKey, orgId, url, autoInterpolate):
+    accessURL = url + '/tsdb-service/v2.1/di'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "DI_Int_Power,DIPower2",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "autoInterpolate": autoInterpolate,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetElectricPowerData_V2_1.py b/tsdbData/v2_1/getAssetElectricPowerData_V2_1.py
new file mode 100644
index 0000000..c85b587
--- /dev/null
+++ b/tsdbData/v2_1/getAssetElectricPowerData_V2_1.py
@@ -0,0 +1,75 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetElectricPowerData_V2_1
+ * Author:  Dylan Yeo
+ * Date:    01/03/22
+ * Description: Get the power consumption/production data of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_electric_power_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetElectricPowerData_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIdsWithLogic, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/electric-power'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIdsWithLogic": pointIdsWithLogic,
+            "startTime": startTime,
+            "endTime": endTime,
+            "interval": 10,
+            "pageSize": 10,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def getAssetElectricPowerData_V2_1_interval(accessKey, secretKey, orgId, url, pointIdsWithLogic, interval):
+    accessURL = url + '/tsdb-service/v2.1/electric-power'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIdsWithLogic": pointIdsWithLogic,
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "interval": interval
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+def getAssetElectricPowerData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/electric-power'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIdsWithLogic": "sum(PI_Double_Power),count(outputPower),avg(power2)",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "interval": 10,
+            "itemFormat": itemFormat
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetGenericData_V2_1.py b/tsdbData/v2_1/getAssetGenericData_V2_1.py
new file mode 100644
index 0000000..319c757
--- /dev/null
+++ b/tsdbData/v2_1/getAssetGenericData_V2_1.py
@@ -0,0 +1,101 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetGenericData_V2_1
+ * Author:  Dylan Yeo
+ * Date:    02/03/22
+ * Description: Get the generic data of specified measurement points of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_generic_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetGenericData_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/generic'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "pageSize": 10,
+            "withQuality": False,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0,
+            "boundaryType": None,
+            "interval": None,
+            "interpolation": None
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetGenericData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/generic'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetGenericData_V2_1_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.1/generic'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "withQuality": withQuality,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetGenericData_V2_1_boundaryType(accessKey, secretKey, orgId, url, boundaryType, interval=None, interpolation=None):
+    accessURL = url + '/tsdb-service/v2.1/generic'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd",
+            "pointIds": "Generic_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "pageSize": 10,
+            "boundaryType": boundaryType,
+            "interval": interval,
+            "interpolation": interpolation
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
diff --git a/tsdbData/v2_1/getAssetLatestData_V2_1.py b/tsdbData/v2_1/getAssetLatestData_V2_1.py
new file mode 100644
index 0000000..52378aa
--- /dev/null
+++ b/tsdbData/v2_1/getAssetLatestData_V2_1.py
@@ -0,0 +1,70 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetLatestData_V2_1
+ * Author:  Dylan Yeo
+ * Date:    02/03/22
+ * Description: Get the latest data of the specified measurement points of specified devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_latest_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetLatestData_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, timeWindow, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": assetIds,
+            "pointIds": pointIds,
+            "modelId": modelId,
+            "timeWindow": timeWindow,
+            "ifWithLocalTime": False,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetLatestData_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetLatestData_V2_1_withLocalTime(accessKey, secretKey, orgId, url, LocalTime):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "ifWithLocalTime": LocalTime,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetRawDataByTimeRange_V2_1.py b/tsdbData/v2_1/getAssetRawDataByTimeRange_V2_1.py
new file mode 100644
index 0000000..e8150e3
--- /dev/null
+++ b/tsdbData/v2_1/getAssetRawDataByTimeRange_V2_1.py
@@ -0,0 +1,140 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getAssetRawDataByTimeRange_V2_1
+ * Author:  Dylan Yeo
+ * Date:    02/03/22
+ * Description: Get the original data of specified measurement points of specified devices within a certain period (covering AI, AI Normalized, DI, PI, and Generic data types) and perform application development
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_raw_data_by_time_range.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetRawDataByTimeRange_V2_1(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "pageSize": 10,
+            "orderBy": "timestamp asc",
+            "withQuality": False,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0,
+            "boundaryType": None,
+            "interval": None,
+            "interpolation": None,
+            "type": None
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_1_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_1_order(accessKey, secretKey, orgId, url, orderBy):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "orderBy": orderBy,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_1_withQuality(accessKey, secretKey, orgId, url, withQuality):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "withQuality": withQuality,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_1_type(accessKey, secretKey, orgId, url, storage_type):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "Generic_Int_Power,Generic_Double_Power,AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "type": storage_type,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetRawDataByTimeRange_V2_1_boundaryType(accessKey, secretKey, orgId, url, boundaryType, interval=None, interpolation=None):
+    accessURL = url + '/tsdb-service/v2.1/raw'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd",
+            "pointIds": "Generic_Int_Power",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "boundaryType": boundaryType,
+            "interval": interval,
+            "interpolation": interpolation,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getAssetUnformattedData.py b/tsdbData/v2_1/getAssetUnformattedData.py
new file mode 100644
index 0000000..358e84b
--- /dev/null
+++ b/tsdbData/v2_1/getAssetUnformattedData.py
@@ -0,0 +1,75 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUnformattedData
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Get unformatted original data of specified measurement point of specified devices within a certain period
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_asset_unformatted_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getAssetUnformattedData(accessKey, secretKey, orgId, url, assetIds, pointIds, startTime, endTime, modelId=None):
+    accessURL = url + '/tsdb-service/v2.1/unformatted'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": assetIds,
+            "pointIds": pointIds,
+            "startTime": startTime,
+            "endTime": endTime,
+            "pageSize": 10,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "orderBy": "timestamp asc",
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetUnformattedData_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "",
+            "pointIds": "",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getAssetUnformattedData_orderBy(accessKey, secretKey, orgId, url, orderBy):
+    accessURL = url + '/tsdb-service/v2.1/latest'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "",
+            "pointIds": "",
+            "startTime": "2022-01-01 00:00:00",
+            "endTime": "2022-12-31 23:59:59",
+            "orderBy": orderBy,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/getDataDeletionDetails.py b/tsdbData/v2_1/getDataDeletionDetails.py
new file mode 100644
index 0000000..f7b822e
--- /dev/null
+++ b/tsdbData/v2_1/getDataDeletionDetails.py
@@ -0,0 +1,28 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getDataDeletionDetails
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Get the running result details of data deletion jobs (by specifying data deletion job ID)
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_data_deletion_details.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getDataDeletionDetails(accessKey, secretKey, orgId, url, queryId):
+    accessURL = url + '/tsdb-service/v2.1/data/delete-detail'
+    params = {"orgId": orgId,
+              "queryId": queryId,
+              "pageSize": 4,
+              "pageNo": 1}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
diff --git a/tsdbData/v2_1/getLastChangedData.py b/tsdbData/v2_1/getLastChangedData.py
new file mode 100644
index 0000000..f4b2b4c
--- /dev/null
+++ b/tsdbData/v2_1/getLastChangedData.py
@@ -0,0 +1,68 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getLastChangedData
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Get the last changed data of the specified measurement points of specified devices
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/get_last_changed_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def getLastChangedData(accessKey, secretKey, orgId, url, assetIds, pointIds):
+    accessURL = url + '/tsdb-service/v2.1/data/last-changed'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": assetIds,
+            "pointIds": pointIds,
+            "ifWithLocalTime": False,
+            "localTimeAccuracy": False,
+            "localTimeFormat": 1,
+            "itemFormat": 0
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getLastChangedData_withLocalTime(accessKey, secretKey, orgId, url, localTime):
+    accessURL = url + '/tsdb-service/v2.1/data/last-changed'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "ifWithLocalTime": localTime,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+
+def getLastChangedData_itemFormat(accessKey, secretKey, orgId, url, itemFormat):
+    accessURL = url + '/tsdb-service/v2.1/data/last-changed'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"assetIds": "G5M8Ojhd,Re2qPON3",
+            "pointIds": "AI_Int_Power,AI_Double_Power,PI_Double_Power,DI_Int_Power",
+            "itemFormat": itemFormat,
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbData/v2_1/resubmitDataDeletionJob.py b/tsdbData/v2_1/resubmitDataDeletionJob.py
new file mode 100644
index 0000000..4313ac3
--- /dev/null
+++ b/tsdbData/v2_1/resubmitDataDeletionJob.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: resubmitDataDeletionJob
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: When a data deletion job fails, resubmit the job by specifying the data deletion job ID
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/resubmit_data_deletion_job.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def resubmitDataDeletionJob(accessKey, secretKey, orgId, url, jobId):
+    accessURL = url + '/tsdb-service/v2.1/data/resubmit'
+    params = {"orgId": orgId,
+              "JobId": jobId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, method="PUT")
+    print(response)
diff --git a/tsdbData/v2_1/submitDataDeletionJob.py b/tsdbData/v2_1/submitDataDeletionJob.py
new file mode 100644
index 0000000..7edd021
--- /dev/null
+++ b/tsdbData/v2_1/submitDataDeletionJob.py
@@ -0,0 +1,36 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: submitDataDeletionJob
+ * Author:  Dylan Yeo
+ * Date:    03/03/22
+ * Description: Submit a data deletion job to delete the historical data of specified assets stored in TSDB
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-data-api/en/2.3.0/v2.1/submit_data_deletion_job.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+
+def submitDataDeletionJob(accessKey, secretKey, orgId, url, modelId, assetIds, pointId, startTime, endTime):
+    accessURL = url + '/tsdb-service/v2.1/data/tsdb-delete'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"modelId": modelId,
+            "assetIds": assetIds,
+            "pointId": pointId,
+            "startTime": startTime,
+            "endTime": endTime
+            }
+    print(body)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
+
+    jobId=response['data']
+    return jobId
diff --git a/tsdbpolicy/tsdbPolicyApp.py b/tsdbpolicy/tsdbPolicyApp.py
new file mode 100644
index 0000000..2a13730
--- /dev/null
+++ b/tsdbpolicy/tsdbPolicyApp.py
@@ -0,0 +1,36 @@
+import tsdbPolicy.v2_0.getMeasurementPointTSDBMetadata as GetMeasurementPointTSDBMetadata_py
+import tsdbPolicy.v2_0.getStoragePolicy_V2_0 as GetStoragePolicy_V2_0_py
+import tsdbPolicy.v2_0.saveStoragePolicy_V2_0 as SaveStoragePolicy_V2_0_py
+import tsdbPolicy.v2_1.getStoragePolicy_V2_1 as GetStoragePolicy_V2_1_py
+import tsdbPolicy.v2_1.saveStoragePolicy_V2_1 as SaveStoragePolicy_V2_1_py
+import tsdbPolicy.v2_1.getUnformattedPolicy as GetUnformattedPolicy_py
+import tsdbPolicy.v2_1.updateUnformattedPolicy as UpdateUnformattedPolicy_py
+
+
+def tsdbPolicyGeneral(accessKey, secretKey, orgId, url):
+    '''
+    V2.0
+    https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.0/overview.html
+    '''
+    # GetMeasurementPointTSDBMetadata_py.getMeasurementPointTSDBMetadata(accessKey, secretKey, orgId, url, modelIds= ["Python_Demo_Model", "demo_lift_model"])
+    # GetMeasurementPointTSDBMetadata_py.getMeasurementPointTSDBMetadata_measurepoints(accessKey, secretKey, orgId, url, modelIds= ["demo_lift_model"], measurepoints= ["temp", "humidity"])
+
+    # GetStoragePolicy_V2_0_py.getStoragePolicy_V2_0(accessKey, secretKey, orgId, url, policyId= "823aad0f-efe1-4ee6-ae88-79232c2a9b5c")
+
+    # SaveStoragePolicy_V2_0_py.saveStoragePolicy_V2_0(accessKey, secretKey, orgId, url, policyId= "823aad0f-efe1-4ee6-ae88-79232c2a9b5c", modelId="Python_Demo_Model", points= ["Int_Output"])
+
+    '''
+    V2.1
+    https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.1/overview.html
+    '''
+    # GetStoragePolicy_V2_1_py.getStoragePolicy_V2_1(accessKey, secretKey, orgId, url, policyId= "823aad0f-efe1-4ee6-ae88-79232c2a9b5c")
+
+    # SaveStoragePolicy_V2_1_py.saveStoragePolicy_V2_1(accessKey, secretKey, orgId, url, policyId= "823aad0f-efe1-4ee6-ae88-79232c2a9b5c", modelId="Python_Demo_Model", points= ["Int_Output"])
+
+    # GetUnformattedPolicy_py.getUnformattedPolicy(accessKey, secretKey, orgId, url)
+
+    # UpdateUnformattedPolicy_py.updateUnformattedPolicy(accessKey, secretKey, orgId, url)
+
+
+
+
diff --git a/tsdbpolicy/v2_0/getMeasurementPointTSDBMetadata.py b/tsdbpolicy/v2_0/getMeasurementPointTSDBMetadata.py
new file mode 100644
index 0000000..f26b8b3
--- /dev/null
+++ b/tsdbpolicy/v2_0/getMeasurementPointTSDBMetadata.py
@@ -0,0 +1,35 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getMeasurementPointTSDBMetadata
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description: Get the TSDB storage policy corresponding to the model measurement point. A measurement point may have multiple storage policies, depending on its data type and usage. This API returns all the TSDB storage policy metadata in the current organization for the specified measurement point
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.0/get_points_tsdb_meta_data.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getMeasurementPointTSDBMetadata(accessKey, secretKey, orgId, url, modelIds):
+    accessURL = url + '/tsdb-policy/v2.0/policies'
+    params = {"orgId": orgId, "modelIds": modelIds}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
+
+
+def getMeasurementPointTSDBMetadata_measurepoints(accessKey, secretKey, orgId, url, modelIds, measurepoints):
+    accessURL = url + '/tsdb-policy/v2.0/policies'
+    params = {"orgId": orgId, "modelIds": modelIds, "measurepoints": measurepoints}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbpolicy/v2_0/getStoragePolicy_V2_0.py b/tsdbpolicy/v2_0/getStoragePolicy_V2_0.py
new file mode 100644
index 0000000..91daf02
--- /dev/null
+++ b/tsdbpolicy/v2_0/getStoragePolicy_V2_0.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getStoragePolicyV2_0
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description: Get the detailed information of the specified storage policy with the storage policy ID, including the storage policy name, stored data type, storage time, and models and measurement points that are configured with the storage policy
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.0/get_storage_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getStoragePolicy_V2_0(accessKey, secretKey, orgId, url, policyId):
+    accessURL = url + '/tsdb-policy/v2.0/policies/' + policyId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbpolicy/v2_0/saveStoragePolicy_V2_0.py b/tsdbpolicy/v2_0/saveStoragePolicy_V2_0.py
new file mode 100644
index 0000000..046096e
--- /dev/null
+++ b/tsdbpolicy/v2_0/saveStoragePolicy_V2_0.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: saveStoragePolicyV2_0
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description: Update and save the configuration of the specified storage policy, including the data storage time and models and measurement points that are configured with it
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.0/save_storage_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def saveStoragePolicy_V2_0(accessKey, secretKey, orgId, url, policyId, modelId, points):
+    accessURL = url + '/tsdb-policy/v2.0/policies/' + policyId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"retention": "6M",
+            "models": [{"modelId": modelId,
+                        "points": points}]
+            }
+
+    header = {"Content-Type": "application/json"}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/tsdbpolicy/v2_1/getStoragePolicy_V2_1.py b/tsdbpolicy/v2_1/getStoragePolicy_V2_1.py
new file mode 100644
index 0000000..0274628
--- /dev/null
+++ b/tsdbpolicy/v2_1/getStoragePolicy_V2_1.py
@@ -0,0 +1,24 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getStoragePolicyV2_1
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description: Get the detailed information of the specified storage policy with the storage policy ID, including the storage policy name, stored data type, storage time, and models and measurement points (with data compression configuration) that are configured with the storage policy
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.1/get_storage_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getStoragePolicy_V2_1(accessKey, secretKey, orgId, url, policyId):
+    accessURL = url + '/tsdb-policy/v2.1/policies/' + policyId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url)
+    print(response)
\ No newline at end of file
diff --git a/tsdbpolicy/v2_1/getUnformattedPolicy.py b/tsdbpolicy/v2_1/getUnformattedPolicy.py
new file mode 100644
index 0000000..92ee6db
--- /dev/null
+++ b/tsdbpolicy/v2_1/getUnformattedPolicy.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: getUnformattedPolicy
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description:  Get information of organization’s unformatted storage policy, including storage policy ID, update time and retention
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.1/get_unformatted_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def getUnformattedPolicy(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-policy/v2.1/policies/unformatted/detail'
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body ={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file
diff --git a/tsdbpolicy/v2_1/saveStoragePolicy_V2_1.py b/tsdbpolicy/v2_1/saveStoragePolicy_V2_1.py
new file mode 100644
index 0000000..5c50248
--- /dev/null
+++ b/tsdbpolicy/v2_1/saveStoragePolicy_V2_1.py
@@ -0,0 +1,31 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: saveStoragePolicy
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description: Update and save the configuration of the specified storage policy, including the data storage time and models and measurement points that are configured with it
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.0/save_storage_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def saveStoragePolicy_V2_1(accessKey, secretKey, orgId, url, policyId, modelId, points):
+    accessURL = url + '/tsdb-policy/v2.0/policies/' + policyId
+    params = {"orgId": orgId}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body = {"retention": "6M",
+            "models": [{"modelId": modelId,
+                        "points": points}]
+            }
+
+    header = {"Content-Type": "application/json"}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body, header)
+    print(response)
diff --git a/tsdbpolicy/v2_1/updateUnformattedPolicy.py b/tsdbpolicy/v2_1/updateUnformattedPolicy.py
new file mode 100644
index 0000000..475c994
--- /dev/null
+++ b/tsdbpolicy/v2_1/updateUnformattedPolicy.py
@@ -0,0 +1,26 @@
+"""
+ * Copyright (C), 2015-2021, Envision
+ * FileName: updateUnformattedPolicy
+ * Author:  Dylan Yeo
+ * Date:    28/02/22
+ * Description:  Update the data storage time of organization’s unformatted storage policy
+ * History:
+ * <author>          <time>          <version>          <desc>
+ *
+ * https://support.envisioniot.com/docs/tsdb-policy-api/en/2.3.0/v2.1/get_unformatted_policy.html
+"""
+
+import poseidon.poseidon
+from requests.models import PreparedRequest
+
+def updateUnformattedPolicy(accessKey, secretKey, orgId, url):
+    accessURL = url + '/tsdb-policy/v2.1/policies/unformatted/update'
+    params = {"orgId": orgId, "retention": "6M"}
+    req = PreparedRequest()
+    req.prepare_url(accessURL, params)
+    print(req.url)
+
+    body ={}
+
+    response = poseidon.poseidon.urlopen(accessKey, secretKey, req.url, body)
+    print(response)
\ No newline at end of file