diff --git a/signals/CS.yaml b/signals/CS.yaml
index b52175f..26bb7a1 100644
--- a/signals/CS.yaml
+++ b/signals/CS.yaml
@@ -11,4 +11,6 @@ processor:
       htx: 1
       kraken: 1
       okx: 1
+      band/macaw: 1
+      band/kiwi: 1
     minimum_cumulative_weight: 1
diff --git a/signals/CS/0G-USD.yaml b/signals/CS/0G-USD.yaml
index 8f0448c..d41241c 100644
--- a/signals/CS/0G-USD.yaml
+++ b/signals/CS/0G-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:0G-USD
+- source_id: band/kiwi
+  id: CS:0G-USD
 - source_id: binance
   id: 0gusdc
   routes:
diff --git a/signals/CS/1INCH-USD.yaml b/signals/CS/1INCH-USD.yaml
index 970b2d9..f7cc01a 100644
--- a/signals/CS/1INCH-USD.yaml
+++ b/signals/CS/1INCH-USD.yaml
@@ -1,9 +1,20 @@
 sources:
+- source_id: band/macaw
+  id: CS:1INCH-USD
+- source_id: band/kiwi
+  id: CS:1INCH-USD
 - source_id: binance
   id: 1inchusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: 1INCHUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
+- source_id: coinbase
+  id: 1INCH-USD
 - source_id: coingecko
   id: 1inch
 - source_id: htx
@@ -11,6 +22,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: 1INCH/USD
 - source_id: okx
   id: 1INCH-USDT
   routes:
diff --git a/signals/CS/2Z-USD.yaml b/signals/CS/2Z-USD.yaml
index a081ff7..614f279 100644
--- a/signals/CS/2Z-USD.yaml
+++ b/signals/CS/2Z-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:2Z-USD
+- source_id: band/kiwi
+  id: CS:2Z-USD
 - source_id: binance
   id: 2zusdc
   routes:
@@ -19,6 +23,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: 2Z-USD
 - source_id: coingecko
   id: doublezero
 - source_id: kraken
diff --git a/signals/CS/A-USD.yaml b/signals/CS/A-USD.yaml
index e3bc4b6..f90c31d 100644
--- a/signals/CS/A-USD.yaml
+++ b/signals/CS/A-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:A-USD
+- source_id: band/kiwi
+  id: CS:A-USD
 - source_id: binance
   id: ausdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: AUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: vaulta
 - source_id: htx
@@ -11,6 +20,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: A/USD
 - source_id: okx
   id: A-USDT
   routes:
diff --git a/signals/CS/AAVE-USD.yaml b/signals/CS/AAVE-USD.yaml
index a1f1869..bdc2b2a 100644
--- a/signals/CS/AAVE-USD.yaml
+++ b/signals/CS/AAVE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AAVE-USD
+- source_id: band/kiwi
+  id: CS:AAVE-USD
 - source_id: binance
   id: aaveusdc
   routes:
diff --git a/signals/CS/AB-USD.yaml b/signals/CS/AB-USD.yaml
index 23c4302..36c6890 100644
--- a/signals/CS/AB-USD.yaml
+++ b/signals/CS/AB-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AB-USD
+- source_id: band/kiwi
+  id: CS:AB-USD
 - source_id: coingecko
   id: newton-project
 - source_id: htx
diff --git a/signals/CS/ADA-USD.yaml b/signals/CS/ADA-USD.yaml
index 698724e..f8950e7 100644
--- a/signals/CS/ADA-USD.yaml
+++ b/signals/CS/ADA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ADA-USD
+- source_id: band/kiwi
+  id: CS:ADA-USD
 - source_id: binance
   id: adausdc
   routes:
@@ -21,6 +25,11 @@ sources:
     operation: '*'
 - source_id: coinbase
   id: ADA-USD
+- source_id: coinbase
+  id: ADA-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: cardano
 - source_id: htx
diff --git a/signals/CS/AERO-USD.yaml b/signals/CS/AERO-USD.yaml
index ebecc1d..cc96872 100644
--- a/signals/CS/AERO-USD.yaml
+++ b/signals/CS/AERO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AERO-USD
+- source_id: band/kiwi
+  id: CS:AERO-USD
 - source_id: bybit
   id: AEROUSDT
   routes:
@@ -8,3 +12,5 @@ sources:
   id: AERO-USD
 - source_id: coingecko
   id: aerodrome-finance
+- source_id: kraken
+  id: AERO/USD
diff --git a/signals/CS/AIOZ-USD.yaml b/signals/CS/AIOZ-USD.yaml
index 2832b64..9fd7bc8 100644
--- a/signals/CS/AIOZ-USD.yaml
+++ b/signals/CS/AIOZ-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AIOZ-USD
+- source_id: band/kiwi
+  id: CS:AIOZ-USD
 - source_id: coinbase
   id: AIOZ-USD
 - source_id: coingecko
diff --git a/signals/CS/AKT-USD.yaml b/signals/CS/AKT-USD.yaml
index 3a08fd0..c04676e 100644
--- a/signals/CS/AKT-USD.yaml
+++ b/signals/CS/AKT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AKT-USD
+- source_id: band/kiwi
+  id: CS:AKT-USD
 - source_id: coinbase
   id: AKT-USD
 - source_id: coingecko
diff --git a/signals/CS/ALGO-USD.yaml b/signals/CS/ALGO-USD.yaml
index d37232e..62f43f8 100644
--- a/signals/CS/ALGO-USD.yaml
+++ b/signals/CS/ALGO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ALGO-USD
+- source_id: band/kiwi
+  id: CS:ALGO-USD
 - source_id: binance
   id: algousdc
   routes:
@@ -30,6 +34,11 @@ sources:
   routes:
   - signal_id: CS:USDC-USD
     operation: '*'
+- source_id: kraken
+  id: ALGO/USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: okx
   id: ALGO-USDT
   routes:
diff --git a/signals/CS/AMP-USD.yaml b/signals/CS/AMP-USD.yaml
index b3631c7..aa1823d 100644
--- a/signals/CS/AMP-USD.yaml
+++ b/signals/CS/AMP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AMP-USD
+- source_id: band/kiwi
+  id: CS:AMP-USD
 - source_id: binance
   id: ampusdt
   routes:
diff --git a/signals/CS/APE-USD.yaml b/signals/CS/APE-USD.yaml
index 49c1822..e8e5966 100644
--- a/signals/CS/APE-USD.yaml
+++ b/signals/CS/APE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:APE-USD
+- source_id: band/kiwi
+  id: CS:APE-USD
 - source_id: binance
   id: apeusdt
   routes:
@@ -9,6 +13,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: APE-USD
 - source_id: coingecko
   id: apecoin
 - source_id: htx
diff --git a/signals/CS/APEX-USD.yaml b/signals/CS/APEX-USD.yaml
index f90c8bc..d11378c 100644
--- a/signals/CS/APEX-USD.yaml
+++ b/signals/CS/APEX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:APEX-USD
+- source_id: band/kiwi
+  id: CS:APEX-USD
 - source_id: bybit
   id: APEXUSDC
   routes:
diff --git a/signals/CS/APT-USD.yaml b/signals/CS/APT-USD.yaml
index f253bd1..413aa2a 100644
--- a/signals/CS/APT-USD.yaml
+++ b/signals/CS/APT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:APT-USD
+- source_id: band/kiwi
+  id: CS:APT-USD
 - source_id: binance
   id: aptusdc
   routes:
diff --git a/signals/CS/AR-USD.yaml b/signals/CS/AR-USD.yaml
index 4408355..80d97f3 100644
--- a/signals/CS/AR-USD.yaml
+++ b/signals/CS/AR-USD.yaml
@@ -1,9 +1,23 @@
 sources:
+- source_id: band/macaw
+  id: CS:AR-USD
+- source_id: band/kiwi
+  id: CS:AR-USD
+- source_id: binance
+  id: arusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: arusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ARUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: arweave
 - source_id: htx
@@ -11,3 +25,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: AR-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/ARB-USD.yaml b/signals/CS/ARB-USD.yaml
index a422262..18f4de0 100644
--- a/signals/CS/ARB-USD.yaml
+++ b/signals/CS/ARB-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ARB-USD
+- source_id: band/kiwi
+  id: CS:ARB-USD
 - source_id: binance
   id: arbusdc
   routes:
diff --git a/signals/CS/ASTER-USD.yaml b/signals/CS/ASTER-USD.yaml
index 5e5e921..994a920 100644
--- a/signals/CS/ASTER-USD.yaml
+++ b/signals/CS/ASTER-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ASTER-USD
+- source_id: band/kiwi
+  id: CS:ASTER-USD
 - source_id: binance
   id: asterusdc
   routes:
@@ -21,3 +25,10 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: ASTER/USD
+- source_id: okx
+  id: ASTER-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/ASTR-USD.yaml b/signals/CS/ASTR-USD.yaml
index c523f10..c691c79 100644
--- a/signals/CS/ASTR-USD.yaml
+++ b/signals/CS/ASTR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ASTR-USD
+- source_id: band/kiwi
+  id: CS:ASTR-USD
 - source_id: binance
   id: astrusdt
   routes:
diff --git a/signals/CS/ATH-USD.yaml b/signals/CS/ATH-USD.yaml
index c8d1eaf..3dea5cc 100644
--- a/signals/CS/ATH-USD.yaml
+++ b/signals/CS/ATH-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ATH-USD
+- source_id: band/kiwi
+  id: CS:ATH-USD
 - source_id: bybit
   id: ATHUSDT
   routes:
diff --git a/signals/CS/ATOM-USD.yaml b/signals/CS/ATOM-USD.yaml
index 2d09562..6992242 100644
--- a/signals/CS/ATOM-USD.yaml
+++ b/signals/CS/ATOM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ATOM-USD
+- source_id: band/kiwi
+  id: CS:ATOM-USD
 - source_id: binance
   id: atomusdc
   routes:
diff --git a/signals/CS/AVAX-USD.yaml b/signals/CS/AVAX-USD.yaml
index 784cd54..f048050 100644
--- a/signals/CS/AVAX-USD.yaml
+++ b/signals/CS/AVAX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AVAX-USD
+- source_id: band/kiwi
+  id: CS:AVAX-USD
 - source_id: binance
   id: avaxusdc
   routes:
diff --git a/signals/CS/AVNT-USD.yaml b/signals/CS/AVNT-USD.yaml
index 487f0d4..729fc8d 100644
--- a/signals/CS/AVNT-USD.yaml
+++ b/signals/CS/AVNT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AVNT-USD
+- source_id: band/kiwi
+  id: CS:AVNT-USD
 - source_id: binance
   id: avntusdc
   routes:
diff --git a/signals/CS/AXL-USD.yaml b/signals/CS/AXL-USD.yaml
index 1c1f637..a9a1e98 100644
--- a/signals/CS/AXL-USD.yaml
+++ b/signals/CS/AXL-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:AXL-USD
+- source_id: band/kiwi
+  id: CS:AXL-USD
 - source_id: binance
   id: axlusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: AXLUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: AXL-USD
 - source_id: coingecko
diff --git a/signals/CS/AXS-USD.yaml b/signals/CS/AXS-USD.yaml
index 1abad93..2514c8f 100644
--- a/signals/CS/AXS-USD.yaml
+++ b/signals/CS/AXS-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:AXS-USD
+- source_id: band/kiwi
+  id: CS:AXS-USD
 - source_id: binance
   id: axsusdt
   routes:
@@ -11,3 +15,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: AXS-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/BAND-USD.yaml b/signals/CS/BAND-USD.yaml
index 8bac4a2..b298c56 100644
--- a/signals/CS/BAND-USD.yaml
+++ b/signals/CS/BAND-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BAND-USD
+- source_id: band/kiwi
+  id: CS:BAND-USD
 - source_id: binance
   id: bandusdt
   routes:
diff --git a/signals/CS/BAT-USD.yaml b/signals/CS/BAT-USD.yaml
index ee8a67e..86375eb 100644
--- a/signals/CS/BAT-USD.yaml
+++ b/signals/CS/BAT-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:BAT-USD
+- source_id: band/kiwi
+  id: CS:BAT-USD
 - source_id: binance
   id: batusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: BATUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: BAT-USD
 - source_id: coingecko
diff --git a/signals/CS/BCH-USD.yaml b/signals/CS/BCH-USD.yaml
index 2ba5614..62d3776 100644
--- a/signals/CS/BCH-USD.yaml
+++ b/signals/CS/BCH-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BCH-USD
+- source_id: band/kiwi
+  id: CS:BCH-USD
 - source_id: binance
   id: bchusdc
   routes:
diff --git a/signals/CS/BEAM-USD.yaml b/signals/CS/BEAM-USD.yaml
index f2051e9..4a05e4d 100644
--- a/signals/CS/BEAM-USD.yaml
+++ b/signals/CS/BEAM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BEAM-USD
+- source_id: band/kiwi
+  id: CS:BEAM-USD
 - source_id: bybit
   id: BEAMUSDT
   routes:
diff --git a/signals/CS/BERA-USD.yaml b/signals/CS/BERA-USD.yaml
index 38fe92a..cf120aa 100644
--- a/signals/CS/BERA-USD.yaml
+++ b/signals/CS/BERA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BERA-USD
+- source_id: band/kiwi
+  id: CS:BERA-USD
 - source_id: binance
   id: berausdc
   routes:
diff --git a/signals/CS/BIO-USD.yaml b/signals/CS/BIO-USD.yaml
index dc2f98c..5e9aa95 100644
--- a/signals/CS/BIO-USD.yaml
+++ b/signals/CS/BIO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BIO-USD
+- source_id: band/kiwi
+  id: CS:BIO-USD
 - source_id: binance
   id: biousdc
   routes:
diff --git a/signals/CS/BNB-USD.yaml b/signals/CS/BNB-USD.yaml
index 0aa5f55..79a956e 100644
--- a/signals/CS/BNB-USD.yaml
+++ b/signals/CS/BNB-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BNB-USD
+- source_id: band/kiwi
+  id: CS:BNB-USD
 - source_id: binance
   id: bnbusdc
   routes:
diff --git a/signals/CS/BONK-USD.yaml b/signals/CS/BONK-USD.yaml
index ec57632..b3a284c 100644
--- a/signals/CS/BONK-USD.yaml
+++ b/signals/CS/BONK-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BONK-USD
+- source_id: band/kiwi
+  id: CS:BONK-USD
 - source_id: binance
   id: bonkusdc
   routes:
diff --git a/signals/CS/BRETT-USD.yaml b/signals/CS/BRETT-USD.yaml
index a10a66b..472a5da 100644
--- a/signals/CS/BRETT-USD.yaml
+++ b/signals/CS/BRETT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BRETT-USD
+- source_id: band/kiwi
+  id: CS:BRETT-USD
 - source_id: bybit
   id: BRETTUSDT
   routes:
diff --git a/signals/CS/BTC-USD.yaml b/signals/CS/BTC-USD.yaml
index f5daee8..dfaa0ba 100644
--- a/signals/CS/BTC-USD.yaml
+++ b/signals/CS/BTC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BTC-USD
+- source_id: band/kiwi
+  id: CS:BTC-USD
 - source_id: binance
   id: btcusdc
   routes:
diff --git a/signals/CS/BTT-USD.yaml b/signals/CS/BTT-USD.yaml
index c4781ac..43698d9 100644
--- a/signals/CS/BTT-USD.yaml
+++ b/signals/CS/BTT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:BTT-USD
+- source_id: band/kiwi
+  id: CS:BTT-USD
 - source_id: coingecko
   id: bittorrent
 - source_id: htx
diff --git a/signals/CS/C98-USD.yaml b/signals/CS/C98-USD.yaml
index be61c08..ad6be8a 100644
--- a/signals/CS/C98-USD.yaml
+++ b/signals/CS/C98-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:C98-USD
+- source_id: band/kiwi
+  id: CS:C98-USD
 - source_id: binance
   id: c98usdt
   routes:
diff --git a/signals/CS/CAKE-USD.yaml b/signals/CS/CAKE-USD.yaml
index 6e184c4..34b9f0f 100644
--- a/signals/CS/CAKE-USD.yaml
+++ b/signals/CS/CAKE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CAKE-USD
+- source_id: band/kiwi
+  id: CS:CAKE-USD
 - source_id: binance
   id: cakeusdc
   routes:
diff --git a/signals/CS/CELO-USD.yaml b/signals/CS/CELO-USD.yaml
index 314dd45..3fe85dd 100644
--- a/signals/CS/CELO-USD.yaml
+++ b/signals/CS/CELO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CELO-USD
+- source_id: band/kiwi
+  id: CS:CELO-USD
 - source_id: binance
   id: celousdt
   routes:
diff --git a/signals/CS/CFX-USD.yaml b/signals/CS/CFX-USD.yaml
index b9002b8..4a9e9fc 100644
--- a/signals/CS/CFX-USD.yaml
+++ b/signals/CS/CFX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CFX-USD
+- source_id: band/kiwi
+  id: CS:CFX-USD
 - source_id: binance
   id: cfxusdc
   routes:
diff --git a/signals/CS/CHZ-USD.yaml b/signals/CS/CHZ-USD.yaml
index 47282be..94e92ab 100644
--- a/signals/CS/CHZ-USD.yaml
+++ b/signals/CS/CHZ-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:CHZ-USD
+- source_id: band/kiwi
+  id: CS:CHZ-USD
+- source_id: binance
+  id: chzusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: chzusdt
   routes:
diff --git a/signals/CS/CKB-USD.yaml b/signals/CS/CKB-USD.yaml
index 7188e7f..4c9e800 100644
--- a/signals/CS/CKB-USD.yaml
+++ b/signals/CS/CKB-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CKB-USD
+- source_id: band/kiwi
+  id: CS:CKB-USD
 - source_id: binance
   id: ckbusdt
   routes:
diff --git a/signals/CS/COMP-USD.yaml b/signals/CS/COMP-USD.yaml
index 57a6c6c..434503c 100644
--- a/signals/CS/COMP-USD.yaml
+++ b/signals/CS/COMP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:COMP-USD
+- source_id: band/kiwi
+  id: CS:COMP-USD
 - source_id: binance
   id: compusdt
   routes:
diff --git a/signals/CS/COTI-USD.yaml b/signals/CS/COTI-USD.yaml
index 041ae8d..8b04641 100644
--- a/signals/CS/COTI-USD.yaml
+++ b/signals/CS/COTI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:COTI-USD
+- source_id: band/kiwi
+  id: CS:COTI-USD
 - source_id: binance
   id: cotiusdt
   routes:
@@ -8,5 +12,10 @@ sources:
   id: COTI-USD
 - source_id: coingecko
   id: coti
+- source_id: htx
+  id: cotiusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: kraken
   id: COTI/USD
diff --git a/signals/CS/CRO-USD.yaml b/signals/CS/CRO-USD.yaml
index 8e1249c..2d495c8 100644
--- a/signals/CS/CRO-USD.yaml
+++ b/signals/CS/CRO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CRO-USD
+- source_id: band/kiwi
+  id: CS:CRO-USD
 - source_id: coinbase
   id: CRO-USD
 - source_id: coingecko
diff --git a/signals/CS/CRV-USD.yaml b/signals/CS/CRV-USD.yaml
index d5e1ab9..eb5706d 100644
--- a/signals/CS/CRV-USD.yaml
+++ b/signals/CS/CRV-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CRV-USD
+- source_id: band/kiwi
+  id: CS:CRV-USD
 - source_id: binance
   id: crvusdc
   routes:
diff --git a/signals/CS/CVX-USD.yaml b/signals/CS/CVX-USD.yaml
index cab03be..73d828a 100644
--- a/signals/CS/CVX-USD.yaml
+++ b/signals/CS/CVX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:CVX-USD
+- source_id: band/kiwi
+  id: CS:CVX-USD
 - source_id: binance
   id: cvxusdt
   routes:
diff --git a/signals/CS/DAI-USD.yaml b/signals/CS/DAI-USD.yaml
index 42592fe..12c3719 100644
--- a/signals/CS/DAI-USD.yaml
+++ b/signals/CS/DAI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DAI-USD
+- source_id: band/kiwi
+  id: CS:DAI-USD
 - source_id: bybit
   id: DAIUSDT
   routes:
diff --git a/signals/CS/DASH-USD.yaml b/signals/CS/DASH-USD.yaml
index 13cce34..790ceec 100644
--- a/signals/CS/DASH-USD.yaml
+++ b/signals/CS/DASH-USD.yaml
@@ -1,9 +1,22 @@
 sources:
+- source_id: band/macaw
+  id: CS:DASH-USD
+- source_id: band/kiwi
+  id: CS:DASH-USD
+- source_id: binance
+  id: dashusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: dashusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bitfinex
+  id: tDSHUSD
+- source_id: coinbase
+  id: DASH-USD
 - source_id: coingecko
   id: dash
 - source_id: htx
diff --git a/signals/CS/DEXE-USD.yaml b/signals/CS/DEXE-USD.yaml
index 304d4a5..16b8dde 100644
--- a/signals/CS/DEXE-USD.yaml
+++ b/signals/CS/DEXE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DEXE-USD
+- source_id: band/kiwi
+  id: CS:DEXE-USD
 - source_id: binance
   id: dexeusdt
   routes:
diff --git a/signals/CS/DOGE-USD.yaml b/signals/CS/DOGE-USD.yaml
index ecd0b1d..0686728 100644
--- a/signals/CS/DOGE-USD.yaml
+++ b/signals/CS/DOGE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DOGE-USD
+- source_id: band/kiwi
+  id: CS:DOGE-USD
 - source_id: binance
   id: dogeusdc
   routes:
diff --git a/signals/CS/DOT-USD.yaml b/signals/CS/DOT-USD.yaml
index b22d75e..63dc767 100644
--- a/signals/CS/DOT-USD.yaml
+++ b/signals/CS/DOT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DOT-USD
+- source_id: band/kiwi
+  id: CS:DOT-USD
 - source_id: binance
   id: dotusdc
   routes:
@@ -23,6 +27,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: DOT/USD
 - source_id: okx
   id: DOT-USDT
   routes:
diff --git a/signals/CS/DRIFT-USD.yaml b/signals/CS/DRIFT-USD.yaml
index 9a15453..5d2d880 100644
--- a/signals/CS/DRIFT-USD.yaml
+++ b/signals/CS/DRIFT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DRIFT-USD
+- source_id: band/kiwi
+  id: CS:DRIFT-USD
 - source_id: bybit
   id: DRIFTUSDT
   routes:
diff --git a/signals/CS/DYDX-USD.yaml b/signals/CS/DYDX-USD.yaml
index 146d3ab..1deadcb 100644
--- a/signals/CS/DYDX-USD.yaml
+++ b/signals/CS/DYDX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:DYDX-USD
+- source_id: band/kiwi
+  id: CS:DYDX-USD
 - source_id: binance
   id: dydxusdt
   routes:
diff --git a/signals/CS/EGLD-USD.yaml b/signals/CS/EGLD-USD.yaml
index cbb5db6..864c7cb 100644
--- a/signals/CS/EGLD-USD.yaml
+++ b/signals/CS/EGLD-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:EGLD-USD
+- source_id: band/kiwi
+  id: CS:EGLD-USD
 - source_id: binance
   id: egldusdc
   routes:
diff --git a/signals/CS/EIGEN-USD.yaml b/signals/CS/EIGEN-USD.yaml
index dd8b531..5e2df84 100644
--- a/signals/CS/EIGEN-USD.yaml
+++ b/signals/CS/EIGEN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:EIGEN-USD
+- source_id: band/kiwi
+  id: CS:EIGEN-USD
 - source_id: binance
   id: eigenusdc
   routes:
diff --git a/signals/CS/ENA-USD.yaml b/signals/CS/ENA-USD.yaml
index a7325f9..c2725c7 100644
--- a/signals/CS/ENA-USD.yaml
+++ b/signals/CS/ENA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ENA-USD
+- source_id: band/kiwi
+  id: CS:ENA-USD
 - source_id: binance
   id: enausdc
   routes:
diff --git a/signals/CS/ENS-USD.yaml b/signals/CS/ENS-USD.yaml
index 1703498..7d31326 100644
--- a/signals/CS/ENS-USD.yaml
+++ b/signals/CS/ENS-USD.yaml
@@ -1,9 +1,23 @@
 sources:
+- source_id: band/macaw
+  id: CS:ENS-USD
+- source_id: band/kiwi
+  id: CS:ENS-USD
+- source_id: binance
+  id: ensusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: ensusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ENSUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: ethereum-name-service
 - source_id: htx
diff --git a/signals/CS/ETC-USD.yaml b/signals/CS/ETC-USD.yaml
index a18103f..423680d 100644
--- a/signals/CS/ETC-USD.yaml
+++ b/signals/CS/ETC-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:ETC-USD
+- source_id: band/kiwi
+  id: CS:ETC-USD
+- source_id: binance
+  id: etcusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: etcusdt
   routes:
@@ -11,3 +20,8 @@ sources:
     operation: '*'
 - source_id: coingecko
   id: ethereum-classic
+- source_id: okx
+  id: ETC-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/ETH-USD.yaml b/signals/CS/ETH-USD.yaml
index 6937178..60c3e6c 100644
--- a/signals/CS/ETH-USD.yaml
+++ b/signals/CS/ETH-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ETH-USD
+- source_id: band/kiwi
+  id: CS:ETH-USD
 - source_id: binance
   id: ethusdc
   routes:
diff --git a/signals/CS/ETHFI-USD.yaml b/signals/CS/ETHFI-USD.yaml
index 75b5175..dc698aa 100644
--- a/signals/CS/ETHFI-USD.yaml
+++ b/signals/CS/ETHFI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ETHFI-USD
+- source_id: band/kiwi
+  id: CS:ETHFI-USD
 - source_id: binance
   id: ethfiusdc
   routes:
diff --git a/signals/CS/EURC-USD.yaml b/signals/CS/EURC-USD.yaml
index a5c82e4..7e9af81 100644
--- a/signals/CS/EURC-USD.yaml
+++ b/signals/CS/EURC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:EURC-USD
+- source_id: band/kiwi
+  id: CS:EURC-USD
 - source_id: coinbase
   id: EURC-USDC
   routes:
diff --git a/signals/CS/FARTCOIN-USD.yaml b/signals/CS/FARTCOIN-USD.yaml
index 512224a..b97670d 100644
--- a/signals/CS/FARTCOIN-USD.yaml
+++ b/signals/CS/FARTCOIN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FARTCOIN-USD
+- source_id: band/kiwi
+  id: CS:FARTCOIN-USD
 - source_id: coinbase
   id: FARTCOIN-USD
 - source_id: coingecko
diff --git a/signals/CS/FDUSD-USD.yaml b/signals/CS/FDUSD-USD.yaml
index 9c41b42..59a2896 100644
--- a/signals/CS/FDUSD-USD.yaml
+++ b/signals/CS/FDUSD-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FDUSD-USD
+- source_id: band/kiwi
+  id: CS:FDUSD-USD
 - source_id: binance
   id: fdusdusdc
   routes:
diff --git a/signals/CS/FET-USD.yaml b/signals/CS/FET-USD.yaml
index 74b1a6a..d3dfd0e 100644
--- a/signals/CS/FET-USD.yaml
+++ b/signals/CS/FET-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FET-USD
+- source_id: band/kiwi
+  id: CS:FET-USD
 - source_id: binance
   id: fetusdc
   routes:
@@ -16,6 +20,11 @@ sources:
     operation: '*'
 - source_id: coinbase
   id: FET-USD
+- source_id: coinbase
+  id: FET-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: fetch-ai
 - source_id: kraken
diff --git a/signals/CS/FF-USD.yaml b/signals/CS/FF-USD.yaml
index c9efde0..e1e6cc1 100644
--- a/signals/CS/FF-USD.yaml
+++ b/signals/CS/FF-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FF-USD
+- source_id: band/kiwi
+  id: CS:FF-USD
 - source_id: binance
   id: ffusdc
   routes:
diff --git a/signals/CS/FIL-USD.yaml b/signals/CS/FIL-USD.yaml
index c9fbdae..da5ecba 100644
--- a/signals/CS/FIL-USD.yaml
+++ b/signals/CS/FIL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FIL-USD
+- source_id: band/kiwi
+  id: CS:FIL-USD
 - source_id: binance
   id: filusdc
   routes:
@@ -9,6 +13,13 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bitfinex
+  id: tFILUSD
+- source_id: bybit
+  id: FILUSDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: bybit
   id: FILUSDT
   routes:
@@ -23,6 +34,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: FIL/USD
 - source_id: okx
   id: FIL-USDT
   routes:
diff --git a/signals/CS/FLOKI-USD.yaml b/signals/CS/FLOKI-USD.yaml
index ecc7227..a34c7e7 100644
--- a/signals/CS/FLOKI-USD.yaml
+++ b/signals/CS/FLOKI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FLOKI-USD
+- source_id: band/kiwi
+  id: CS:FLOKI-USD
 - source_id: binance
   id: flokiusdc
   routes:
diff --git a/signals/CS/FLOW-USD.yaml b/signals/CS/FLOW-USD.yaml
index 1b5c9e7..e08ad89 100644
--- a/signals/CS/FLOW-USD.yaml
+++ b/signals/CS/FLOW-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FLOW-USD
+- source_id: band/kiwi
+  id: CS:FLOW-USD
 - source_id: binance
   id: flowusdt
   routes:
diff --git a/signals/CS/FLR-USD.yaml b/signals/CS/FLR-USD.yaml
index 54aea44..2aa3b4c 100644
--- a/signals/CS/FLR-USD.yaml
+++ b/signals/CS/FLR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FLR-USD
+- source_id: band/kiwi
+  id: CS:FLR-USD
 - source_id: bybit
   id: FLRUSDT
   routes:
diff --git a/signals/CS/FORM-USD.yaml b/signals/CS/FORM-USD.yaml
index c58bf44..42a0677 100644
--- a/signals/CS/FORM-USD.yaml
+++ b/signals/CS/FORM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:FORM-USD
+- source_id: band/kiwi
+  id: CS:FORM-USD
 - source_id: binance
   id: formusdc
   routes:
diff --git a/signals/CS/GALA-USD.yaml b/signals/CS/GALA-USD.yaml
index 974ae0c..22969ec 100644
--- a/signals/CS/GALA-USD.yaml
+++ b/signals/CS/GALA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:GALA-USD
+- source_id: band/kiwi
+  id: CS:GALA-USD
 - source_id: binance
   id: galausdc
   routes:
diff --git a/signals/CS/GAS-USD.yaml b/signals/CS/GAS-USD.yaml
index 582e2d8..a5b65ad 100644
--- a/signals/CS/GAS-USD.yaml
+++ b/signals/CS/GAS-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:GAS-USD
+- source_id: band/kiwi
+  id: CS:GAS-USD
 - source_id: binance
   id: gasusdt
   routes:
diff --git a/signals/CS/GLMR-USD.yaml b/signals/CS/GLMR-USD.yaml
index 3aaacdd..eeb55b2 100644
--- a/signals/CS/GLMR-USD.yaml
+++ b/signals/CS/GLMR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:GLMR-USD
+- source_id: band/kiwi
+  id: CS:GLMR-USD
 - source_id: binance
   id: glmrusdt
   routes:
diff --git a/signals/CS/GRASS-USD.yaml b/signals/CS/GRASS-USD.yaml
index 37c18c3..b170318 100644
--- a/signals/CS/GRASS-USD.yaml
+++ b/signals/CS/GRASS-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:GRASS-USD
+- source_id: band/kiwi
+  id: CS:GRASS-USD
 - source_id: bybit
   id: GRASSUSDT
   routes:
diff --git a/signals/CS/GRT-USD.yaml b/signals/CS/GRT-USD.yaml
index e75f690..7cb5bbe 100644
--- a/signals/CS/GRT-USD.yaml
+++ b/signals/CS/GRT-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:GRT-USD
+- source_id: band/kiwi
+  id: CS:GRT-USD
 - source_id: binance
   id: grtusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: GRTUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: GRT-USD
 - source_id: coingecko
diff --git a/signals/CS/HBAR-USD.yaml b/signals/CS/HBAR-USD.yaml
index e45fd0c..73b69e8 100644
--- a/signals/CS/HBAR-USD.yaml
+++ b/signals/CS/HBAR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:HBAR-USD
+- source_id: band/kiwi
+  id: CS:HBAR-USD
 - source_id: binance
   id: hbarusdc
   routes:
diff --git a/signals/CS/ICP-USD.yaml b/signals/CS/ICP-USD.yaml
index 8b1eec1..2d5b284 100644
--- a/signals/CS/ICP-USD.yaml
+++ b/signals/CS/ICP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ICP-USD
+- source_id: band/kiwi
+  id: CS:ICP-USD
 - source_id: binance
   id: icpusdc
   routes:
@@ -9,6 +13,11 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ICPUSDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: bybit
   id: ICPUSDT
   routes:
@@ -16,6 +25,11 @@ sources:
     operation: '*'
 - source_id: coinbase
   id: ICP-USD
+- source_id: coinbase
+  id: ICP-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: internet-computer
 - source_id: htx
@@ -23,6 +37,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: ICP/USD
 - source_id: okx
   id: ICP-USDT
   routes:
diff --git a/signals/CS/ICX-USD.yaml b/signals/CS/ICX-USD.yaml
index 9f1d44d..89c0a68 100644
--- a/signals/CS/ICX-USD.yaml
+++ b/signals/CS/ICX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ICX-USD
+- source_id: band/kiwi
+  id: CS:ICX-USD
 - source_id: binance
   id: icxusdt
   routes:
diff --git a/signals/CS/IMX-USD.yaml b/signals/CS/IMX-USD.yaml
index 99e4938..870e669 100644
--- a/signals/CS/IMX-USD.yaml
+++ b/signals/CS/IMX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:IMX-USD
+- source_id: band/kiwi
+  id: CS:IMX-USD
 - source_id: binance
   id: imxusdt
   routes:
diff --git a/signals/CS/INJ-USD.yaml b/signals/CS/INJ-USD.yaml
index 4baa861..a1cc899 100644
--- a/signals/CS/INJ-USD.yaml
+++ b/signals/CS/INJ-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:INJ-USD
+- source_id: band/kiwi
+  id: CS:INJ-USD
 - source_id: binance
   id: injusdc
   routes:
@@ -14,6 +18,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: INJ-USD
 - source_id: coingecko
   id: injective-protocol
 - source_id: htx
diff --git a/signals/CS/IOTA-USD.yaml b/signals/CS/IOTA-USD.yaml
index d195999..c7e8ba9 100644
--- a/signals/CS/IOTA-USD.yaml
+++ b/signals/CS/IOTA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:IOTA-USD
+- source_id: band/kiwi
+  id: CS:IOTA-USD
 - source_id: binance
   id: iotausdt
   routes:
diff --git a/signals/CS/IOTX-USD.yaml b/signals/CS/IOTX-USD.yaml
index 5e0d3b0..9d8dc64 100644
--- a/signals/CS/IOTX-USD.yaml
+++ b/signals/CS/IOTX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:IOTX-USD
+- source_id: band/kiwi
+  id: CS:IOTX-USD
 - source_id: binance
   id: iotxusdt
   routes:
diff --git a/signals/CS/IP-USD.yaml b/signals/CS/IP-USD.yaml
index 4e7b41d..2053b71 100644
--- a/signals/CS/IP-USD.yaml
+++ b/signals/CS/IP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:IP-USD
+- source_id: band/kiwi
+  id: CS:IP-USD
 - source_id: bybit
   id: IPUSDT
   routes:
diff --git a/signals/CS/JASMY-USD.yaml b/signals/CS/JASMY-USD.yaml
index 44892d0..cdd3e77 100644
--- a/signals/CS/JASMY-USD.yaml
+++ b/signals/CS/JASMY-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:JASMY-USD
+- source_id: band/kiwi
+  id: CS:JASMY-USD
 - source_id: binance
   id: jasmyusdt
   routes:
diff --git a/signals/CS/JST-USD.yaml b/signals/CS/JST-USD.yaml
index 05ce3be..1dbd2ef 100644
--- a/signals/CS/JST-USD.yaml
+++ b/signals/CS/JST-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:JST-USD
+- source_id: band/kiwi
+  id: CS:JST-USD
 - source_id: binance
   id: jstusdt
   routes:
diff --git a/signals/CS/JTO-USD.yaml b/signals/CS/JTO-USD.yaml
index 920d1b2..92b5211 100644
--- a/signals/CS/JTO-USD.yaml
+++ b/signals/CS/JTO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:JTO-USD
+- source_id: band/kiwi
+  id: CS:JTO-USD
 - source_id: binance
   id: jtousdt
   routes:
@@ -9,6 +13,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: JTO-USD
 - source_id: coingecko
   id: jito-governance-token
 - source_id: htx
diff --git a/signals/CS/JUP-USD.yaml b/signals/CS/JUP-USD.yaml
index 207ae62..824e565 100644
--- a/signals/CS/JUP-USD.yaml
+++ b/signals/CS/JUP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:JUP-USD
+- source_id: band/kiwi
+  id: CS:JUP-USD
 - source_id: binance
   id: jupusdc
   routes:
diff --git a/signals/CS/KAIA-USD.yaml b/signals/CS/KAIA-USD.yaml
index 1761b63..67721ca 100644
--- a/signals/CS/KAIA-USD.yaml
+++ b/signals/CS/KAIA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KAIA-USD
+- source_id: band/kiwi
+  id: CS:KAIA-USD
 - source_id: binance
   id: kaiausdt
   routes:
diff --git a/signals/CS/KAITO-USD.yaml b/signals/CS/KAITO-USD.yaml
index 217d785..9dbbcce 100644
--- a/signals/CS/KAITO-USD.yaml
+++ b/signals/CS/KAITO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KAITO-USD
+- source_id: band/kiwi
+  id: CS:KAITO-USD
 - source_id: binance
   id: kaitousdc
   routes:
@@ -13,6 +17,11 @@ sources:
   id: KAITO-USD
 - source_id: coingecko
   id: kaito
+- source_id: htx
+  id: kaitousdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: okx
   id: KAITO-USDT
   routes:
diff --git a/signals/CS/KAS-USD.yaml b/signals/CS/KAS-USD.yaml
index 454efb0..213adc5 100644
--- a/signals/CS/KAS-USD.yaml
+++ b/signals/CS/KAS-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KAS-USD
+- source_id: band/kiwi
+  id: CS:KAS-USD
 - source_id: bybit
   id: KASUSDT
   routes:
@@ -8,3 +12,8 @@ sources:
   id: kaspa
 - source_id: kraken
   id: KAS/USD
+- source_id: kraken
+  id: KAS/USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/KAVA-USD.yaml b/signals/CS/KAVA-USD.yaml
index 916c5a2..211b714 100644
--- a/signals/CS/KAVA-USD.yaml
+++ b/signals/CS/KAVA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KAVA-USD
+- source_id: band/kiwi
+  id: CS:KAVA-USD
 - source_id: binance
   id: kavausdt
   routes:
diff --git a/signals/CS/KMNO-USD.yaml b/signals/CS/KMNO-USD.yaml
index 95e9f03..818ecbf 100644
--- a/signals/CS/KMNO-USD.yaml
+++ b/signals/CS/KMNO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KMNO-USD
+- source_id: band/kiwi
+  id: CS:KMNO-USD
 - source_id: binance
   id: kmnousdt
   routes:
diff --git a/signals/CS/KNC-USD.yaml b/signals/CS/KNC-USD.yaml
index ee1035a..c71f0c2 100644
--- a/signals/CS/KNC-USD.yaml
+++ b/signals/CS/KNC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KNC-USD
+- source_id: band/kiwi
+  id: CS:KNC-USD
 - source_id: binance
   id: kncusdt
   routes:
@@ -11,3 +15,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: KNC-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/KSM-USD.yaml b/signals/CS/KSM-USD.yaml
index 287b8fb..53613d2 100644
--- a/signals/CS/KSM-USD.yaml
+++ b/signals/CS/KSM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:KSM-USD
+- source_id: band/kiwi
+  id: CS:KSM-USD
 - source_id: binance
   id: ksmusdt
   routes:
diff --git a/signals/CS/LDO-USD.yaml b/signals/CS/LDO-USD.yaml
index 54aadea..5d116ab 100644
--- a/signals/CS/LDO-USD.yaml
+++ b/signals/CS/LDO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:LDO-USD
+- source_id: band/kiwi
+  id: CS:LDO-USD
 - source_id: binance
   id: ldousdc
   routes:
@@ -23,6 +27,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: LDO/USD
 - source_id: okx
   id: LDO-USDT
   routes:
diff --git a/signals/CS/LINEA-USD.yaml b/signals/CS/LINEA-USD.yaml
index b9f903e..97a3521 100644
--- a/signals/CS/LINEA-USD.yaml
+++ b/signals/CS/LINEA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:LINEA-USD
+- source_id: band/kiwi
+  id: CS:LINEA-USD
 - source_id: binance
   id: lineausdc
   routes:
@@ -14,6 +18,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: LINEA-USD
 - source_id: coingecko
   id: linea
 - source_id: htx
diff --git a/signals/CS/LINK-USD.yaml b/signals/CS/LINK-USD.yaml
index da89d22..3976682 100644
--- a/signals/CS/LINK-USD.yaml
+++ b/signals/CS/LINK-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:LINK-USD
+- source_id: band/kiwi
+  id: CS:LINK-USD
 - source_id: binance
   id: linkusdc
   routes:
diff --git a/signals/CS/LPT-USD.yaml b/signals/CS/LPT-USD.yaml
index 3688cf5..8f65686 100644
--- a/signals/CS/LPT-USD.yaml
+++ b/signals/CS/LPT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:LPT-USD
+- source_id: band/kiwi
+  id: CS:LPT-USD
 - source_id: binance
   id: lptusdt
   routes:
@@ -11,3 +15,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: LPT-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/LTC-USD.yaml b/signals/CS/LTC-USD.yaml
index 27cc4b4..3349ad9 100644
--- a/signals/CS/LTC-USD.yaml
+++ b/signals/CS/LTC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:LTC-USD
+- source_id: band/kiwi
+  id: CS:LTC-USD
 - source_id: binance
   id: ltcusdc
   routes:
diff --git a/signals/CS/MANA-USD.yaml b/signals/CS/MANA-USD.yaml
index e4858fb..44ed329 100644
--- a/signals/CS/MANA-USD.yaml
+++ b/signals/CS/MANA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MANA-USD
+- source_id: band/kiwi
+  id: CS:MANA-USD
 - source_id: binance
   id: manausdt
   routes:
@@ -18,6 +22,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: MANA/USD
 - source_id: okx
   id: MANA-USDT
   routes:
diff --git a/signals/CS/MERL-USD.yaml b/signals/CS/MERL-USD.yaml
index 796c49d..df17396 100644
--- a/signals/CS/MERL-USD.yaml
+++ b/signals/CS/MERL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MERL-USD
+- source_id: band/kiwi
+  id: CS:MERL-USD
 - source_id: bybit
   id: MERLUSDT
   routes:
diff --git a/signals/CS/MEW-USD.yaml b/signals/CS/MEW-USD.yaml
index 25c6be3..0b05c83 100644
--- a/signals/CS/MEW-USD.yaml
+++ b/signals/CS/MEW-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MEW-USD
+- source_id: band/kiwi
+  id: CS:MEW-USD
 - source_id: coingecko
   id: cat-in-a-dogs-world
 - source_id: htx
diff --git a/signals/CS/MINA-USD.yaml b/signals/CS/MINA-USD.yaml
index bc647ef..ec41294 100644
--- a/signals/CS/MINA-USD.yaml
+++ b/signals/CS/MINA-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:MINA-USD
+- source_id: band/kiwi
+  id: CS:MINA-USD
 - source_id: binance
   id: minausdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: MINAUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: MINA-USD
 - source_id: coingecko
@@ -13,6 +22,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: MINA/USD
 - source_id: okx
   id: MINA-USDT
   routes:
diff --git a/signals/CS/MNT-USD.yaml b/signals/CS/MNT-USD.yaml
index e985345..9109074 100644
--- a/signals/CS/MNT-USD.yaml
+++ b/signals/CS/MNT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MNT-USD
+- source_id: band/kiwi
+  id: CS:MNT-USD
 - source_id: bybit
   id: MNTUSDC
   routes:
diff --git a/signals/CS/MOCA-USD.yaml b/signals/CS/MOCA-USD.yaml
index 9027f30..1dcffbf 100644
--- a/signals/CS/MOCA-USD.yaml
+++ b/signals/CS/MOCA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MOCA-USD
+- source_id: band/kiwi
+  id: CS:MOCA-USD
 - source_id: bybit
   id: MOCAUSDT
   routes:
diff --git a/signals/CS/MOG-USD.yaml b/signals/CS/MOG-USD.yaml
index 4cbf942..0ed0ea8 100644
--- a/signals/CS/MOG-USD.yaml
+++ b/signals/CS/MOG-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MOG-USD
+- source_id: band/kiwi
+  id: CS:MOG-USD
 - source_id: bybit
   id: MOGUSDT
   routes:
diff --git a/signals/CS/MORPHO-USD.yaml b/signals/CS/MORPHO-USD.yaml
index d080f21..965b211 100644
--- a/signals/CS/MORPHO-USD.yaml
+++ b/signals/CS/MORPHO-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:MORPHO-USD
+- source_id: band/kiwi
+  id: CS:MORPHO-USD
+- source_id: binance
+  id: morphousdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: morphousdt
   routes:
@@ -16,3 +25,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: htx
+  id: morphousdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/MOVE-USD.yaml b/signals/CS/MOVE-USD.yaml
index 6ec2246..e993957 100644
--- a/signals/CS/MOVE-USD.yaml
+++ b/signals/CS/MOVE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MOVE-USD
+- source_id: band/kiwi
+  id: CS:MOVE-USD
 - source_id: binance
   id: moveusdt
   routes:
diff --git a/signals/CS/MOVR-USD.yaml b/signals/CS/MOVR-USD.yaml
index e52addf..61c6976 100644
--- a/signals/CS/MOVR-USD.yaml
+++ b/signals/CS/MOVR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:MOVR-USD
+- source_id: band/kiwi
+  id: CS:MOVR-USD
 - source_id: binance
   id: movrusdt
   routes:
diff --git a/signals/CS/NEAR-USD.yaml b/signals/CS/NEAR-USD.yaml
index e0e6958..07f9dd9 100644
--- a/signals/CS/NEAR-USD.yaml
+++ b/signals/CS/NEAR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:NEAR-USD
+- source_id: band/kiwi
+  id: CS:NEAR-USD
 - source_id: binance
   id: nearusdc
   routes:
@@ -23,6 +27,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: NEAR/USD
 - source_id: okx
   id: NEAR-USDT
   routes:
diff --git a/signals/CS/NEO-USD.yaml b/signals/CS/NEO-USD.yaml
index c297577..f1d5fef 100644
--- a/signals/CS/NEO-USD.yaml
+++ b/signals/CS/NEO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:NEO-USD
+- source_id: band/kiwi
+  id: CS:NEO-USD
 - source_id: binance
   id: neousdc
   routes:
diff --git a/signals/CS/NEXO-USD.yaml b/signals/CS/NEXO-USD.yaml
index 9621838..993a430 100644
--- a/signals/CS/NEXO-USD.yaml
+++ b/signals/CS/NEXO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:NEXO-USD
+- source_id: band/kiwi
+  id: CS:NEXO-USD
 - source_id: binance
   id: nexousdt
   routes:
diff --git a/signals/CS/NFT-USD.yaml b/signals/CS/NFT-USD.yaml
index c9a2978..04aef3c 100644
--- a/signals/CS/NFT-USD.yaml
+++ b/signals/CS/NFT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:NFT-USD
+- source_id: band/kiwi
+  id: CS:NFT-USD
 - source_id: coingecko
   id: apenft
 - source_id: htx
diff --git a/signals/CS/NTRN-USD.yaml b/signals/CS/NTRN-USD.yaml
new file mode 100644
index 0000000..2c3c4d1
--- /dev/null
+++ b/signals/CS/NTRN-USD.yaml
@@ -0,0 +1,12 @@
+sources:
+- source_id: band/macaw
+  id: CS:NTRN-USD
+- source_id: band/kiwi
+  id: CS:NTRN-USD
+- source_id: binance
+  id: ntrnusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
+- source_id: coingecko
+  id: neutron-3
diff --git a/signals/CS/OKB-USD.yaml b/signals/CS/OKB-USD.yaml
new file mode 100644
index 0000000..723d589
--- /dev/null
+++ b/signals/CS/OKB-USD.yaml
@@ -0,0 +1,12 @@
+sources:
+- source_id: band/macaw
+  id: CS:OKB-USD
+- source_id: band/kiwi
+  id: CS:OKB-USD
+- source_id: coingecko
+  id: okb
+- source_id: okx
+  id: OKB-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/OM-USD.yaml b/signals/CS/OM-USD.yaml
index 03898fb..f39232b 100644
--- a/signals/CS/OM-USD.yaml
+++ b/signals/CS/OM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:OM-USD
+- source_id: band/kiwi
+  id: CS:OM-USD
 - source_id: binance
   id: omusdc
   routes:
diff --git a/signals/CS/ONDO-USD.yaml b/signals/CS/ONDO-USD.yaml
index 6bfb3f7..c4d7980 100644
--- a/signals/CS/ONDO-USD.yaml
+++ b/signals/CS/ONDO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ONDO-USD
+- source_id: band/kiwi
+  id: CS:ONDO-USD
 - source_id: binance
   id: ondousdc
   routes:
diff --git a/signals/CS/ONE-USD.yaml b/signals/CS/ONE-USD.yaml
index bc60a8b..213f055 100644
--- a/signals/CS/ONE-USD.yaml
+++ b/signals/CS/ONE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ONE-USD
+- source_id: band/kiwi
+  id: CS:ONE-USD
 - source_id: binance
   id: oneusdt
   routes:
diff --git a/signals/CS/OP-USD.yaml b/signals/CS/OP-USD.yaml
index bb8ac90..8cf0f9c 100644
--- a/signals/CS/OP-USD.yaml
+++ b/signals/CS/OP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:OP-USD
+- source_id: band/kiwi
+  id: CS:OP-USD
 - source_id: binance
   id: opusdc
   routes:
@@ -23,6 +27,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: OP/USD
 - source_id: okx
   id: OP-USDT
   routes:
diff --git a/signals/CS/OSMO-USD.yaml b/signals/CS/OSMO-USD.yaml
index ecd4c16..7dcef37 100644
--- a/signals/CS/OSMO-USD.yaml
+++ b/signals/CS/OSMO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:OSMO-USD
+- source_id: band/kiwi
+  id: CS:OSMO-USD
 - source_id: coinbase
   id: OSMO-USD
 - source_id: coingecko
diff --git a/signals/CS/PAXG-USD.yaml b/signals/CS/PAXG-USD.yaml
index 702b024..8ca7034 100644
--- a/signals/CS/PAXG-USD.yaml
+++ b/signals/CS/PAXG-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PAXG-USD
+- source_id: band/kiwi
+  id: CS:PAXG-USD
 - source_id: binance
   id: paxgusdc
   routes:
diff --git a/signals/CS/PENDLE-USD.yaml b/signals/CS/PENDLE-USD.yaml
index fcf4639..e23294c 100644
--- a/signals/CS/PENDLE-USD.yaml
+++ b/signals/CS/PENDLE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PENDLE-USD
+- source_id: band/kiwi
+  id: CS:PENDLE-USD
 - source_id: binance
   id: pendleusdc
   routes:
diff --git a/signals/CS/PENGU-USD.yaml b/signals/CS/PENGU-USD.yaml
index 990510c..3c4c984 100644
--- a/signals/CS/PENGU-USD.yaml
+++ b/signals/CS/PENGU-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PENGU-USD
+- source_id: band/kiwi
+  id: CS:PENGU-USD
 - source_id: binance
   id: penguusdc
   routes:
diff --git a/signals/CS/PEPE-USD.yaml b/signals/CS/PEPE-USD.yaml
index fb7ff80..519d913 100644
--- a/signals/CS/PEPE-USD.yaml
+++ b/signals/CS/PEPE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PEPE-USD
+- source_id: band/kiwi
+  id: CS:PEPE-USD
 - source_id: binance
   id: pepeusdc
   routes:
diff --git a/signals/CS/PLUME-USD.yaml b/signals/CS/PLUME-USD.yaml
index 35abdfd..d7dcf78 100644
--- a/signals/CS/PLUME-USD.yaml
+++ b/signals/CS/PLUME-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PLUME-USD
+- source_id: band/kiwi
+  id: CS:PLUME-USD
 - source_id: binance
   id: plumeusdc
   routes:
diff --git a/signals/CS/PNUT-USD.yaml b/signals/CS/PNUT-USD.yaml
index d1891c8..7a86c57 100644
--- a/signals/CS/PNUT-USD.yaml
+++ b/signals/CS/PNUT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PNUT-USD
+- source_id: band/kiwi
+  id: CS:PNUT-USD
 - source_id: binance
   id: pnutusdc
   routes:
diff --git a/signals/CS/POL-USD.yaml b/signals/CS/POL-USD.yaml
index 9db9f8c..939b16d 100644
--- a/signals/CS/POL-USD.yaml
+++ b/signals/CS/POL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:POL-USD
+- source_id: band/kiwi
+  id: CS:POL-USD
 - source_id: binance
   id: polusdc
   routes:
diff --git a/signals/CS/POPCAT-USD.yaml b/signals/CS/POPCAT-USD.yaml
index f554390..2ba9909 100644
--- a/signals/CS/POPCAT-USD.yaml
+++ b/signals/CS/POPCAT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:POPCAT-USD
+- source_id: band/kiwi
+  id: CS:POPCAT-USD
 - source_id: bybit
   id: POPCATUSDT
   routes:
diff --git a/signals/CS/PUMP-USD.yaml b/signals/CS/PUMP-USD.yaml
index 01a34be..99b4182 100644
--- a/signals/CS/PUMP-USD.yaml
+++ b/signals/CS/PUMP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PUMP-USD
+- source_id: band/kiwi
+  id: CS:PUMP-USD
 - source_id: binance
   id: pumpusdc
   routes:
diff --git a/signals/CS/PYTH-USD.yaml b/signals/CS/PYTH-USD.yaml
index 10afba1..1ce27d9 100644
--- a/signals/CS/PYTH-USD.yaml
+++ b/signals/CS/PYTH-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:PYTH-USD
+- source_id: band/kiwi
+  id: CS:PYTH-USD
 - source_id: binance
   id: pythusdc
   routes:
diff --git a/signals/CS/PYUSD-USD.yaml b/signals/CS/PYUSD-USD.yaml
new file mode 100644
index 0000000..0fd7b0f
--- /dev/null
+++ b/signals/CS/PYUSD-USD.yaml
@@ -0,0 +1,12 @@
+sources:
+- source_id: band/macaw
+  id: CS:PYUSD-USD
+- source_id: band/kiwi
+  id: CS:PYUSD-USD
+- source_id: coingecko
+  id: paypal-usd
+- source_id: okx
+  id: PYUSD-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/QTUM-USD.yaml b/signals/CS/QTUM-USD.yaml
index 0350235..e3865f1 100644
--- a/signals/CS/QTUM-USD.yaml
+++ b/signals/CS/QTUM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:QTUM-USD
+- source_id: band/kiwi
+  id: CS:QTUM-USD
 - source_id: binance
   id: qtumusdt
   routes:
diff --git a/signals/CS/RAY-USD.yaml b/signals/CS/RAY-USD.yaml
index 4619b83..ad96b90 100644
--- a/signals/CS/RAY-USD.yaml
+++ b/signals/CS/RAY-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:RAY-USD
+- source_id: band/kiwi
+  id: CS:RAY-USD
 - source_id: binance
   id: rayusdc
   routes:
@@ -16,3 +20,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: RAY-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/RENDER-USD.yaml b/signals/CS/RENDER-USD.yaml
index 9f8aafb..8b67a31 100644
--- a/signals/CS/RENDER-USD.yaml
+++ b/signals/CS/RENDER-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:RENDER-USD
+- source_id: band/kiwi
+  id: CS:RENDER-USD
 - source_id: binance
   id: renderusdc
   routes:
@@ -23,3 +27,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: RENDER-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/RLUSD-USD.yaml b/signals/CS/RLUSD-USD.yaml
new file mode 100644
index 0000000..cc53129
--- /dev/null
+++ b/signals/CS/RLUSD-USD.yaml
@@ -0,0 +1,24 @@
+sources:
+- source_id: band/macaw
+  id: CS:RLUSD-USD
+- source_id: band/kiwi
+  id: CS:RLUSD-USD
+- source_id: bybit
+  id: RLUSDUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
+- source_id: coingecko
+  id: ripple-usd
+- source_id: kraken
+  id: RLUSD/USD
+- source_id: kraken
+  id: RLUSD/USDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
+- source_id: kraken
+  id: RLUSD/USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/ROSE-USD.yaml b/signals/CS/ROSE-USD.yaml
index 982286e..79885a1 100644
--- a/signals/CS/ROSE-USD.yaml
+++ b/signals/CS/ROSE-USD.yaml
@@ -1,10 +1,29 @@
 sources:
+- source_id: band/macaw
+  id: CS:ROSE-USD
+- source_id: band/kiwi
+  id: CS:ROSE-USD
+- source_id: binance
+  id: roseusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: roseusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ROSEUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: ROSE-USD
+- source_id: coinbase
+  id: ROSE-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: oasis-network
diff --git a/signals/CS/RSR-USD.yaml b/signals/CS/RSR-USD.yaml
index 1f3769b..23a2435 100644
--- a/signals/CS/RSR-USD.yaml
+++ b/signals/CS/RSR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:RSR-USD
+- source_id: band/kiwi
+  id: CS:RSR-USD
 - source_id: binance
   id: rsrusdt
   routes:
diff --git a/signals/CS/RUNE-USD.yaml b/signals/CS/RUNE-USD.yaml
index 72eb1ce..4ca601c 100644
--- a/signals/CS/RUNE-USD.yaml
+++ b/signals/CS/RUNE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:RUNE-USD
+- source_id: band/kiwi
+  id: CS:RUNE-USD
 - source_id: binance
   id: runeusdc
   routes:
diff --git a/signals/CS/S-USD.yaml b/signals/CS/S-USD.yaml
index 6476209..14f9cb5 100644
--- a/signals/CS/S-USD.yaml
+++ b/signals/CS/S-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:S-USD
+- source_id: band/kiwi
+  id: CS:S-USD
 - source_id: binance
   id: susdc
   routes:
diff --git a/signals/CS/SAND-USD.yaml b/signals/CS/SAND-USD.yaml
index b4fecff..8459c19 100644
--- a/signals/CS/SAND-USD.yaml
+++ b/signals/CS/SAND-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SAND-USD
+- source_id: band/kiwi
+  id: CS:SAND-USD
 - source_id: binance
   id: sandusdt
   routes:
@@ -18,6 +22,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: SAND/USD
 - source_id: okx
   id: SAND-USDT
   routes:
diff --git a/signals/CS/SCRT-USD.yaml b/signals/CS/SCRT-USD.yaml
index e6e5b42..a080ec2 100644
--- a/signals/CS/SCRT-USD.yaml
+++ b/signals/CS/SCRT-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:SCRT-USD
+- source_id: band/kiwi
+  id: CS:SCRT-USD
 - source_id: binance
   id: scrtusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: SCRTUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: secret
 - source_id: htx
diff --git a/signals/CS/SEI-USD.yaml b/signals/CS/SEI-USD.yaml
index 778b3df..015c9c2 100644
--- a/signals/CS/SEI-USD.yaml
+++ b/signals/CS/SEI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SEI-USD
+- source_id: band/kiwi
+  id: CS:SEI-USD
 - source_id: binance
   id: seiusdc
   routes:
diff --git a/signals/CS/SHIB-USD.yaml b/signals/CS/SHIB-USD.yaml
index 9765415..1e64853 100644
--- a/signals/CS/SHIB-USD.yaml
+++ b/signals/CS/SHIB-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SHIB-USD
+- source_id: band/kiwi
+  id: CS:SHIB-USD
 - source_id: binance
   id: shibusdc
   routes:
diff --git a/signals/CS/SKY-USD.yaml b/signals/CS/SKY-USD.yaml
index 57cf1b2..e795db3 100644
--- a/signals/CS/SKY-USD.yaml
+++ b/signals/CS/SKY-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SKY-USD
+- source_id: band/kiwi
+  id: CS:SKY-USD
 - source_id: binance
   id: skyusdt
   routes:
diff --git a/signals/CS/SNEK-USD.yaml b/signals/CS/SNEK-USD.yaml
index afacaba..b9a259f 100644
--- a/signals/CS/SNEK-USD.yaml
+++ b/signals/CS/SNEK-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SNEK-USD
+- source_id: band/kiwi
+  id: CS:SNEK-USD
 - source_id: coingecko
   id: snek
 - source_id: htx
diff --git a/signals/CS/SNX-USD.yaml b/signals/CS/SNX-USD.yaml
index 14ae4e9..3d5c97d 100644
--- a/signals/CS/SNX-USD.yaml
+++ b/signals/CS/SNX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SNX-USD
+- source_id: band/kiwi
+  id: CS:SNX-USD
 - source_id: binance
   id: snxusdt
   routes:
@@ -8,6 +12,11 @@ sources:
   id: SNX-USD
 - source_id: coingecko
   id: havven
+- source_id: htx
+  id: snxusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: okx
   id: SNX-USDT
   routes:
diff --git a/signals/CS/SOL-USD.yaml b/signals/CS/SOL-USD.yaml
index 8494445..723a9b0 100644
--- a/signals/CS/SOL-USD.yaml
+++ b/signals/CS/SOL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SOL-USD
+- source_id: band/kiwi
+  id: CS:SOL-USD
 - source_id: binance
   id: solusdc
   routes:
diff --git a/signals/CS/SPX-USD.yaml b/signals/CS/SPX-USD.yaml
index 248faf9..ead367e 100644
--- a/signals/CS/SPX-USD.yaml
+++ b/signals/CS/SPX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SPX-USD
+- source_id: band/kiwi
+  id: CS:SPX-USD
 - source_id: bybit
   id: SPXUSDT
   routes:
diff --git a/signals/CS/STRK-USD.yaml b/signals/CS/STRK-USD.yaml
index 2fed66e..561b94f 100644
--- a/signals/CS/STRK-USD.yaml
+++ b/signals/CS/STRK-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:STRK-USD
+- source_id: band/kiwi
+  id: CS:STRK-USD
 - source_id: binance
   id: strkusdc
   routes:
diff --git a/signals/CS/STX-USD.yaml b/signals/CS/STX-USD.yaml
index 4e92e3d..bf5f385 100644
--- a/signals/CS/STX-USD.yaml
+++ b/signals/CS/STX-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:STX-USD
+- source_id: band/kiwi
+  id: CS:STX-USD
 - source_id: binance
   id: stxusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: STXUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: STX-USD
 - source_id: coingecko
diff --git a/signals/CS/SUI-USD.yaml b/signals/CS/SUI-USD.yaml
index f58efbe..5af3a6c 100644
--- a/signals/CS/SUI-USD.yaml
+++ b/signals/CS/SUI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SUI-USD
+- source_id: band/kiwi
+  id: CS:SUI-USD
 - source_id: binance
   id: suiusdc
   routes:
diff --git a/signals/CS/SUN-USD.yaml b/signals/CS/SUN-USD.yaml
index e837d06..c639cf3 100644
--- a/signals/CS/SUN-USD.yaml
+++ b/signals/CS/SUN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SUN-USD
+- source_id: band/kiwi
+  id: CS:SUN-USD
 - source_id: binance
   id: sunusdt
   routes:
diff --git a/signals/CS/SUPER-USD.yaml b/signals/CS/SUPER-USD.yaml
index 4433924..e294b90 100644
--- a/signals/CS/SUPER-USD.yaml
+++ b/signals/CS/SUPER-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SUPER-USD
+- source_id: band/kiwi
+  id: CS:SUPER-USD
 - source_id: binance
   id: superusdt
   routes:
@@ -8,3 +12,8 @@ sources:
   id: SUPER-USD
 - source_id: coingecko
   id: superfarm
+- source_id: htx
+  id: superusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/SUSHI-USD.yaml b/signals/CS/SUSHI-USD.yaml
index 339c081..eee0891 100644
--- a/signals/CS/SUSHI-USD.yaml
+++ b/signals/CS/SUSHI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SUSHI-USD
+- source_id: band/kiwi
+  id: CS:SUSHI-USD
 - source_id: binance
   id: sushiusdt
   routes:
diff --git a/signals/CS/SYRUP-USD.yaml b/signals/CS/SYRUP-USD.yaml
index 1f1d08e..7bb00d4 100644
--- a/signals/CS/SYRUP-USD.yaml
+++ b/signals/CS/SYRUP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:SYRUP-USD
+- source_id: band/kiwi
+  id: CS:SYRUP-USD
 - source_id: binance
   id: syrupusdc
   routes:
@@ -18,3 +22,5 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: SYRUP/USD
diff --git a/signals/CS/TAO-USD.yaml b/signals/CS/TAO-USD.yaml
index 30c55ae..bbef9a6 100644
--- a/signals/CS/TAO-USD.yaml
+++ b/signals/CS/TAO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TAO-USD
+- source_id: band/kiwi
+  id: CS:TAO-USD
 - source_id: binance
   id: taousdc
   routes:
diff --git a/signals/CS/THETA-USD.yaml b/signals/CS/THETA-USD.yaml
index 50d42c3..c0d79ee 100644
--- a/signals/CS/THETA-USD.yaml
+++ b/signals/CS/THETA-USD.yaml
@@ -1,9 +1,23 @@
 sources:
+- source_id: band/macaw
+  id: CS:THETA-USD
+- source_id: band/kiwi
+  id: CS:THETA-USD
+- source_id: binance
+  id: thetausdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: thetausdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: THETAUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: theta-token
 - source_id: htx
@@ -11,3 +25,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: okx
+  id: THETA-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/TIA-USD.yaml b/signals/CS/TIA-USD.yaml
index a5dad89..bd70dae 100644
--- a/signals/CS/TIA-USD.yaml
+++ b/signals/CS/TIA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TIA-USD
+- source_id: band/kiwi
+  id: CS:TIA-USD
 - source_id: binance
   id: tiausdc
   routes:
diff --git a/signals/CS/TON-USD.yaml b/signals/CS/TON-USD.yaml
index e14534b..a52d391 100644
--- a/signals/CS/TON-USD.yaml
+++ b/signals/CS/TON-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TON-USD
+- source_id: band/kiwi
+  id: CS:TON-USD
 - source_id: binance
   id: tonusdc
   routes:
diff --git a/signals/CS/TOSHI-USD.yaml b/signals/CS/TOSHI-USD.yaml
index ea3358f..f7fcc56 100644
--- a/signals/CS/TOSHI-USD.yaml
+++ b/signals/CS/TOSHI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TOSHI-USD
+- source_id: band/kiwi
+  id: CS:TOSHI-USD
 - source_id: bybit
   id: TOSHIUSDT
   routes:
diff --git a/signals/CS/TRAC-USD.yaml b/signals/CS/TRAC-USD.yaml
index 3cea88f..dd80815 100644
--- a/signals/CS/TRAC-USD.yaml
+++ b/signals/CS/TRAC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TRAC-USD
+- source_id: band/kiwi
+  id: CS:TRAC-USD
 - source_id: coinbase
   id: TRAC-USD
 - source_id: coingecko
diff --git a/signals/CS/TRUMP-USD.yaml b/signals/CS/TRUMP-USD.yaml
index fb88ccc..45d0683 100644
--- a/signals/CS/TRUMP-USD.yaml
+++ b/signals/CS/TRUMP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TRUMP-USD
+- source_id: band/kiwi
+  id: CS:TRUMP-USD
 - source_id: binance
   id: trumpusdc
   routes:
diff --git a/signals/CS/TRX-USD.yaml b/signals/CS/TRX-USD.yaml
index 95cc374..7cd65b7 100644
--- a/signals/CS/TRX-USD.yaml
+++ b/signals/CS/TRX-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TRX-USD
+- source_id: band/kiwi
+  id: CS:TRX-USD
 - source_id: binance
   id: trxusdc
   routes:
diff --git a/signals/CS/TURBO-USD.yaml b/signals/CS/TURBO-USD.yaml
index f27b66f..facc26f 100644
--- a/signals/CS/TURBO-USD.yaml
+++ b/signals/CS/TURBO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TURBO-USD
+- source_id: band/kiwi
+  id: CS:TURBO-USD
 - source_id: binance
   id: turbousdt
   routes:
diff --git a/signals/CS/TUSD-USD.yaml b/signals/CS/TUSD-USD.yaml
new file mode 100644
index 0000000..35f572f
--- /dev/null
+++ b/signals/CS/TUSD-USD.yaml
@@ -0,0 +1,12 @@
+sources:
+- source_id: band/macaw
+  id: CS:TUSD-USD
+- source_id: band/kiwi
+  id: CS:TUSD-USD
+- source_id: binance
+  id: tusdusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
+- source_id: coingecko
+  id: true-usd
diff --git a/signals/CS/TWT-USD.yaml b/signals/CS/TWT-USD.yaml
index aa96019..dedde5b 100644
--- a/signals/CS/TWT-USD.yaml
+++ b/signals/CS/TWT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:TWT-USD
+- source_id: band/kiwi
+  id: CS:TWT-USD
 - source_id: binance
   id: twtusdc
   routes:
diff --git a/signals/CS/UNI-USD.yaml b/signals/CS/UNI-USD.yaml
index 7954fcb..56077ba 100644
--- a/signals/CS/UNI-USD.yaml
+++ b/signals/CS/UNI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:UNI-USD
+- source_id: band/kiwi
+  id: CS:UNI-USD
 - source_id: binance
   id: uniusdc
   routes:
@@ -14,6 +18,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: UNI-USD
 - source_id: coingecko
   id: uniswap
 - source_id: htx
diff --git a/signals/CS/USD1-USD.yaml b/signals/CS/USD1-USD.yaml
index 8349485..ae3e821 100644
--- a/signals/CS/USD1-USD.yaml
+++ b/signals/CS/USD1-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:USD1-USD
+- source_id: band/kiwi
+  id: CS:USD1-USD
 - source_id: binance
   id: usd1usdt
   routes:
diff --git a/signals/CS/USDC-USD.yaml b/signals/CS/USDC-USD.yaml
index 8c132f8..b100c35 100644
--- a/signals/CS/USDC-USD.yaml
+++ b/signals/CS/USDC-USD.yaml
@@ -1,4 +1,10 @@
 sources:
+- source_id: band/macaw
+  id: CS:USDC-USD
+- source_id: band/kiwi
+  id: CS:USDC-USD
+- source_id: bitfinex
+  id: tUDCUSD
 - source_id: coingecko
   id: usd-coin
 - source_id: kraken
diff --git a/signals/CS/USDE-USD.yaml b/signals/CS/USDE-USD.yaml
index aa8f1fb..25fbdc7 100644
--- a/signals/CS/USDE-USD.yaml
+++ b/signals/CS/USDE-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:USDE-USD
+- source_id: band/kiwi
+  id: CS:USDE-USD
 - source_id: binance
   id: usdeusdc
   routes:
diff --git a/signals/CS/USDT-USD.yaml b/signals/CS/USDT-USD.yaml
index 48e5326..55dd864 100644
--- a/signals/CS/USDT-USD.yaml
+++ b/signals/CS/USDT-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:USDT-USD
+- source_id: band/kiwi
+  id: CS:USDT-USD
 - source_id: bitfinex
   id: tUSTUSD
 - source_id: coinbase
diff --git a/signals/CS/USELESS-USD.yaml b/signals/CS/USELESS-USD.yaml
index ab3bd85..258b129 100644
--- a/signals/CS/USELESS-USD.yaml
+++ b/signals/CS/USELESS-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:USELESS-USD
+- source_id: band/kiwi
+  id: CS:USELESS-USD
 - source_id: coinbase
   id: USELESS-USD
 - source_id: coingecko
diff --git a/signals/CS/VELO-USD.yaml b/signals/CS/VELO-USD.yaml
index 788f880..2194957 100644
--- a/signals/CS/VELO-USD.yaml
+++ b/signals/CS/VELO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:VELO-USD
+- source_id: band/kiwi
+  id: CS:VELO-USD
 - source_id: bybit
   id: VELOUSDT
   routes:
diff --git a/signals/CS/VET-USD.yaml b/signals/CS/VET-USD.yaml
index a33dd6b..dfc8129 100644
--- a/signals/CS/VET-USD.yaml
+++ b/signals/CS/VET-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:VET-USD
+- source_id: band/kiwi
+  id: CS:VET-USD
+- source_id: binance
+  id: vetusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: vetusdt
   routes:
diff --git a/signals/CS/VIRTUAL-USD.yaml b/signals/CS/VIRTUAL-USD.yaml
index 1aa709c..6e3cf24 100644
--- a/signals/CS/VIRTUAL-USD.yaml
+++ b/signals/CS/VIRTUAL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:VIRTUAL-USD
+- source_id: band/kiwi
+  id: CS:VIRTUAL-USD
 - source_id: binance
   id: virtualusdc
   routes:
@@ -21,3 +25,10 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: VIRTUAL/USD
+- source_id: okx
+  id: VIRTUAL-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/W-USD.yaml b/signals/CS/W-USD.yaml
index 925af4d..bd60fb8 100644
--- a/signals/CS/W-USD.yaml
+++ b/signals/CS/W-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:W-USD
+- source_id: band/kiwi
+  id: CS:W-USD
 - source_id: binance
   id: wusdc
   routes:
diff --git a/signals/CS/WAN-USD.yaml b/signals/CS/WAN-USD.yaml
index 7262051..128d301 100644
--- a/signals/CS/WAN-USD.yaml
+++ b/signals/CS/WAN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:WAN-USD
+- source_id: band/kiwi
+  id: CS:WAN-USD
 - source_id: binance
   id: wanusdt
   routes:
diff --git a/signals/CS/WBTC-USD.yaml b/signals/CS/WBTC-USD.yaml
new file mode 100644
index 0000000..71cdd9f
--- /dev/null
+++ b/signals/CS/WBTC-USD.yaml
@@ -0,0 +1,12 @@
+sources:
+- source_id: band/macaw
+  id: CS:WBTC-USD
+- source_id: band/kiwi
+  id: CS:WBTC-USD
+- source_id: binance
+  id: wbtcusdt
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
+- source_id: coingecko
+  id: wrapped-bitcoin
diff --git a/signals/CS/WIF-USD.yaml b/signals/CS/WIF-USD.yaml
index 99bb08e..3a1be8a 100644
--- a/signals/CS/WIF-USD.yaml
+++ b/signals/CS/WIF-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:WIF-USD
+- source_id: band/kiwi
+  id: CS:WIF-USD
 - source_id: binance
   id: wifusdc
   routes:
diff --git a/signals/CS/WLD-USD.yaml b/signals/CS/WLD-USD.yaml
index 34d2011..f2ebd47 100644
--- a/signals/CS/WLD-USD.yaml
+++ b/signals/CS/WLD-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:WLD-USD
+- source_id: band/kiwi
+  id: CS:WLD-USD
 - source_id: binance
   id: wldusdc
   routes:
diff --git a/signals/CS/WLFI-USD.yaml b/signals/CS/WLFI-USD.yaml
index 37c6aa7..b38ff5b 100644
--- a/signals/CS/WLFI-USD.yaml
+++ b/signals/CS/WLFI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:WLFI-USD
+- source_id: band/kiwi
+  id: CS:WLFI-USD
 - source_id: binance
   id: wlfiusdc
   routes:
diff --git a/signals/CS/XCN-USD.yaml b/signals/CS/XCN-USD.yaml
index 8a67f07..4993cad 100644
--- a/signals/CS/XCN-USD.yaml
+++ b/signals/CS/XCN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XCN-USD
+- source_id: band/kiwi
+  id: CS:XCN-USD
 - source_id: coinbase
   id: XCN-USD
 - source_id: coingecko
diff --git a/signals/CS/XDC-USD.yaml b/signals/CS/XDC-USD.yaml
index faab35e..ff262c3 100644
--- a/signals/CS/XDC-USD.yaml
+++ b/signals/CS/XDC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XDC-USD
+- source_id: band/kiwi
+  id: CS:XDC-USD
 - source_id: bybit
   id: XDCUSDT
   routes:
@@ -13,3 +17,8 @@ sources:
     operation: '*'
 - source_id: kraken
   id: XDC/USD
+- source_id: kraken
+  id: XDC/USDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
diff --git a/signals/CS/XEC-USD.yaml b/signals/CS/XEC-USD.yaml
index fa16487..d44a97a 100644
--- a/signals/CS/XEC-USD.yaml
+++ b/signals/CS/XEC-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XEC-USD
+- source_id: band/kiwi
+  id: CS:XEC-USD
 - source_id: binance
   id: xecusdt
   routes:
diff --git a/signals/CS/XLM-USD.yaml b/signals/CS/XLM-USD.yaml
index 354c07e..b976688 100644
--- a/signals/CS/XLM-USD.yaml
+++ b/signals/CS/XLM-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XLM-USD
+- source_id: band/kiwi
+  id: CS:XLM-USD
 - source_id: binance
   id: xlmusdc
   routes:
diff --git a/signals/CS/XMR-USD.yaml b/signals/CS/XMR-USD.yaml
index b49554e..01e6c15 100644
--- a/signals/CS/XMR-USD.yaml
+++ b/signals/CS/XMR-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XMR-USD
+- source_id: band/kiwi
+  id: CS:XMR-USD
 - source_id: bitfinex
   id: tXMRUSD
 - source_id: bitfinex
diff --git a/signals/CS/XPL-USD.yaml b/signals/CS/XPL-USD.yaml
index ec58541..7e2044d 100644
--- a/signals/CS/XPL-USD.yaml
+++ b/signals/CS/XPL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XPL-USD
+- source_id: band/kiwi
+  id: CS:XPL-USD
 - source_id: binance
   id: xplusdc
   routes:
diff --git a/signals/CS/XRP-USD.yaml b/signals/CS/XRP-USD.yaml
index 6f21be5..1789d7b 100644
--- a/signals/CS/XRP-USD.yaml
+++ b/signals/CS/XRP-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:XRP-USD
+- source_id: band/kiwi
+  id: CS:XRP-USD
 - source_id: binance
   id: xrpusdc
   routes:
@@ -28,6 +32,11 @@ sources:
     operation: '*'
 - source_id: coinbase
   id: XRP-USD
+- source_id: coinbase
+  id: XRP-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coingecko
   id: ripple
 - source_id: htx
@@ -37,6 +46,11 @@ sources:
     operation: '*'
 - source_id: kraken
   id: XRP/USD
+- source_id: kraken
+  id: XRP/USDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: kraken
   id: XRP/USDT
   routes:
diff --git a/signals/CS/XTZ-USD.yaml b/signals/CS/XTZ-USD.yaml
index 758aba9..9be1ad9 100644
--- a/signals/CS/XTZ-USD.yaml
+++ b/signals/CS/XTZ-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:XTZ-USD
+- source_id: band/kiwi
+  id: CS:XTZ-USD
+- source_id: binance
+  id: xtzusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: xtzusdt
   routes:
@@ -9,6 +18,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: coinbase
+  id: XTZ-USD
 - source_id: coingecko
   id: tezos
 - source_id: htx
@@ -16,3 +27,10 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: XTZ/USD
+- source_id: okx
+  id: XTZ-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/YFI-USD.yaml b/signals/CS/YFI-USD.yaml
index 8a75645..17a68ab 100644
--- a/signals/CS/YFI-USD.yaml
+++ b/signals/CS/YFI-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:YFI-USD
+- source_id: band/kiwi
+  id: CS:YFI-USD
 - source_id: binance
   id: yfiusdt
   routes:
diff --git a/signals/CS/ZBCN-USD.yaml b/signals/CS/ZBCN-USD.yaml
index 5fd8005..e0e204b 100644
--- a/signals/CS/ZBCN-USD.yaml
+++ b/signals/CS/ZBCN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZBCN-USD
+- source_id: band/kiwi
+  id: CS:ZBCN-USD
 - source_id: coingecko
   id: zebec-network
 - source_id: htx
@@ -6,6 +10,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: ZBCN/USD
 - source_id: okx
   id: ZBCN-USDT
   routes:
diff --git a/signals/CS/ZEC-USD.yaml b/signals/CS/ZEC-USD.yaml
index a0f77e3..0938133 100644
--- a/signals/CS/ZEC-USD.yaml
+++ b/signals/CS/ZEC-USD.yaml
@@ -1,4 +1,13 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZEC-USD
+- source_id: band/kiwi
+  id: CS:ZEC-USD
+- source_id: binance
+  id: zecusdc
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: binance
   id: zecusdt
   routes:
diff --git a/signals/CS/ZEN-USD.yaml b/signals/CS/ZEN-USD.yaml
index 466ccb3..e8f2c1f 100644
--- a/signals/CS/ZEN-USD.yaml
+++ b/signals/CS/ZEN-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZEN-USD
+- source_id: band/kiwi
+  id: CS:ZEN-USD
 - source_id: binance
   id: zenusdc
   routes:
diff --git a/signals/CS/ZETA-USD.yaml b/signals/CS/ZETA-USD.yaml
index 3507946..6df3ea3 100644
--- a/signals/CS/ZETA-USD.yaml
+++ b/signals/CS/ZETA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZETA-USD
+- source_id: band/kiwi
+  id: CS:ZETA-USD
 - source_id: bybit
   id: ZETAUSDT
   routes:
diff --git a/signals/CS/ZIL-USD.yaml b/signals/CS/ZIL-USD.yaml
index 4dd8b36..b9b3ec6 100644
--- a/signals/CS/ZIL-USD.yaml
+++ b/signals/CS/ZIL-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZIL-USD
+- source_id: band/kiwi
+  id: CS:ZIL-USD
 - source_id: binance
   id: zilusdt
   routes:
diff --git a/signals/CS/ZK-USD.yaml b/signals/CS/ZK-USD.yaml
index 8315b38..13af6a9 100644
--- a/signals/CS/ZK-USD.yaml
+++ b/signals/CS/ZK-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZK-USD
+- source_id: band/kiwi
+  id: CS:ZK-USD
 - source_id: binance
   id: zkusdc
   routes:
@@ -9,6 +13,11 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ZKUSDC
+  routes:
+  - signal_id: CS:USDC-USD
+    operation: '*'
 - source_id: bybit
   id: ZKUSDT
   routes:
diff --git a/signals/CS/ZORA-USD.yaml b/signals/CS/ZORA-USD.yaml
index ca3ca9a..7112ee3 100644
--- a/signals/CS/ZORA-USD.yaml
+++ b/signals/CS/ZORA-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZORA-USD
+- source_id: band/kiwi
+  id: CS:ZORA-USD
 - source_id: bybit
   id: ZORAUSDT
   routes:
@@ -10,3 +14,8 @@ sources:
   id: zora
 - source_id: kraken
   id: ZORA/USD
+- source_id: okx
+  id: ZORA-USDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
diff --git a/signals/CS/ZRO-USD.yaml b/signals/CS/ZRO-USD.yaml
index 0f0a6a3..83c3ef8 100644
--- a/signals/CS/ZRO-USD.yaml
+++ b/signals/CS/ZRO-USD.yaml
@@ -1,4 +1,8 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZRO-USD
+- source_id: band/kiwi
+  id: CS:ZRO-USD
 - source_id: binance
   id: zrousdc
   routes:
diff --git a/signals/CS/ZRX-USD.yaml b/signals/CS/ZRX-USD.yaml
index 7e19593..1ec6b6b 100644
--- a/signals/CS/ZRX-USD.yaml
+++ b/signals/CS/ZRX-USD.yaml
@@ -1,9 +1,18 @@
 sources:
+- source_id: band/macaw
+  id: CS:ZRX-USD
+- source_id: band/kiwi
+  id: CS:ZRX-USD
 - source_id: binance
   id: zrxusdt
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: bybit
+  id: ZRXUSDT
+  routes:
+  - signal_id: CS:USDT-USD
+    operation: '*'
 - source_id: coinbase
   id: ZRX-USD
 - source_id: coingecko
@@ -13,6 +22,8 @@ sources:
   routes:
   - signal_id: CS:USDT-USD
     operation: '*'
+- source_id: kraken
+  id: ZRX/USD
 - source_id: okx
   id: ZRX-USDT
   routes: