diff --git a/examples/relay-reactjs-chat/src/App.js b/examples/relay-reactjs-chat/src/App.js
index f0d5c84..f555fe1 100644
--- a/examples/relay-reactjs-chat/src/App.js
+++ b/examples/relay-reactjs-chat/src/App.js
@@ -1,8 +1,7 @@
 import * as React from "react";
 import protobuf from "protobufjs";
 import { createRelayNode } from "@waku/create";
-import { waitForRemotePeer } from "@waku/core";
-import { createDecoder, createEncoder } from "@waku/core";
+import { createDecoder, createEncoder, waitForRemotePeer } from "@waku/core";
 
 const ContentTopic = `/js-waku-examples/1/chat/proto`;
 const Encoder = createEncoder(ContentTopic);
diff --git a/examples/store-reactjs-chat/src/App.js b/examples/store-reactjs-chat/src/App.js
index 63db367..767d962 100644
--- a/examples/store-reactjs-chat/src/App.js
+++ b/examples/store-reactjs-chat/src/App.js
@@ -1,12 +1,11 @@
 import * as React from "react";
 import protobuf from "protobufjs";
 import { createLightNode } from "@waku/create";
-import { waitForRemotePeer } from "@waku/core";
-import { Decoder } from "@waku/core/lib/message/version_0";
+import { waitForRemotePeer, createDecoder } from "@waku/core";
 import { bytesToUtf8 } from "@waku/byte-utils";
 
 const ContentTopic = "/toy-chat/2/huilong/proto";
-const decoder = new Decoder(ContentTopic);
+const decoder = createDecoder(ContentTopic);
 
 const ProtoChatMessage = new protobuf.Type("ChatMessage")
   .add(new protobuf.Field("timestamp", 1, "uint64"))