diff --git a/package.json b/package.json
index 0fbffec..f0399b2 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "import-state:dev": "DEBUG=vulcanize:* ts-node src/cli/import-state.ts",
     "inspect-cid": "DEBUG=vulcanize:* ts-node src/cli/inspect-cid.ts",
     "index-block": "DEBUG=vulcanize:* ts-node src/cli/index-block.ts",
-    "backfill-events": "YARN_CHILD_PROCESS=true node --enable-source-maps dist/backfill-events-data.js"
+    "backfill-events": "DEBUG=vulcanize:* YARN_CHILD_PROCESS=true node --enable-source-maps dist/cli/backfill-events-data.js"
   },
   "repository": {
     "type": "git",
diff --git a/src/backfill-events-data.ts b/src/backfill-events-data.ts
deleted file mode 100644
index a38f46b..0000000
--- a/src/backfill-events-data.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-
-import { DEFAULT_CONFIG_PATH, getConfig, JSONbigNative } from '@cerc-io/util';
-
-import { Event } from './entity/Event';
-import { Database } from './database';
-
-const main = async () => {
-  const argv = getArgv();
-  const config: any = await getConfig(argv.configFile);
-
-  const database = new Database(config.database);
-  await database.init();
-
-  const eventRepository = database._conn.getRepository(Event);
-
-  // Get the total count of events
-  const totalEvents = await eventRepository.count();
-
-  const batchSize = Number(argv.batchSize);
-  let page = 0;
-  let processedCount = 0;
-  let eventsWithNullData: Event[];
-
-  while (processedCount < totalEvents) {
-    // Fetch events in batches with pagination
-    eventsWithNullData = await eventRepository.find({
-      order: { id: 'ASC' },
-      skip: page * batchSize,
-      take: batchSize
-    });
-
-    for (const event of eventsWithNullData) {
-      // Parse extra info and check if data field is present
-      const parsedExtraInfo = JSON.parse(event.extraInfo);
-
-      // Derive data and topics
-      if (parsedExtraInfo.data) {
-        event.data = parsedExtraInfo.data;
-        [event.topic0, event.topic1, event.topic2, event.topic3] = parsedExtraInfo.topics;
-
-        // Update extraInfo
-        delete parsedExtraInfo.data;
-        delete parsedExtraInfo.topics;
-
-        event.extraInfo = JSONbigNative.stringify(parsedExtraInfo);
-      }
-    }
-
-    // Save updated events
-    await eventRepository.save(eventsWithNullData);
-
-    // Update the processed count and progress
-    processedCount += eventsWithNullData.length;
-    const progress = ((processedCount / totalEvents) * 100).toFixed(2);
-    console.log(`Processed ${processedCount}/${totalEvents} events (${progress}% complete)`);
-
-    // Move to the next batch
-    eventsWithNullData = [];
-    page++;
-  }
-
-  console.log('Done.');
-  await database.close();
-};
-
-const getArgv = (): any => {
-  return yargs(hideBin(process.argv))
-    .option('f', {
-      alias: 'config-file',
-      describe: 'configuration file path (toml)',
-      type: 'string',
-      default: DEFAULT_CONFIG_PATH
-    })
-    .option('b', {
-      alias: 'batch-size',
-      describe: 'batch size to process events in',
-      type: 'number',
-      default: 1000
-    })
-    .argv;
-};
-
-main().catch(err => {
-  console.log(err);
-}).finally(() => {
-  process.exit();
-});
diff --git a/src/cli/backfill-events-data.ts b/src/cli/backfill-events-data.ts
new file mode 100644
index 0000000..1f3d996
--- /dev/null
+++ b/src/cli/backfill-events-data.ts
@@ -0,0 +1,26 @@
+//
+// Copyright 2024 Vulcanize, Inc.
+//
+
+import 'reflect-metadata';
+import debug from 'debug';
+
+import { BackfillEventsDataCmd } from '@cerc-io/cli';
+
+import { Database } from '../database';
+import { Event } from '../entity/Event';
+
+const log = debug('vulcanize:backfill-events-data');
+
+const main = async (): Promise<void> => {
+  const backFillCmd = new BackfillEventsDataCmd();
+  await backFillCmd.init(Database);
+
+  await backFillCmd.exec(Event);
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});