diff --git a/_data/taps/schemas/appsflyer/v1/appsflyer-v1-tables.yml b/_data/taps/schemas/appsflyer/v1/appsflyer-v1-tables.yml
index 643841059..3e3e2f531 100644
--- a/_data/taps/schemas/appsflyer/v1/appsflyer-v1-tables.yml
+++ b/_data/taps/schemas/appsflyer/v1/appsflyer-v1-tables.yml
@@ -1,44 +1,44 @@
 tap: appsflyer
 version: '1'
 tables:
-- name: installations
+- name: installs
   description: The `{{ table.name }}` table contains information about iOS and Android
     app installations.
   links:
     doc-link: https://support.appsflyer.com/hc/en-us/articles/208387843-Raw-Data-Reports-V5-
-    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/raw_data/installations.json
+    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/installs.json
     api-method: https://dev.appsflyer.com/hc/reference/get_app-id-installs-report-v5
   table-details:
     replication-method: Key-based Incremental
     primary-keys:
-    - appsflyer_id
-    - event_name
     - event_time
-    replication-key: event_time
+    - event_name
+    - appsflyer_id
+    replication-key: attributed_touch_time
 - name: in_app_events
   description: The `{{ table.name }}` table contains information about in-app events
     for iOS and Android apps.
   links:
     doc-link: https://support.appsflyer.com/hc/en-us/articles/208387843-Raw-Data-Reports-V5-
-    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/raw_data/in_app_events.json
+    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/in_app_events.json
     api-method: https://dev.appsflyer.com/hc/reference/get_app-id-in-app-events-report-v5
   table-details:
     replication-method: Key-based Incremental
     primary-keys:
-    - appsflyer_id
-    - event_name
     - event_time
+    - event_name
+    - appsflyer_id
     replication-key: event_time
 - name: organic_installs
   description: The `{{ table.name }}` table contains information about organic installs.
   links:
     doc-link: https://support.appsflyer.com/hc/en-us/articles/208387843-Raw-Data-Reports-V5-
-    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/raw_data/organic_installs.json
+    singer-schema: https://github.com/singer-io/tap-appsflyer/blob/master/tap_appsflyer/schemas/organic_installs.json
     api-method: https://dev.appsflyer.com/hc/reference/get_app-id-organic-installs-report-v5
   table-details:
     replication-method: Key-based Incremental
     primary-keys:
-    - appsflyer_id
-    - event_name
     - event_time
+    - event_name
+    - appsflyer_id
     replication-key: event_time
diff --git a/_data/taps/schemas/appsflyer/v1/json/in_app_events.json b/_data/taps/schemas/appsflyer/v1/json/in_app_events.json
index e32dc3c49..ae56f269a 100644
--- a/_data/taps/schemas/appsflyer/v1/json/in_app_events.json
+++ b/_data/taps/schemas/appsflyer/v1/json/in_app_events.json
@@ -1,492 +1,86 @@
 {
+  "type": "object",
   "properties": {
-    "advertising_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_attribution_lookback": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_c_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_channel": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_model": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_keywords": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_reengagement_window": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub1": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub2": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub3": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub4": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub5": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "android_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "appsflyer_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "attributed_touch_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "attributed_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "bundle_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "carrier": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "city": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "country_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "customer_user_id": {
-      "type": [
-        "null",
-        "integer",
-        "string"
-      ]
-    },
-    "device_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "dma": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_usd": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "event_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "http_referrer": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfa": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfv": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "imei": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "install_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "ip": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "is_primary_attribution": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_receipt_validated": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_retargeting": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "language": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "operator": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "original_url": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "os_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "platform": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "postal_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "region": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "retargeting_conversion_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "sdk_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "state": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "user_agent": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "wifi": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    }
-  },
-  "type": "object"
+    "attributed_touch_type": {"type": ["null", "string"]},
+    "attributed_touch_time": {"type": ["null", "string"], "format": "date-time"},
+    "install_time": {"type": ["null", "string"], "format": "date-time"},
+    "af_prt": {"type": ["null", "string"]},
+    "media_source": {"type": ["null", "string"]},
+    "is_retargeting": {"type": ["null", "boolean"]},
+    "retargeting_conversion_type": {"type": ["null", "string"]},
+    "af_channel": {"type": ["null", "string"]},
+    "af_keywords": {"type": ["null", "string"]},
+    "campaign": {"type": ["null", "string"]},
+    "af_c_id": {"type": ["null", "string"]},
+    "af_adset": {"type": ["null", "string"]},
+    "af_adset_id": {"type": ["null", "string"]},
+    "af_ad": {"type": ["null", "string"]},
+    "af_ad_id": {"type": ["null", "string"]},
+    "af_ad_type": {"type": ["null", "string"]},
+    "af_siteid": {"type": ["null", "string"]},
+    "af_sub1": {"type": ["null", "string"]},
+    "af_sub2": {"type": ["null", "string"]},
+    "af_sub3": {"type": ["null", "string"]},
+    "af_sub4": {"type": ["null", "string"]},
+    "af_sub5": {"type": ["null", "string"]},
+    "http_referrer": {"type": ["null", "string"]},
+    "original_url": {"type": ["null", "string"]},
+    "user_agent": {"type": ["null", "string"]},
+    "af_cost_model": {"type": ["null", "string"]},
+    "af_cost_value": {"type": ["null", "string"]},
+    "af_cost_currency": {"type": ["null", "string"]},
+    "contributor1_af_prt": {"type": ["null", "string"]},
+    "contributor1_media_source": {"type": ["null", "string"]},
+    "contributor1_campaign": {"type": ["null", "string"]},
+    "contributor1_touch_type": {"type": ["null", "string"]},
+    "contributor1_touch_time": {"type": ["null", "string"]},
+    "contributor2_af_prt": {"type": ["null", "string"]},
+    "contributor2_media_source": {"type": ["null", "string"]},
+    "contributor2_campaign": {"type": ["null", "string"]},
+    "contributor2_touch_type": {"type": ["null", "string"]},
+    "contributor2_touch_time": {"type": ["null", "string"]},
+    "contributor3_af_prt": {"type": ["null", "string"]},
+    "contributor3_media_source": {"type": ["null", "string"]},
+    "contributor3_campaign": {"type": ["null", "string"]},
+    "contributor3_touch_type": {"type": ["null", "string"]},
+    "contributor3_touch_time": {"type": ["null", "string"]},
+    "country_code": {"type": ["null", "string"]},
+    "ip": {"type": ["null", "string"]},
+    "region": {"type": ["null", "string"]},
+    "state": {"type": ["null", "string"]},
+    "city": {"type": ["null", "string"]},
+    "wifi": {"type": ["null", "boolean"]},
+    "operator": {"type": ["null", "string"]},
+    "carrier": {"type": ["null", "string"]},
+    "language": {"type": ["null", "string"]},
+    "appsflyer_id": {"type": ["null", "string"]},
+    "advertising_id": {"type": ["null", "string"]},
+    "idfa": {"type": ["null", "string"]},
+    "android_id": {"type": ["null", "string"]},
+    "customer_user_id": {"type": ["null", "integer", "string"]},
+    "imei": {"type": ["null", "string"]},
+    "idfv": {"type": ["null", "string"]},
+    "platform": {"type": ["null", "string"]},
+    "device_type": {"type": ["null", "string"]},
+    "os_version": {"type": ["null", "string"]},
+    "app_version": {"type": ["null", "string"]},
+    "sdk_version": {"type": ["null", "string"]},
+    "app_id": {"type": ["null", "string"]},
+    "app_name": {"type": ["null", "string"]},
+    "bundle_id": {"type": ["null", "string"]},
+    "af_attribution_lookback": {"type": ["null", "string"]},
+    "event_time": {"type": ["null", "string"], "format": "date-time"},
+    "event_name": {"type": ["null", "string"]},
+    "event_value": {"type": ["null", "string"]},
+    "event_revenue": {"type": ["null", "string"]},
+    "event_revenue_usd": {"type": ["null", "string"]},
+    "event_revenue_currency": {"type": ["null", "string"]},
+    "is_receipt_validated": {"type": ["null", "boolean"]},
+    "postal_code": {"type": ["null", "string"]},
+    "dma": {"type": ["null", "string"]},
+    "af_reengagement_window": {"type": ["null", "string"]},
+    "event_source": {"type": ["null", "string"]},
+    "is_primary_attribution": {"type": ["null", "boolean"]},
+    "af_sub_siteid": {"type": ["null", "string"]}
+  }
 }
\ No newline at end of file
diff --git a/_data/taps/schemas/appsflyer/v1/json/installations.json b/_data/taps/schemas/appsflyer/v1/json/installations.json
deleted file mode 100644
index e32dc3c49..000000000
--- a/_data/taps/schemas/appsflyer/v1/json/installations.json
+++ /dev/null
@@ -1,492 +0,0 @@
-{
-  "properties": {
-    "advertising_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_attribution_lookback": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_c_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_channel": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_model": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_keywords": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_reengagement_window": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub1": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub2": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub3": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub4": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub5": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "android_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "appsflyer_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "attributed_touch_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "attributed_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "bundle_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "carrier": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "city": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "country_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "customer_user_id": {
-      "type": [
-        "null",
-        "integer",
-        "string"
-      ]
-    },
-    "device_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "dma": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_usd": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "event_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "http_referrer": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfa": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfv": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "imei": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "install_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "ip": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "is_primary_attribution": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_receipt_validated": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_retargeting": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "language": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "operator": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "original_url": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "os_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "platform": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "postal_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "region": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "retargeting_conversion_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "sdk_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "state": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "user_agent": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "wifi": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    }
-  },
-  "type": "object"
-}
\ No newline at end of file
diff --git a/_data/taps/schemas/appsflyer/v1/json/installs.json b/_data/taps/schemas/appsflyer/v1/json/installs.json
new file mode 100644
index 000000000..648df5dad
--- /dev/null
+++ b/_data/taps/schemas/appsflyer/v1/json/installs.json
@@ -0,0 +1,86 @@
+{
+  "type": "object",
+  "properties": {
+    "attributed_touch_type": {"type": ["null", "string"]},
+    "attributed_touch_time": {"type": ["null", "string"], "format": "date-time"},
+    "install_time": {"type": ["null", "string"], "format": "date-time"},
+    "af_prt": {"type": ["null", "string"]},
+    "media_source": {"type": ["null", "string"]},
+    "is_retargeting": {"type": ["null", "boolean"]},
+    "retargeting_conversion_type": {"type": ["null", "string"]},
+    "af_channel": {"type": ["null", "string"]},
+    "af_keywords": {"type": ["null", "string"]},
+    "campaign": {"type": ["null", "string"]},
+    "af_c_id": {"type": ["null", "string"]},
+    "af_adset": {"type": ["null", "string"]},
+    "af_adset_id": {"type": ["null", "string"]},
+    "af_ad": {"type": ["null", "string"]},
+    "af_ad_id": {"type": ["null", "string"]},
+    "af_ad_type": {"type": ["null", "string"]},
+    "af_siteid": {"type": ["null", "string"]},
+    "af_sub1": {"type": ["null", "string"]},
+    "af_sub2": {"type": ["null", "string"]},
+    "af_sub3": {"type": ["null", "string"]},
+    "af_sub4": {"type": ["null", "string"]},
+    "af_sub5": {"type": ["null", "string"]},
+    "http_referrer": {"type": ["null", "string"]},
+    "original_url": {"type": ["null", "string"]},
+    "user_agent": {"type": ["null", "string"]},
+    "af_cost_model": {"type": ["null", "string"]},
+    "af_cost_value": {"type": ["null", "string"]},
+    "af_cost_currency": {"type": ["null", "string"]},
+    "contributor1_af_prt": {"type": ["null", "string"]},
+    "contributor1_media_source": {"type": ["null", "string"]},
+    "contributor1_campaign": {"type": ["null", "string"]},
+    "contributor1_touch_type": {"type": ["null", "string"]},
+    "contributor1_touch_time": {"type": ["null", "string"]},
+    "contributor2_af_prt": {"type": ["null", "string"]},
+    "contributor2_media_source": {"type": ["null", "string"]},
+    "contributor2_campaign": {"type": ["null", "string"]},
+    "contributor2_touch_type": {"type": ["null", "string"]},
+    "contributor2_touch_time": {"type": ["null", "string"]},
+    "contributor3_af_prt": {"type": ["null", "string"]},
+    "contributor3_media_source": {"type": ["null", "string"]},
+    "contributor3_campaign": {"type": ["null", "string"]},
+    "contributor3_touch_type": {"type": ["null", "string"]},
+    "contributor3_touch_time": {"type": ["null", "string"]},
+    "country_code": {"type": ["null", "string"]},
+    "ip": {"type": ["null", "string"]},
+    "region": {"type": ["null", "string"]},
+    "state": {"type": ["null", "string"]},
+    "city": {"type": ["null", "string"]},
+    "wifi": {"type": ["null", "boolean"]},
+    "operator": {"type": ["null", "string"]},
+    "carrier": {"type": ["null", "string"]},
+    "language": {"type": ["null", "string"]},
+    "appsflyer_id": {"type": ["null", "string"]},
+    "advertising_id": {"type": ["null", "string"]},
+    "idfa": {"type": ["null", "string"]},
+    "android_id": {"type": ["null", "string"]},
+    "customer_user_id": {"type": ["null", "integer", "string"]},
+    "imei": {"type": ["null", "string"]},
+    "idfv": {"type": ["null", "string"]},
+    "platform": {"type": ["null", "string"]},
+    "device_type": {"type": ["null", "string"]},
+    "os_version": {"type": ["null", "string"]},
+    "app_version": {"type": ["null", "string"]},
+    "sdk_version": {"type": ["null", "string"]},
+    "app_id": {"type": ["null", "string"]},
+    "app_name": {"type": ["null", "string"]},
+    "bundle_id": {"type": ["null", "string"]},
+    "af_attribution_lookback": {"type": ["null", "string"]},
+    "event_time": {"type": ["null", "string"], "format": "date-time"},
+    "event_name": {"type": ["null", "string"]},
+    "event_value": {"type": ["null", "string"]},
+    "event_revenue": {"type": ["null", "string"]},
+    "event_revenue_usd": {"type": ["null", "string"]},
+    "event_revenue_currency": {"type": ["null", "string"]},
+    "is_receipt_validated": {"type": ["null", "boolean"]},
+    "postal_code": {"type": ["null", "string"]},
+    "dma": {"type": ["null", "string"]},
+    "af_reengagement_window": {"type": ["null", "string"]},
+    "event_source": {"type": ["null", "string"]},
+    "is_primary_attribution": {"type": ["null", "boolean"]},
+    "af_sub_siteid": {"type": ["null", "string"]}
+  }
+}
diff --git a/_data/taps/schemas/appsflyer/v1/json/organic_installs.json b/_data/taps/schemas/appsflyer/v1/json/organic_installs.json
index e32dc3c49..ae56f269a 100644
--- a/_data/taps/schemas/appsflyer/v1/json/organic_installs.json
+++ b/_data/taps/schemas/appsflyer/v1/json/organic_installs.json
@@ -1,492 +1,86 @@
 {
+  "type": "object",
   "properties": {
-    "advertising_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_ad_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_adset_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_attribution_lookback": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_c_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_channel": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_model": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_cost_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_keywords": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_reengagement_window": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub1": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub2": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub3": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub4": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub5": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "af_sub_siteid": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "android_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "app_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "appsflyer_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "attributed_touch_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "attributed_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "bundle_id": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "carrier": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "city": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor1_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor2_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_af_prt": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_campaign": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_time": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "contributor3_touch_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "country_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "customer_user_id": {
-      "type": [
-        "null",
-        "integer",
-        "string"
-      ]
-    },
-    "device_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "dma": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_name": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_currency": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_revenue_usd": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "event_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "event_value": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "http_referrer": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfa": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "idfv": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "imei": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "install_time": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "ip": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "is_primary_attribution": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_receipt_validated": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "is_retargeting": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "language": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "media_source": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "operator": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "original_url": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "os_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "platform": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "postal_code": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "region": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "retargeting_conversion_type": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "sdk_version": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "state": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "user_agent": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "wifi": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    }
-  },
-  "type": "object"
+    "attributed_touch_type": {"type": ["null", "string"]},
+    "attributed_touch_time": {"type": ["null", "string"], "format": "date-time"},
+    "install_time": {"type": ["null", "string"], "format": "date-time"},
+    "af_prt": {"type": ["null", "string"]},
+    "media_source": {"type": ["null", "string"]},
+    "is_retargeting": {"type": ["null", "boolean"]},
+    "retargeting_conversion_type": {"type": ["null", "string"]},
+    "af_channel": {"type": ["null", "string"]},
+    "af_keywords": {"type": ["null", "string"]},
+    "campaign": {"type": ["null", "string"]},
+    "af_c_id": {"type": ["null", "string"]},
+    "af_adset": {"type": ["null", "string"]},
+    "af_adset_id": {"type": ["null", "string"]},
+    "af_ad": {"type": ["null", "string"]},
+    "af_ad_id": {"type": ["null", "string"]},
+    "af_ad_type": {"type": ["null", "string"]},
+    "af_siteid": {"type": ["null", "string"]},
+    "af_sub1": {"type": ["null", "string"]},
+    "af_sub2": {"type": ["null", "string"]},
+    "af_sub3": {"type": ["null", "string"]},
+    "af_sub4": {"type": ["null", "string"]},
+    "af_sub5": {"type": ["null", "string"]},
+    "http_referrer": {"type": ["null", "string"]},
+    "original_url": {"type": ["null", "string"]},
+    "user_agent": {"type": ["null", "string"]},
+    "af_cost_model": {"type": ["null", "string"]},
+    "af_cost_value": {"type": ["null", "string"]},
+    "af_cost_currency": {"type": ["null", "string"]},
+    "contributor1_af_prt": {"type": ["null", "string"]},
+    "contributor1_media_source": {"type": ["null", "string"]},
+    "contributor1_campaign": {"type": ["null", "string"]},
+    "contributor1_touch_type": {"type": ["null", "string"]},
+    "contributor1_touch_time": {"type": ["null", "string"]},
+    "contributor2_af_prt": {"type": ["null", "string"]},
+    "contributor2_media_source": {"type": ["null", "string"]},
+    "contributor2_campaign": {"type": ["null", "string"]},
+    "contributor2_touch_type": {"type": ["null", "string"]},
+    "contributor2_touch_time": {"type": ["null", "string"]},
+    "contributor3_af_prt": {"type": ["null", "string"]},
+    "contributor3_media_source": {"type": ["null", "string"]},
+    "contributor3_campaign": {"type": ["null", "string"]},
+    "contributor3_touch_type": {"type": ["null", "string"]},
+    "contributor3_touch_time": {"type": ["null", "string"]},
+    "country_code": {"type": ["null", "string"]},
+    "ip": {"type": ["null", "string"]},
+    "region": {"type": ["null", "string"]},
+    "state": {"type": ["null", "string"]},
+    "city": {"type": ["null", "string"]},
+    "wifi": {"type": ["null", "boolean"]},
+    "operator": {"type": ["null", "string"]},
+    "carrier": {"type": ["null", "string"]},
+    "language": {"type": ["null", "string"]},
+    "appsflyer_id": {"type": ["null", "string"]},
+    "advertising_id": {"type": ["null", "string"]},
+    "idfa": {"type": ["null", "string"]},
+    "android_id": {"type": ["null", "string"]},
+    "customer_user_id": {"type": ["null", "integer", "string"]},
+    "imei": {"type": ["null", "string"]},
+    "idfv": {"type": ["null", "string"]},
+    "platform": {"type": ["null", "string"]},
+    "device_type": {"type": ["null", "string"]},
+    "os_version": {"type": ["null", "string"]},
+    "app_version": {"type": ["null", "string"]},
+    "sdk_version": {"type": ["null", "string"]},
+    "app_id": {"type": ["null", "string"]},
+    "app_name": {"type": ["null", "string"]},
+    "bundle_id": {"type": ["null", "string"]},
+    "af_attribution_lookback": {"type": ["null", "string"]},
+    "event_time": {"type": ["null", "string"], "format": "date-time"},
+    "event_name": {"type": ["null", "string"]},
+    "event_value": {"type": ["null", "string"]},
+    "event_revenue": {"type": ["null", "string"]},
+    "event_revenue_usd": {"type": ["null", "string"]},
+    "event_revenue_currency": {"type": ["null", "string"]},
+    "is_receipt_validated": {"type": ["null", "boolean"]},
+    "postal_code": {"type": ["null", "string"]},
+    "dma": {"type": ["null", "string"]},
+    "af_reengagement_window": {"type": ["null", "string"]},
+    "event_source": {"type": ["null", "string"]},
+    "is_primary_attribution": {"type": ["null", "boolean"]},
+    "af_sub_siteid": {"type": ["null", "string"]}
+  }
 }
\ No newline at end of file
diff --git a/_saas-integrations/appsflyer/appsflyer-latest.md b/_saas-integrations/appsflyer/appsflyer-latest.md
index f26e677e6..446ecf4fb 100644
--- a/_saas-integrations/appsflyer/appsflyer-latest.md
+++ b/_saas-integrations/appsflyer/appsflyer-latest.md
@@ -40,14 +40,9 @@ api-type: "platform.appsflyer"
 anchor-scheduling: true
 cron-scheduling: true
 
-table-selection: false
-column-selection: false
-select-all: false
-select-all-reason: |
-  As this integration doesn't support table or column selection, all available tables and columns are automatically replicated.
-select-all: false
-select-all-reason: |
-  As this integration doesn't support table or column selection, all available tables and columns are automatically replicated.
+table-selection: true
+column-selection: true
+select-all: true
 
 extraction-logs: true
 loading-reports: true
@@ -118,6 +113,11 @@ setup-steps:
     content: |
       {% include integrations/shared-setup/replication-frequency.html %}
 
+  - title: "Set objects to replicate"
+    anchor: "setting-data-to-replicate"
+    content: |
+      {% include integrations/shared-setup/data-selection/object-selection.html %}
+
 
 # -------------------------- #
 #     Integration Tables     #
@@ -139,7 +139,7 @@ replication-sections:
     content: |
       In addition to historical limitations, {{ integration.display_name }} also [imposes a limit on the number of raw data API calls](https://support.appsflyer.com/hc/en-us/articles/207034366-API-Policy#2-raw-data-reports-via-pull-api) that can be made per day. Currently, the maximum is **10 API calls per day, per app** and increases when upgrading to a higher {{ integration.display_name }} tier.
 
-      Each time Stitch requests data for an app - or a single {{ integration.display_name }} integration - two API calls will be used: One to replicate `in_app_events`, and one for `installations`.
+      Each time Stitch requests data for an app - or a single {{ integration.display_name }} integration - two API calls will be used: One to replicate `in_app_events`, and one for `installs`.
 
       If your Stitch {{ integration.display_name }} integration is set to replicate frequently (ex: every 30 minutes), you may quickly consume your {{ integration.display_name }} API quota. When this occurs, Stitch will pause replication and resume where it left off when more quota is available.