diff --git a/package-lock.json b/package-lock.json
index 48a9551..2b86032 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
             "license": "MIT",
             "dependencies": {
                 "@fluencelabs/aqua-dht-ts": "0.1.38",
-                "@fluencelabs/fluence": "0.0.1-fix-recursive-634.0",
+                "@fluencelabs/fluence": "0.0.1-fix-recursive-tmp.0",
                 "@fluencelabs/fluence-network-environment": "1.0.13",
                 "deep-equal": "^2.0.5"
             },
@@ -1225,9 +1225,9 @@
             "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
         },
         "node_modules/@fluencelabs/fluence": {
-            "version": "0.0.1-fix-recursive-634.0",
-            "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-634.0.tgz",
-            "integrity": "sha512-cQjwlGIolpkGTLMDjsKp6+I4NqQHJfxi6Dz8gNNeHJN4Vj2tdvGTgbWc6C534ssuwPSdKOnPasz3G89520hXgA==",
+            "version": "0.0.1-fix-recursive-tmp.0",
+            "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-tmp.0.tgz",
+            "integrity": "sha512-kly4mKZ8ilyM3ybyBIRjTsCNyMYHPkjSHL/fmmJAf2Mwc4lKdAiXgwSZRJV16hmGT6mOFtgsOXtWvZsy7TgAEA==",
             "dependencies": {
                 "@chainsafe/libp2p-noise": "^4.1.1",
                 "@fluencelabs/avm": "^0.21.3",
@@ -10371,9 +10371,9 @@
             "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
         },
         "@fluencelabs/fluence": {
-            "version": "0.0.1-fix-recursive-634.0",
-            "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-634.0.tgz",
-            "integrity": "sha512-cQjwlGIolpkGTLMDjsKp6+I4NqQHJfxi6Dz8gNNeHJN4Vj2tdvGTgbWc6C534ssuwPSdKOnPasz3G89520hXgA==",
+            "version": "0.0.1-fix-recursive-tmp.0",
+            "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-tmp.0.tgz",
+            "integrity": "sha512-kly4mKZ8ilyM3ybyBIRjTsCNyMYHPkjSHL/fmmJAf2Mwc4lKdAiXgwSZRJV16hmGT6mOFtgsOXtWvZsy7TgAEA==",
             "requires": {
                 "@chainsafe/libp2p-noise": "^4.1.1",
                 "@fluencelabs/avm": "^0.21.3",
diff --git a/package.json b/package.json
index ff26248..4c8fbea 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     },
     "dependencies": {
         "@fluencelabs/aqua-dht-ts": "0.1.38",
-        "@fluencelabs/fluence": "0.0.1-fix-recursive-634.0",
+        "@fluencelabs/fluence": "0.0.1-fix-recursive-tmp.0",
         "@fluencelabs/fluence-network-environment": "1.0.13",
         "deep-equal": "^2.0.5"
     },
diff --git a/src/compiled/examples/aliases.ts b/src/compiled/examples/aliases.ts
index 01f5a56..f620657 100644
--- a/src/compiled/examples/aliases.ts
+++ b/src/compiled/examples/aliases.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/assignment.ts b/src/compiled/examples/assignment.ts
index 68d9fe9..1dfe26d 100644
--- a/src/compiled/examples/assignment.ts
+++ b/src/compiled/examples/assignment.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/callArrow.ts b/src/compiled/examples/callArrow.ts
index 2eaeca0..7c3a30d 100644
--- a/src/compiled/examples/callArrow.ts
+++ b/src/compiled/examples/callArrow.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/closures.ts b/src/compiled/examples/closures.ts
index a58c7cf..2c80870 100644
--- a/src/compiled/examples/closures.ts
+++ b/src/compiled/examples/closures.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
@@ -226,38 +223,29 @@ export function closureBig(...args: any) {
                        )
                        (xor
                         (seq
+                         (call -relay- ("op" "noop") [])
                          (new $p2Id
                           (seq
                            (xor
                             (match "on" "in"
                              (xor
                               (seq
-                               (call peer2 ("op" "identity") ["on"] p2-0)
+                               (call %init_peer_id% ("op" "identity") ["on"] p2-0)
                                (ap p2-0 $p2Id)
                               )
-                              (seq
-                               (seq
-                                (call -relay- ("op" "noop") [])
-                                (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
-                               )
-                               (call -relay- ("op" "noop") [])
-                              )
+                              (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
                              )
                             )
                             (seq
-                             (call peer2 ("peer" "identify") [] p2Info-0)
+                             (call %init_peer_id% ("peer" "identify") [] p2Info-0)
                              (ap p2Info-0.$.external_addresses.[0]! $p2Id)
                             )
                            )
-                           (call peer2 ("op" "identity") [$p2Id.$.[0]!] p2Id-fix-0)
+                           (call %init_peer_id% ("op" "identity") [$p2Id.$.[0]!] p2Id-fix-0)
                           )
                          )
-                         (call -relay- ("op" "noop") [])
-                        )
-                        (seq
-                         (call -relay- ("op" "noop") [])
-                         (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
                         )
+                        (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
                        )
                       )
                       (xor
diff --git a/src/compiled/examples/co.ts b/src/compiled/examples/co.ts
index dab9d02..2c9c34d 100644
--- a/src/compiled/examples/co.ts
+++ b/src/compiled/examples/co.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/collectionSugar.ts b/src/compiled/examples/collectionSugar.ts
index 9d2e8f7..8c6822b 100644
--- a/src/compiled/examples/collectionSugar.ts
+++ b/src/compiled/examples/collectionSugar.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/complex.ts b/src/compiled/examples/complex.ts
index 4c94dbb..49f44d3 100644
--- a/src/compiled/examples/complex.ts
+++ b/src/compiled/examples/complex.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/constants.ts b/src/compiled/examples/constants.ts
index 1b3ce4b..920a89b 100644
--- a/src/compiled/examples/constants.ts
+++ b/src/compiled/examples/constants.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/dataAlias.ts b/src/compiled/examples/dataAlias.ts
index e79375e..4557be6 100644
--- a/src/compiled/examples/dataAlias.ts
+++ b/src/compiled/examples/dataAlias.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/example.ts b/src/compiled/examples/example.ts
index 20a0eb9..3d4d280 100644
--- a/src/compiled/examples/example.ts
+++ b/src/compiled/examples/example.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/fldist-sample.ts b/src/compiled/examples/fldist-sample.ts
index 00df600..e60716b 100644
--- a/src/compiled/examples/fldist-sample.ts
+++ b/src/compiled/examples/fldist-sample.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/fold.ts b/src/compiled/examples/fold.ts
index 9ae4a9d..9bbd6c0 100644
--- a/src/compiled/examples/fold.ts
+++ b/src/compiled/examples/fold.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/foldJoin.ts b/src/compiled/examples/foldJoin.ts
index 5f7250f..61e792e 100644
--- a/src/compiled/examples/foldJoin.ts
+++ b/src/compiled/examples/foldJoin.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/func.ts b/src/compiled/examples/func.ts
index 3073d2c..399ebf3 100644
--- a/src/compiled/examples/func.ts
+++ b/src/compiled/examples/func.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/helloWorld.ts b/src/compiled/examples/helloWorld.ts
index 091b641..f1915fe 100644
--- a/src/compiled/examples/helloWorld.ts
+++ b/src/compiled/examples/helloWorld.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/if.ts b/src/compiled/examples/if.ts
index a054ba0..5d9be28 100644
--- a/src/compiled/examples/if.ts
+++ b/src/compiled/examples/if.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
@@ -231,28 +228,19 @@ export function ifCorrectXorWrap(...args: any) {
                            (seq
                             (call node ("op" "identity") ["1234"] res)
                             (xor
-                             (match res ""
-                              (xor
-                               (seq
-                                (ap "0x" $service_id)
-                                (call -relay- ("op" "noop") [])
-                               )
-                               (seq
-                                (call -relay- ("op" "noop") [])
-                                (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-                               )
+                             (seq
+                              (match res ""
+                               (ap "0x" $service_id)
                               )
+                              (call -relay- ("op" "noop") [])
                              )
                              (seq
-                              (seq
-                               (call -relay- ("op" "noop") [])
-                               (ap "1x" $service_id)
-                              )
+                              (ap "1x" $service_id)
                               (call -relay- ("op" "noop") [])
                              )
                             )
                            )
-                           (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+                           (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                           )
                          )
                          (call %init_peer_id% ("op" "identity") [$service_id.$.[0]!] service_id-fix)
@@ -261,10 +249,10 @@ export function ifCorrectXorWrap(...args: any) {
                       )
                       (xor
                        (call %init_peer_id% ("callbackSrv" "response") [service_id-fix])
-                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
                       )
                      )
-                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
+                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
                     )
     `
     return callFunction(
diff --git a/src/compiled/examples/imports_exports/declare.ts b/src/compiled/examples/imports_exports/declare.ts
index e7a03c7..0082d99 100644
--- a/src/compiled/examples/imports_exports/declare.ts
+++ b/src/compiled/examples/imports_exports/declare.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/exports.ts b/src/compiled/examples/imports_exports/exports.ts
index efdfd3b..e17db06 100644
--- a/src/compiled/examples/imports_exports/exports.ts
+++ b/src/compiled/examples/imports_exports/exports.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/gen/OneMore.ts b/src/compiled/examples/imports_exports/gen/OneMore.ts
index 511a9cf..975667c 100644
--- a/src/compiled/examples/imports_exports/gen/OneMore.ts
+++ b/src/compiled/examples/imports_exports/gen/OneMore.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/import2.ts b/src/compiled/examples/imports_exports/import2.ts
index 44d68ba..a50f09e 100644
--- a/src/compiled/examples/imports_exports/import2.ts
+++ b/src/compiled/examples/imports_exports/import2.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/import3.ts b/src/compiled/examples/imports_exports/import3.ts
index b9b9e9e..8a63fe1 100644
--- a/src/compiled/examples/imports_exports/import3.ts
+++ b/src/compiled/examples/imports_exports/import3.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/imports.ts b/src/compiled/examples/imports_exports/imports.ts
index 4fd6977..000a088 100644
--- a/src/compiled/examples/imports_exports/imports.ts
+++ b/src/compiled/examples/imports_exports/imports.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/imports_exports/subImport.ts b/src/compiled/examples/imports_exports/subImport.ts
index dcea6a3..1304fd9 100644
--- a/src/compiled/examples/imports_exports/subImport.ts
+++ b/src/compiled/examples/imports_exports/subImport.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/join.ts b/src/compiled/examples/join.ts
index eb6a172..2f6064b 100644
--- a/src/compiled/examples/join.ts
+++ b/src/compiled/examples/join.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/multiReturn.ts b/src/compiled/examples/multiReturn.ts
index 671b2c7..4e65867 100644
--- a/src/compiled/examples/multiReturn.ts
+++ b/src/compiled/examples/multiReturn.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/nestedFuncs.ts b/src/compiled/examples/nestedFuncs.ts
index 053a1f5..1974a07 100644
--- a/src/compiled/examples/nestedFuncs.ts
+++ b/src/compiled/examples/nestedFuncs.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/new-api-full.ts b/src/compiled/examples/new-api-full.ts
index 7634c6b..7644397 100644
--- a/src/compiled/examples/new-api-full.ts
+++ b/src/compiled/examples/new-api-full.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/new-api.ts b/src/compiled/examples/new-api.ts
index 5af84fa..d74d076 100644
--- a/src/compiled/examples/new-api.ts
+++ b/src/compiled/examples/new-api.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/on.ts b/src/compiled/examples/on.ts
index cde16ec..02669ed 100644
--- a/src/compiled/examples/on.ts
+++ b/src/compiled/examples/on.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/option.ts b/src/compiled/examples/option.ts
index 16e21cd..c34a5aa 100644
--- a/src/compiled/examples/option.ts
+++ b/src/compiled/examples/option.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/options/option_gen.ts b/src/compiled/examples/options/option_gen.ts
index 1abdf5c..270bbfc 100644
--- a/src/compiled/examples/options/option_gen.ts
+++ b/src/compiled/examples/options/option_gen.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/par.ts b/src/compiled/examples/par.ts
index 28ed445..ac89568 100644
--- a/src/compiled/examples/par.ts
+++ b/src/compiled/examples/par.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/passArgs.ts b/src/compiled/examples/passArgs.ts
index a018838..4aa14d4 100644
--- a/src/compiled/examples/passArgs.ts
+++ b/src/compiled/examples/passArgs.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/println.ts b/src/compiled/examples/println.ts
index 510ad18..80b3ab6 100644
--- a/src/compiled/examples/println.ts
+++ b/src/compiled/examples/println.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/pushToStream.ts b/src/compiled/examples/pushToStream.ts
index 8b65854..98a0970 100644
--- a/src/compiled/examples/pushToStream.ts
+++ b/src/compiled/examples/pushToStream.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/recursiveStreams.ts b/src/compiled/examples/recursiveStreams.ts
index e77caa7..8c3b7e0 100644
--- a/src/compiled/examples/recursiveStreams.ts
+++ b/src/compiled/examples/recursiveStreams.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/returnLiteral.ts b/src/compiled/examples/returnLiteral.ts
index 7baef76..f089e58 100644
--- a/src/compiled/examples/returnLiteral.ts
+++ b/src/compiled/examples/returnLiteral.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/stream.ts b/src/compiled/examples/stream.ts
index 5df52a0..88ec778 100644
--- a/src/compiled/examples/stream.ts
+++ b/src/compiled/examples/stream.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/streamArgs.ts b/src/compiled/examples/streamArgs.ts
index 7bd4682..cb216ba 100644
--- a/src/compiled/examples/streamArgs.ts
+++ b/src/compiled/examples/streamArgs.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/streamCallback.ts b/src/compiled/examples/streamCallback.ts
index c6cc8ca..41a90e2 100644
--- a/src/compiled/examples/streamCallback.ts
+++ b/src/compiled/examples/streamCallback.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/streamCan.ts b/src/compiled/examples/streamCan.ts
index 16da491..f787c3f 100644
--- a/src/compiled/examples/streamCan.ts
+++ b/src/compiled/examples/streamCan.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/streamRestriction.ts b/src/compiled/examples/streamRestriction.ts
index 5f6a2e3..fffbade 100644
--- a/src/compiled/examples/streamRestriction.ts
+++ b/src/compiled/examples/streamRestriction.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/streamResults.ts b/src/compiled/examples/streamResults.ts
index 8560583..de96e8e 100644
--- a/src/compiled/examples/streamResults.ts
+++ b/src/compiled/examples/streamResults.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/subImportUsage.ts b/src/compiled/examples/subImportUsage.ts
index 892a123..75ccba5 100644
--- a/src/compiled/examples/subImportUsage.ts
+++ b/src/compiled/examples/subImportUsage.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/topology.ts b/src/compiled/examples/topology.ts
index 2fe4d3c..0be5496 100644
--- a/src/compiled/examples/topology.ts
+++ b/src/compiled/examples/topology.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/tryCatch.ts b/src/compiled/examples/tryCatch.ts
index 4c4d8d4..17393ee 100644
--- a/src/compiled/examples/tryCatch.ts
+++ b/src/compiled/examples/tryCatch.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/tryOtherwise.ts b/src/compiled/examples/tryOtherwise.ts
index 55101b9..dfc0dcc 100644
--- a/src/compiled/examples/tryOtherwise.ts
+++ b/src/compiled/examples/tryOtherwise.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services
 
diff --git a/src/compiled/examples/via.ts b/src/compiled/examples/via.ts
index e04fc75..49b0e9a 100644
--- a/src/compiled/examples/via.ts
+++ b/src/compiled/examples/via.ts
@@ -3,19 +3,16 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.6.3-SNAPSHOT
+ * Aqua version: 0.7.0-SNAPSHOT
  *
  */
 import { Fluence, FluencePeer } from '@fluencelabs/fluence';
 import {
+    CallParams,
     callFunction,
     registerService,
 } from '@fluencelabs/fluence/dist/internal/compilerSupport/v3';
 
-import {
-    CallParams
-} from '@fluencelabs/fluence/dist/internal/compilerSupport/v2';
-
 
 // Services