diff --git a/interop/src/cpp/cangjie/convertors-cj.h b/interop/src/cpp/cangjie/convertors-cj.h
index cf83974d6bbdda26e13d38dcf56587b64adf11b8..b06b2d18da784d1c94fdbcf70df543d670c5e2db 100644
--- a/interop/src/cpp/cangjie/convertors-cj.h
+++ b/interop/src/cpp/cangjie/convertors-cj.h
@@ -85,14 +85,14 @@ struct InteropTypeConverter<KStringPtr> {
 // TODO: Rewrite all others to typed convertors.
 
 #define KOALA_INTEROP_0(name, Ret)                                         \
-KOALA_INTEROP_EXPORT Ret name() {                                          \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name() {                                          \
     KOALA_MAYBE_LOG(name)                                                  \
     return makeResult<Ret>(impl_##name());                                 \
 }
 // MAKE_CJ_EXPORT(name, #Ret, 0)
 
 #define KOALA_INTEROP_1(name, Ret, P0)                                     \
-KOALA_INTEROP_EXPORT Ret name(InteropTypeConverter<P0>::InteropType _p0) { \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(InteropTypeConverter<P0>::InteropType _p0) { \
     KOALA_MAYBE_LOG(name)                                                  \
     P0 p0 = getArgument<P0>(_p0);                                          \
     return makeResult<Ret>(impl_##name(p0));                               \
@@ -100,7 +100,7 @@ KOALA_INTEROP_EXPORT Ret name(InteropTypeConverter<P0>::InteropType _p0) { \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0, 0)
 
 #define KOALA_INTEROP_2(name, Ret, P0, P1)                                 \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1                             \
 ) {                                                                        \
@@ -112,7 +112,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1, 0)
 
 #define KOALA_INTEROP_3(name, Ret, P0, P1, P2)                             \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2                              \
@@ -126,7 +126,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2, 0)
 
 #define KOALA_INTEROP_4(name, Ret, P0, P1, P2, P3)                         \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -142,7 +142,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3, 0)
 
 #define KOALA_INTEROP_5(name, Ret, P0, P1, P2, P3, P4)                     \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -160,7 +160,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4, 0)
 
 #define KOALA_INTEROP_6(name, Ret, P0, P1, P2, P3, P4, P5)                 \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -180,7 +180,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5, 0)
 
 #define KOALA_INTEROP_7(name, Ret, P0, P1, P2, P3, P4, P5, P6)             \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -202,7 +202,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6, 0)
 
 #define KOALA_INTEROP_8(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7)         \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -226,7 +226,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7, 0)
 
 #define KOALA_INTEROP_9(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8)     \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -252,7 +252,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8, 0)
 
 #define KOALA_INTEROP_10(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9) \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -280,7 +280,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9, 0)
 
 #define KOALA_INTEROP_11(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10) \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -310,7 +310,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10, 0)
 
 #define KOALA_INTEROP_12(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11) \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -342,7 +342,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10 "|" #P11, 0)
 
 #define KOALA_INTEROP_13(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12) \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -376,7 +376,7 @@ KOALA_INTEROP_EXPORT Ret name(                                             \
 // MAKE_CJ_EXPORT(name, #Ret "|" #P0 "|" #P1 "|" #P2 "|" #P3 "|" #P4 "|" #P5 "|" #P6 "|" #P7 "|" #P8 "|" #P9 "|" #P10 "|" #P11 "|" #P12, 0)
 
 #define KOALA_INTEROP_14(name, Ret, P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13) \
-KOALA_INTEROP_EXPORT Ret name(                                             \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(                                             \
     InteropTypeConverter<P0>::InteropType _p0,                             \
     InteropTypeConverter<P1>::InteropType _p1,                             \
     InteropTypeConverter<P2>::InteropType _p2,                             \
@@ -739,14 +739,14 @@ KOALA_INTEROP_EXPORT void name(                                            \
 }
 
 #define KOALA_INTEROP_CTX_0(name, Ret)                                     \
-KOALA_INTEROP_EXPORT Ret name() {                                          \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name() {                                          \
     KOALA_MAYBE_LOG(name)                                                  \
     KVMContext ctx = (KVMContext)0;                                  \
     return makeResult<Ret>(impl_##name(ctx));                        \
 }
 
 #define KOALA_INTEROP_CTX_1(name, Ret, P0)                                 \
-KOALA_INTEROP_EXPORT Ret name(InteropTypeConverter<P0>::InteropType _p0) { \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(InteropTypeConverter<P0>::InteropType _p0) { \
     KOALA_MAYBE_LOG(name)                                                  \
     P0 p0 = getArgument<P0>(_p0);                                          \
     KVMContext ctx = (KVMContext)0;                                        \
@@ -754,7 +754,7 @@ KOALA_INTEROP_EXPORT Ret name(InteropTypeConverter<P0>::InteropType _p0) { \
 }
 
 #define KOALA_INTEROP_CTX_2(name, Ret, P0, P1)                             \
-KOALA_INTEROP_EXPORT Ret name(InteropTypeConverter<P0>::InteropType _p0,   \
+KOALA_INTEROP_EXPORT InteropTypeConverter<Ret>::InteropType name(InteropTypeConverter<P0>::InteropType _p0,   \
                             InteropTypeConverter<P1>::InteropType _p1) {   \
     KOALA_MAYBE_LOG(name)                                                  \
     P0 p0 = getArgument<P0>(_p0);                                          \