--- a/doc/sponsoring-flow.drawio.svg
+++ b/doc/sponsoring-flow.drawio.svg
@@ -1,6 +1,14 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="549px" height="145px" viewBox="-0.5 -0.5 549 145" content="&lt;mxfile&gt;&lt;diagram id=&quot;gc-t5MPR75mNDmyf0fnB&quot; name=&quot;Page-1&quot;&gt;7VtbT+M4GP01lXYeQLm3PNLSHVYCaaTOMuwTchOn8ZDEWcct6f76tRO7uTiFlN4yMBKq4s/XfMfn+LMdBuYkyr4SkAT32IPhwNC8bGDeDAzDGFrslxvWhcE0zcKwIMgrTHppmKH/oDBqwrpEHkxrBSnGIUVJ3ejiOIYurdkAIfilXszHYb3XBCygYpi5IFStP5BHg8I6Moal/RaiRSB71p2rImcO3OcFwctY9BfjGBY5EZDNiHdMA+Dhl4rJnA7MCcGYFk9RNoEh96r0WFHvzy25myETGNMuFe4Q9iZPd3f+XL//PgOzifuYXYhWViBcCldMH+65o0EYpmLcdC3dRGHGuhoHNAqZQWePKSX4GU5wiAmz5G9vjn0Uhg0TCNEiZkmXDRYy+3gFCUWsl2uRESHP492MXwJE4SwBLu/zhc02ZssdDPl7aCylvrh8C9YmzCom4YivEEeQkjUrInIdS4Ai56tMv5ToO8IUVICXWAIx3xablkvHswfh+x1wMBUcBoYTcmd7aMUeF/xxmlGC4hS5qcxkfVXyPzBeRh0vyzgzXo7ia+gxRRFJTGiAFzgG4bS0NrxSlrnDOBHw/ISUroU8giXFdfC2OjLFS+LCV4Yr5JkCsoD0lXJ2UY6/y6uwEBgCilZ19Wxzcl71mhCwrhRIMIppWmn5GzeUaBtmA21dawBWtFjCtxna+xG9OgeiDEiyfhT188Q/PHFpy+RNVs28Wb9FqYPNhNFRZoIKtd0O9aaJYqCiVoO0B0Dd6qK7f6dMAj+Z4m5CM7lCDlXFtU6puIb5OQhqdyQoL3VYhu4Fj92FSLPlnNEBUPjp2NSUOe3M8Ytun4VNGaKPlecKl1iqpBJPSCadnoGjjgzUrV5ES2YjWjLtxj5wt/LHia5GXeRhSgNI4DL67Opw9t2oPvro6lCdFAPD9AAc+a4yg1iO447g3N9LT/SuMbc+7IWgWMPdBOWN8scRFF2N3BMQhpA+wVU0MK/5n5CROalNZeffJT9yG/s4phdpPhlZUW2YZDnKMlvKzncC4hS4FOH4gemGh+j6FrjPPVUj/lKCYMPDiJPZQZyuTipO59mpf1RxGnYVp15tN+SwWwKKpJXtIYrhhZyfnO86D8FZFFys4VqLGihSIHvgZbtKitKIUCk34A7nYvVES4VRhauoNMGxjxZF7nQVzRIcp5ikAUpuQcy0gahVKkFUMV7FnHz8yMrW3hYv3TilelnnCa3eq0T15eSUwiQR+FWipmFznbx6PWpSyg93jLJ2LX+KqEyCpkZlu+ndmCA+/VtkrpdKdfioq3nhZY5ahEs/pXCZZ7nyOo5w+b5vuK3C5Tlzx3b2Ey6jo3AZTq9CKjlulbtpwUMUL+p8zQ9n3hkGTXI9qGyuvoF1BPM45dc5+znCbsuya7y3NFvlvdbC++a92eF4ryvO7zPvT0l0pyPRzV7x3FJPTmh2ifnZq/rFDx/zHZjDsA5PdxIRyIQAzPP2OEAijGKN2+OBfdOFRK9OS4Vam4/ERKeD6tdWbZS70C4N40pg9N7rbEnXegXs+yk8zr3179X4wCSVgVNfWLr9gKOyLjLisoj6kn+t13Hh7C2h5Yw+CKFNS9bdk9AXzXX1eJSWM3Ub4vudN22L4drPmLYfMH3SuMwa1fdjbRf4rXHZ8fZj6jLeihqIuH9y7G51fovIutP+KB8foFsvtRxt0jnGX4pyE8Ahi3OAa/k7z4Hq+dC2E6WenSMaje245ajwby5KTgO/+sHNW/Bfuy7zC/3LKwEVs+HL/ohulupti3vfETVVRI0DIcqS5Wf+xXJR/heFOf0f&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="560" height="156" viewBox="-0.5 -0.5 560 156" content="&lt;mxfile&gt;&lt;diagram id=&quot;gc-t5MPR75mNDmyf0fnB&quot; name=&quot;Page-1&quot;&gt;7VvZbuM2FP0aA50HB9rtPMaO2xRIgAE8TdOngJYomY0kqhTtyP36khJpLZQTOd40SYFBIF6uuueew0vKMzCnUfYbAcnyAXswHBialw3M24Fh2LbG/nLDpjCYplkYAoK8wqSXhjn6Fwqj6BeskAfTWkOKcUhRUje6OI6hS2s2QAh+rTfzcVifNQEBVAxzF4Sq9U/k0WVhHRuj0n4HUbCUM+vOdVGzAO5LQPAqFvPFOIZFTQTkMOId0yXw8GtlPnM2MKcEY1o8RdkUhtyr0mNFv1931G6XTGBMu3S4R9ibPt/f+wv94ccczKfuUzYUo6xBuBKumD0+cEeDMEzFuulGuonCjE01WdIoZAadPaaU4Bc4xSEmzJK/vTnxURg2TCBEQcyKLlssZPbJGhKK2Cw3oiJCnsenmbwuEYXzBLh8zlcWbcyWOxjy99BYSX1x+RZsTJg1PcxiFuIIUrJhTUStYwlQZLzK8muJviNMywrwEksg4i3Yjlw6nj0I3++Bg6ngMDCckDvbQ2v2GPDHWUYJilPkprKSzVWp/8R4GXW8LOPCeDmKr6HHFEUUMaFLHOAYhLPS2vBK2eYe40TA8zekdCPkEaworoO305EpXhEXvrFcS2gqIAGkb7Szi3b8Xd6EhcAQULSuq2ebk/OuN4SATaVBglFM08rI37mhRNswG2jrWgOwYsQSvu3SPo7o9SUQZUCSzZPonxf+4oUrWxZvs2rl7eY9Sh0tEsYniQQVarsd6u0QxUJFrwZpj4C61UV3/0iZBH4xxd2mZnKHHKmKa51TcQ3zaxDU7khQ3uq4DD0IHrsLkearBaMDoPDLsakpc9qF8xfdvgibMkSfKs8VLrFSSSVekEw6PwPHHRmoW73IlsxGtmTajXPgfu1Pk12Nu8jDjC4hgavoq6vDxU+j+vizq0M1KAaG6QE49l0lgliN447hwj9IT/SuObc+6oWgWKP9BOWd9qcRFF3N3BMQhpA+w3U0MG/4PyEjC1ILZeefFb9ym/g4psM0D0bWVBslWY6yrJay84OAOAUuRTh+ZLrhIbq5A+5LT9WIv5Qg2Og44mR2EKfrs4rTZU7qn1WcRl3FqVfHDbnsloQiaWV7iGI4lPHJ+a7zFJxlwcUerrWogSIFcgbetqukKIMIlXKX3OFcrJ5pqTCqcBWdpjj2UVDUztbRPMFxikm6RMkdiJk2ELVLJYkq1quYk8+fWdna++KlG+dUL+syqdVHlai+nZxTmCQCP0vWNGruk9dvZ01K+9GeWda+7c+RlUnQ1KxsP72bEMTDv0XmeqlUx8+6mh+8zHGLcOnnFC7zIp+8TiNcvu8bbqtwec7CsZ3DhMvoKFyG06uUSq5b5W5a8BDFQZ2v+eXMB9Ogaa4HlcPVd7CJYJ6n/Dx3Pyc4bVl2jfeWZqu811p43/xudjze64rz+8z7cxLd6Uh0s1c8t9SbE5pdYX73qv7ih6/5HixgWIenO4kIZEIAFvl4HCCRRrHB7cnAvu1CojfDUqHW9kdiYtKB2BJ3Um6oXRnGtcDoo5+zJV3rHbDvp/A0363/342PTFKZOPWFpbsvOCr7IiMuy6iv+K/1Om6cvSW0jOijENq0ZN8DCT1s7quno7SM1F2IH3bftCuHa79j2n3B9EXzMmtcP4+1fcBvzctOdx5Tt/FW1EDE/ZNjNyU4TW9cl/mK/u4NDDax9sudzj8t8sdH6Nbbr8bbco72t6LdFHDw4hzqWv3e0VC9Kdp1t9SzG0WjcTC3HDUQrPMezNWf3rwXCI0YmObbRx4N3w5HdLtp79rm+46oqSK6/UJ/IKKsWP7gv9g4yv9PYc7+Aw==&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs>
+        <filter id="dropShadow">
+            <feGaussianBlur in="SourceAlpha" stdDeviation="1.7" result="blur"/>
+            <feOffset in="blur" dx="3" dy="3" result="offsetBlur"/>
+            <feFlood flood-color="#3D4574" flood-opacity="0.4" result="offsetColor"/>
+            <feComposite in="offsetColor" in2="offsetBlur" operator="in" result="offsetBlur"/>
+            <feBlend in="SourceGraphic" in2="offsetBlur"/>
+        </filter>
+    </defs>
+    <g filter="url(#dropShadow)">
         <rect x="430" y="4" width="60" height="20" fill="none" stroke="none" pointer-events="all"/>
         <g transform="translate(-0.5 -0.5)">
             <switch>
@@ -251,20 +259,20 @@
                 </text>
             </switch>
         </g>
-        <rect x="10" y="124" width="350" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/>
+        <rect x="10" y="124" width="410" height="20" fill="#dae8fc" stroke="#6c8ebf" pointer-events="all"/>
         <g transform="translate(-0.5 -0.5)">
             <switch>
                 <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 348px; height: 1px; padding-top: 134px; margin-left: 11px;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 408px; height: 1px; padding-top: 134px; margin-left: 11px;">
                         <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
                             <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                SponsorshipHandler&lt;H160, (H160, Vec&lt;u8&gt;), CallContext&gt;
+                                SponsorshipHandler&lt;CrossAccountId, (H160, Vec&lt;u8&gt;), CallContext&gt;
                             </div>
                         </div>
                     </div>
                 </foreignObject>
-                <text x="185" y="138" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    SponsorshipHandler&lt;H160, (H160, Vec&lt;u8&gt;), CallContext&gt;
+                <text x="215" y="138" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    SponsorshipHandler&lt;CrossAccountId, (H160, Vec&lt;u8&gt;), CallContext&gt;
                 </text>
             </switch>
         </g>
--- a/doc/sponsoring.md
+++ b/doc/sponsoring.md
@@ -6,7 +6,7 @@
 
 If you need to add sponsoring for pallet call, you should implement `SponsorshipHandler<AccountId, Call, ()>`
 
-If you need to add sponsoring for EVM contract call, you should implement `SponsorshipHandler<H160, (H160, Vec<u8>), CallContext>`
+If you need to add sponsoring for EVM contract call, you should implement `SponsorshipHandler<CrossAccountId, (H160, Vec<u8>), CallContext>`
 
 For both examples, you can take a look at `UniqueSponsorshipHandler` struct inside of common runtime