diff --git a/SplunkAppForWazuh/default/eventtypes.conf b/SplunkAppForWazuh/default/eventtypes.conf
new file mode 100644
index 000000000..c81d74298
--- /dev/null
+++ b/SplunkAppForWazuh/default/eventtypes.conf
@@ -0,0 +1,11 @@
+[wazuh_alert]
+search = index=wazuh
+#tags = alert
+
+[wazuh_file_integrity_monitoring]
+search = index=wazuh wazuh_change_type=filesystem
+#tags = endpoint change
+
+[wazuh_authentication]
+search = index=wazuh wazuh_change_type=authentication
+#tags = authentication default
diff --git a/SplunkAppForWazuh/default/limits.conf b/SplunkAppForWazuh/default/limits.conf
new file mode 100644
index 000000000..a1e8bc70d
--- /dev/null
+++ b/SplunkAppForWazuh/default/limits.conf
@@ -0,0 +1 @@
+indexed_kv_limit = 1000
\ No newline at end of file
diff --git a/SplunkAppForWazuh/default/props.conf b/SplunkAppForWazuh/default/props.conf
index bce9b0844..c49e291dc 100644
--- a/SplunkAppForWazuh/default/props.conf
+++ b/SplunkAppForWazuh/default/props.conf
@@ -1,4 +1,52 @@
 [wazuh]
 INDEXED_EXTRACTIONS = JSON
-KV_MODE = none
-AUTO_KV_JSON = false
\ No newline at end of file
+KV_MODE = json
+SHOULD_LINEMERGE = false
+
+
+## Common fields
+FIELDALIAS-severity_id = rule.level as severity_id
+FIELDALIAS-rule_id = rule.id as id
+
+#FIELDALIAS-severity_id_for_suricata = data.alert.severity as severity_id
+FIELDALIAS-signature_id = rule.id as signature_id
+FIELDALIAS-dest_port_wazuh = data.dest_port as dest_port
+FIELDALIAS-wazuh_dest = agent.ip as dest
+FIELDALIAS-wazuh_dest_ip = agent.ip as dest_ip
+FIELDALIAS-wazuh_md5_new_for = syscheck.sha1_after as file_hash
+FIELDALIAS-wazuh_body_for = rule.full_log as body
+FIELDALIAS-wazuh_signature_for = rule.description as signature
+FIELDALIAS-wazuh_subject_for = rule.description as subject
+FIELDALIAS-wazuh_url = rule.info
+
+# Windows
+FIELDALIAS-wazuh_win_body = data.win.system.message as body
+FIELDALIAS-wazuh_win_src = data.win.system.providerName as src
+FIELDALIAS-wazuh_win_type = data.win.system.channel as type
+FIELDALIAS-wazuh_win_dvc = data.win.system.computer as dvc
+FIELDALIAS-wazuh_win_dvc_ip = agent.ip as dvc_ip
+FIELDALIAS-wazuh_win_dest = agent.ip as dest
+FIELDALIAS-wazuh_win_src_ip = data.win.eventdata.ipAddress as src_ip
+FIELDALIAS-wazuh_win_src = data.win.eventdata.ipAddress as src
+FIELDALIAS-wazuh_win_nt_app = rule.groups{} as app
+FIELDALIAS-wazuh_win_user_for = data.win.eventdata.targetUserName as user
+FIELDALIAS-wazuh_win_user_id = data.win.eventdata.targetUserName as user_id
+FIELDALIAS-wazuh_win_src_user_id = data.win.eventdata.targetUserName as src_user_id
+
+FIELDALIAS-wazuh_win_description = rule.description as description
+
+
+## Change and Alert CIM Mapping
+EVAL-object = COALESCE(file_name,host_name,orig_source)
+EVAL-user = IF(isnotnull(target_user), target_user, user)
+EVAL-src_user = IF(isnull(src_user), user, src_user)
+EVAL-vendor = "Wazuh: The Open Source Security Platform"
+EVAL-product = "HIDS"
+EVAL-vendor_product = "wazuh"
+#EVAL-app = "wazuh"
+EVAL-ids_type = "host"
+
+## Lookup
+LOOKUP-severity_for_wazuh = wazuh_severities_lookup severity_id OUTPUT severity
+LOOKUP-action_for_wazuh = wazuh_action_lookup signature_id AS wazuh_signature_id OUTPUT action,status,change_type,change_type AS wazuh_change_type
+#LOOKUP-object_category_for_wazuh = wazuh_object_category_lookup signature_id OUTPUT object_category
diff --git a/SplunkAppForWazuh/default/tags.conf b/SplunkAppForWazuh/default/tags.conf
new file mode 100644
index 000000000..751bda0c9
--- /dev/null
+++ b/SplunkAppForWazuh/default/tags.conf
@@ -0,0 +1,10 @@
+[eventtype=wazuh_alert]
+alert = enabled
+
+[eventtype=wazuh_file_integrity_monitoring]
+endpoint = enabled
+change = enabled
+
+[eventtype=wazuh_authentication]
+authentication = enabled
+default = enabled
diff --git a/SplunkAppForWazuh/default/transforms.conf b/SplunkAppForWazuh/default/transforms.conf
index f28f42593..e32e0b4b1 100644
--- a/SplunkAppForWazuh/default/transforms.conf
+++ b/SplunkAppForWazuh/default/transforms.conf
@@ -10,4 +10,14 @@ fields_list = _key, id, url, port, user, password, filter
 [jobs_lookup]
 external_type = kvstore
 collection = jobs
-fields_list = _key, job, added, exec_time
\ No newline at end of file
+fields_list = _key, job, added, exec_time
+
+###### Lookups ######
+[wazuh_severities_lookup]
+filename = wazuh_severities_lookup.csv
+
+[wazuh_action_lookup]
+filename = wazuh_action_lookup.csv
+
+[wazuh_object_category_lookup]
+filename = wazuh_object_category_lookup.csv
diff --git a/SplunkAppForWazuh/lookups/wazuh_action_lookup.csv b/SplunkAppForWazuh/lookups/wazuh_action_lookup.csv
new file mode 100644
index 000000000..722c44ddd
--- /dev/null
+++ b/SplunkAppForWazuh/lookups/wazuh_action_lookup.csv
@@ -0,0 +1,25 @@
+signature_id,action,status,change_type
+550,modified,success,filesystem
+551,modified,success,filesystem
+552,modified,success,filesystem
+553,deleted,success,filesystem
+554,created,success,filesystem
+555,modified,success,filesystem
+580,modified,success,filesystem
+581,created,success,filesystem
+591,modified,success,filesystem
+592,modified,success,filesystem
+593,deleted,success,filesystem
+594,modified,success,filesystem
+595,modified,success,filesystem
+596,modified,success,filesystem
+597,deleted,success,filesystem
+598,created,success,filesystem
+5303,success,,authentication
+5304,success,,authentication
+5402,success,,authentication
+5503,failure,,authentication
+5715,success,,authentication
+5716,failure,,authentication
+18107,success,,authentication
+18149,success,,authentication
diff --git a/SplunkAppForWazuh/lookups/wazuh_object_category_lookup.csv b/SplunkAppForWazuh/lookups/wazuh_object_category_lookup.csv
new file mode 100644
index 000000000..ca046ca3f
--- /dev/null
+++ b/SplunkAppForWazuh/lookups/wazuh_object_category_lookup.csv
@@ -0,0 +1,17 @@
+signature_id,object_category
+550,file
+551,file
+552,file
+553,file
+554,file
+555,host_info
+580,host_info
+581,host_info
+591,file
+592,file
+593,win_event_log
+594,registry
+595,registry
+596,registry
+597,registry
+598,registry
diff --git a/SplunkAppForWazuh/lookups/wazuh_severities_lookup.csv b/SplunkAppForWazuh/lookups/wazuh_severities_lookup.csv
new file mode 100644
index 000000000..234084ffe
--- /dev/null
+++ b/SplunkAppForWazuh/lookups/wazuh_severities_lookup.csv
@@ -0,0 +1,17 @@
+severity_id,severity
+0,informational
+1,informational
+2,informational
+3,informational
+4,low
+5,low
+6,low
+7,low
+8,low
+9,medium
+10,medium
+11,medium
+12,high
+13,high
+14,high
+15,critical
diff --git a/TA_Wazuh_CIM_addon/README.md b/TA_Wazuh_CIM_addon/README.md
new file mode 100644
index 000000000..2863b47c8
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/README.md
@@ -0,0 +1,14 @@
+# TA Wazuh CIM compliance
+
+[![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack/)
+[![Email](https://img.shields.io/badge/email-join-blue.svg)](https://groups.google.com/forum/#!forum/wazuh)
+[![Documentation](https://img.shields.io/badge/docs-view-green.svg)](https://documentation.wazuh.com)
+[![Documentation](https://img.shields.io/badge/web-view-green.svg)](https://wazuh.com)
+
+This Add-on supports CIM compliance for Wazuh alerts.
+
+## References
+
+- [Wazuh website](https://wazuh.com)
+- [Wazuh documentation](https://documentation.wazuh.com)
+- [Splunk documentation](http://docs.splunk.com/Documentation)
diff --git a/TA_Wazuh_CIM_addon/default/app.conf b/TA_Wazuh_CIM_addon/default/app.conf
new file mode 100644
index 000000000..7dcec709f
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/app.conf
@@ -0,0 +1,25 @@
+######################################################
+#
+# Splunk_TA_wazuh
+#
+# Copyright Wazuh,Inc. (C) 2020 All Rights Reserved.
+#
+######################################################
+
+[install]
+is_configured = false
+state = enabled
+build = 10
+
+[launcher]
+author=Splunk
+version=4.0.1
+description = Splunk Add-on for Wazuh CIM compliance
+
+[ui]
+is_visible = false
+label = Splunk Add-on for Wazuh CIM compliance
+docs_section_override = AddOns:released
+
+[package]
+id = Splunk_TA_wazuh
diff --git a/TA_Wazuh_CIM_addon/default/eventtypes.conf b/TA_Wazuh_CIM_addon/default/eventtypes.conf
new file mode 100644
index 000000000..c81d74298
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/eventtypes.conf
@@ -0,0 +1,11 @@
+[wazuh_alert]
+search = index=wazuh
+#tags = alert
+
+[wazuh_file_integrity_monitoring]
+search = index=wazuh wazuh_change_type=filesystem
+#tags = endpoint change
+
+[wazuh_authentication]
+search = index=wazuh wazuh_change_type=authentication
+#tags = authentication default
diff --git a/TA_Wazuh_CIM_addon/default/limits.conf b/TA_Wazuh_CIM_addon/default/limits.conf
new file mode 100644
index 000000000..a1e8bc70d
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/limits.conf
@@ -0,0 +1 @@
+indexed_kv_limit = 1000
\ No newline at end of file
diff --git a/TA_Wazuh_CIM_addon/default/props.conf b/TA_Wazuh_CIM_addon/default/props.conf
new file mode 100644
index 000000000..57bd4ebe8
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/props.conf
@@ -0,0 +1,51 @@
+## Fields extraction
+[wazuh]
+SHOULD_LINEMERGE = false
+KV_MODE = json
+
+## Common fields
+FIELDALIAS-severity_id = rule.level as severity_id
+FIELDALIAS-rule_id = rule.id as id
+
+#FIELDALIAS-severity_id_for_suricata = data.alert.severity as severity_id
+FIELDALIAS-signature_id = rule.id as signature_id
+FIELDALIAS-dest_port_wazuh = data.dest_port as dest_port
+FIELDALIAS-wazuh_dest = agent.ip as dest
+FIELDALIAS-wazuh_dest_ip = agent.ip as dest_ip
+FIELDALIAS-wazuh_md5_new_for = syscheck.sha1_after as file_hash
+FIELDALIAS-wazuh_body_for = rule.full_log as body
+FIELDALIAS-wazuh_signature_for = rule.description as signature
+FIELDALIAS-wazuh_subject_for = rule.description as subject
+FIELDALIAS-wazuh_url = rule.info
+
+# Windows
+FIELDALIAS-wazuh_win_body = data.win.system.message as body
+FIELDALIAS-wazuh_win_src = data.win.system.providerName as src
+FIELDALIAS-wazuh_win_type = data.win.system.channel as type
+FIELDALIAS-wazuh_win_dvc = data.win.system.computer as dvc
+FIELDALIAS-wazuh_win_dvc_ip = agent.ip as dvc_ip
+FIELDALIAS-wazuh_win_dest = agent.ip as dest
+FIELDALIAS-wazuh_win_src_ip = data.win.eventdata.ipAddress as src_ip
+FIELDALIAS-wazuh_win_src = data.win.eventdata.ipAddress as src
+FIELDALIAS-wazuh_win_nt_app = rule.groups{} as app
+FIELDALIAS-wazuh_win_user_for = data.win.eventdata.targetUserName as user
+FIELDALIAS-wazuh_win_user_id = data.win.eventdata.targetUserName as user_id
+FIELDALIAS-wazuh_win_src_user_id = data.win.eventdata.targetUserName as src_user_id
+
+FIELDALIAS-wazuh_win_description = rule.description as description
+
+
+## Change and Alert CIM Mapping
+EVAL-object = COALESCE(file_name,host_name,orig_source)
+EVAL-user = IF(isnotnull(target_user), target_user, user)
+EVAL-src_user = IF(isnull(src_user), user, src_user)
+EVAL-vendor = "Wazuh: The Open Source Security Platform"
+EVAL-product = "HIDS"
+EVAL-vendor_product = "wazuh"
+#EVAL-app = "wazuh"
+EVAL-ids_type = "host"
+
+## Lookup
+LOOKUP-severity_for_wazuh = wazuh_severities_lookup severity_id OUTPUT severity
+LOOKUP-action_for_wazuh = wazuh_action_lookup signature_id AS wazuh_signature_id OUTPUT action,status,change_type,change_type AS wazuh_change_type
+#LOOKUP-object_category_for_wazuh = wazuh_object_category_lookup signature_id OUTPUT object_category
diff --git a/TA_Wazuh_CIM_addon/default/tags.conf b/TA_Wazuh_CIM_addon/default/tags.conf
new file mode 100644
index 000000000..751bda0c9
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/tags.conf
@@ -0,0 +1,10 @@
+[eventtype=wazuh_alert]
+alert = enabled
+
+[eventtype=wazuh_file_integrity_monitoring]
+endpoint = enabled
+change = enabled
+
+[eventtype=wazuh_authentication]
+authentication = enabled
+default = enabled
diff --git a/TA_Wazuh_CIM_addon/default/transforms.conf b/TA_Wazuh_CIM_addon/default/transforms.conf
new file mode 100644
index 000000000..07305d6dc
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/default/transforms.conf
@@ -0,0 +1,9 @@
+###### Lookups ######
+[wazuh_severities_lookup]
+filename = wazuh_severities_lookup.csv
+
+[wazuh_action_lookup]
+filename = wazuh_action_lookup.csv
+
+[wazuh_object_category_lookup]
+filename = wazuh_object_category_lookup.csv
diff --git a/TA_Wazuh_CIM_addon/lookups/wazuh_action_lookup.csv b/TA_Wazuh_CIM_addon/lookups/wazuh_action_lookup.csv
new file mode 100644
index 000000000..722c44ddd
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/lookups/wazuh_action_lookup.csv
@@ -0,0 +1,25 @@
+signature_id,action,status,change_type
+550,modified,success,filesystem
+551,modified,success,filesystem
+552,modified,success,filesystem
+553,deleted,success,filesystem
+554,created,success,filesystem
+555,modified,success,filesystem
+580,modified,success,filesystem
+581,created,success,filesystem
+591,modified,success,filesystem
+592,modified,success,filesystem
+593,deleted,success,filesystem
+594,modified,success,filesystem
+595,modified,success,filesystem
+596,modified,success,filesystem
+597,deleted,success,filesystem
+598,created,success,filesystem
+5303,success,,authentication
+5304,success,,authentication
+5402,success,,authentication
+5503,failure,,authentication
+5715,success,,authentication
+5716,failure,,authentication
+18107,success,,authentication
+18149,success,,authentication
diff --git a/TA_Wazuh_CIM_addon/lookups/wazuh_object_category_lookup.csv b/TA_Wazuh_CIM_addon/lookups/wazuh_object_category_lookup.csv
new file mode 100644
index 000000000..ca046ca3f
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/lookups/wazuh_object_category_lookup.csv
@@ -0,0 +1,17 @@
+signature_id,object_category
+550,file
+551,file
+552,file
+553,file
+554,file
+555,host_info
+580,host_info
+581,host_info
+591,file
+592,file
+593,win_event_log
+594,registry
+595,registry
+596,registry
+597,registry
+598,registry
diff --git a/TA_Wazuh_CIM_addon/lookups/wazuh_severities_lookup.csv b/TA_Wazuh_CIM_addon/lookups/wazuh_severities_lookup.csv
new file mode 100644
index 000000000..234084ffe
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/lookups/wazuh_severities_lookup.csv
@@ -0,0 +1,17 @@
+severity_id,severity
+0,informational
+1,informational
+2,informational
+3,informational
+4,low
+5,low
+6,low
+7,low
+8,low
+9,medium
+10,medium
+11,medium
+12,high
+13,high
+14,high
+15,critical
diff --git a/TA_Wazuh_CIM_addon/metadata/default.meta b/TA_Wazuh_CIM_addon/metadata/default.meta
new file mode 100644
index 000000000..1f33b06cf
--- /dev/null
+++ b/TA_Wazuh_CIM_addon/metadata/default.meta
@@ -0,0 +1,6 @@
+
+# Application-level permissions
+
+[]
+access = read : [ * ], write : [ admin]
+export = system
diff --git a/TA_Wazuh_CIM_addon/static/static/appIcon.png b/TA_Wazuh_CIM_addon/static/static/appIcon.png
new file mode 100644
index 000000000..f8eeeadc9
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appIcon.png differ
diff --git a/TA_Wazuh_CIM_addon/static/static/appIconAlt.png b/TA_Wazuh_CIM_addon/static/static/appIconAlt.png
new file mode 100644
index 000000000..305cdf548
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appIconAlt.png differ
diff --git a/TA_Wazuh_CIM_addon/static/static/appIconAlt_2x.png b/TA_Wazuh_CIM_addon/static/static/appIconAlt_2x.png
new file mode 100644
index 000000000..4afd6dbc3
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appIconAlt_2x.png differ
diff --git a/TA_Wazuh_CIM_addon/static/static/appIcon_2x.png b/TA_Wazuh_CIM_addon/static/static/appIcon_2x.png
new file mode 100644
index 000000000..f8eeeadc9
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appIcon_2x.png differ
diff --git a/TA_Wazuh_CIM_addon/static/static/appLogo.png b/TA_Wazuh_CIM_addon/static/static/appLogo.png
new file mode 100644
index 000000000..0c33634fa
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appLogo.png differ
diff --git a/TA_Wazuh_CIM_addon/static/static/appLogo_2x.png b/TA_Wazuh_CIM_addon/static/static/appLogo_2x.png
new file mode 100644
index 000000000..ad2d9bc23
Binary files /dev/null and b/TA_Wazuh_CIM_addon/static/static/appLogo_2x.png differ