diff --git a/packages/codegen/src/generate-code.ts b/packages/codegen/src/generate-code.ts
index 42da717e..6b613272 100644
--- a/packages/codegen/src/generate-code.ts
+++ b/packages/codegen/src/generate-code.ts
@@ -7,8 +7,8 @@ import fetch from 'node-fetch';
 import path from 'path';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { flatten } from '@poanet/solidity-flattener';
 
+import { flatten } from '@poanet/solidity-flattener';
 import { parse, visit } from '@solidity-parser/parser';
 import { KIND_ACTIVE, KIND_LAZY } from '@vulcanize/util';
 
diff --git a/packages/codegen/src/schema.ts b/packages/codegen/src/schema.ts
index 2fc0f885..738c71f6 100644
--- a/packages/codegen/src/schema.ts
+++ b/packages/codegen/src/schema.ts
@@ -245,6 +245,7 @@ export class Schema {
         block: () => this._composer.getOTC('Block').NonNull,
         contractAddress: 'String!',
         cid: 'String!',
+        kind: 'String!',
         data: 'String!'
       }
     });
@@ -291,8 +292,8 @@ export class Schema {
         type: 'Boolean!',
         args: {
           contractAddress: 'String!',
-          startingBlock: 'Int',
-          kind: 'String!'
+          kind: 'String!',
+          startingBlock: 'Int'
         }
       }
     });
diff --git a/packages/codegen/src/templates/client-template.handlebars b/packages/codegen/src/templates/client-template.handlebars
index 172e75e0..a8548c1b 100644
--- a/packages/codegen/src/templates/client-template.handlebars
+++ b/packages/codegen/src/templates/client-template.handlebars
@@ -3,7 +3,6 @@
 //
 
 import { gql } from '@apollo/client/core';
-
 import { GraphQLClient, GraphQLConfig } from '@vulcanize/ipld-eth-client';
 
 import { queries, mutations, subscriptions } from './gql';
diff --git a/packages/codegen/src/templates/config-template.handlebars b/packages/codegen/src/templates/config-template.handlebars
index 8f25a1b8..664705d0 100644
--- a/packages/codegen/src/templates/config-template.handlebars
+++ b/packages/codegen/src/templates/config-template.handlebars
@@ -2,8 +2,12 @@
   host = "127.0.0.1"
   port = 3008
   kind = "{{watcherKind}}"
+
+  # Checkpointing derived state.
   checkpointing = true
-  checkpointInterval = 30
+
+  # Checkpoint interval in number of blocks.
+  checkpointInterval = 2000
 
 [database]
   type = "postgres"
diff --git a/packages/codegen/src/templates/database-template.handlebars b/packages/codegen/src/templates/database-template.handlebars
index 4f023801..c3f9c9e7 100644
--- a/packages/codegen/src/templates/database-template.handlebars
+++ b/packages/codegen/src/templates/database-template.handlebars
@@ -257,7 +257,7 @@ export class Database {
     return this._baseDatabase.saveEvents(blockRepo, eventRepo, block, events);
   }
 
-  async saveContract (address: string, startingBlock: number, kind: string): Promise<void> {
+  async saveContract (address: string, kind: string, startingBlock: number): Promise<void> {
     await this._conn.transaction(async (tx) => {
       const repo = tx.getRepository(Contract);
 
diff --git a/packages/codegen/src/templates/fill-template.handlebars b/packages/codegen/src/templates/fill-template.handlebars
index b5855137..ccca0d7e 100644
--- a/packages/codegen/src/templates/fill-template.handlebars
+++ b/packages/codegen/src/templates/fill-template.handlebars
@@ -45,11 +45,11 @@ export const main = async (): Promise<any> => {
 
   const config = await getConfig(argv.configFile);
 
-  assert(config.server, 'Missing server config');
-
-  const { upstream, database: dbConfig, jobQueue: jobQueueConfig } = config;
+  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: serverConfig } = config;
 
+  assert(upstream, 'Missing upstream config');
   assert(dbConfig, 'Missing database config');
+  assert(serverConfig, 'Missing server config');
 
   const db = new Database(dbConfig);
   await db.init();
@@ -76,7 +76,7 @@ export const main = async (): Promise<any> => {
   // Note: In-memory pubsub works fine for now, as each watcher is a single process anyway.
   // Later: https://www.apollographql.com/docs/apollo-server/data/subscriptions/#production-pubsub-libraries
   const pubsub = new PubSub();
-  const indexer = new Indexer(db, ethClient, postgraphileClient, ethProvider);
+  const indexer = new Indexer(serverConfig, db, ethClient, postgraphileClient, ethProvider);
 
   const { dbConnectionString, maxCompletionLagInSecs } = jobQueueConfig;
   assert(dbConnectionString, 'Missing job queue db connection string');
diff --git a/packages/codegen/src/templates/indexer-template.handlebars b/packages/codegen/src/templates/indexer-template.handlebars
index 585854aa..25fe1dee 100644
--- a/packages/codegen/src/templates/indexer-template.handlebars
+++ b/packages/codegen/src/templates/indexer-template.handlebars
@@ -4,19 +4,19 @@
 
 import assert from 'assert';
 import debug from 'debug';
-import { JsonFragment } from '@ethersproject/abi';
 import { DeepPartial } from 'typeorm';
 import JSONbig from 'json-bigint';
 import { ethers } from 'ethers';
-import { BaseProvider } from '@ethersproject/providers';
-import * as codec from '@ipld/dag-json';
 import { sha256 } from 'multiformats/hashes/sha2';
 import { CID } from 'multiformats/cid';
 import _ from 'lodash';
 
+import { JsonFragment } from '@ethersproject/abi';
+import { BaseProvider } from '@ethersproject/providers';
+import * as codec from '@ipld/dag-json';
 import { EthClient } from '@vulcanize/ipld-eth-client';
 import { StorageLayout } from '@vulcanize/solidity-mapper';
-import { EventInterface, Indexer as BaseIndexer, ValueResult, UNKNOWN_EVENT_NAME } from '@vulcanize/util';
+import { EventInterface, Indexer as BaseIndexer, ValueResult, UNKNOWN_EVENT_NAME, ServerConfig } from '@vulcanize/util';
 
 import { Database } from './database';
 import { Contract } from './entity/Contract';
@@ -66,6 +66,7 @@ export type ResultIPLDBlock = {
   };
   contractAddress: string;
   cid: string;
+  kind: string;
   data: string;
 };
 
@@ -75,13 +76,13 @@ export class Indexer {
   _ethProvider: BaseProvider
   _postgraphileClient: EthClient;
   _baseIndexer: BaseIndexer
-  _checkpointInterval: number
+  _serverConfig: ServerConfig
 
   _abi: JsonFragment[]
   _storageLayout: StorageLayout
   _contract: ethers.utils.Interface
 
-  constructor (db: Database, ethClient: EthClient, postgraphileClient: EthClient, ethProvider: BaseProvider, checkpointInterval?: number) {
+  constructor (serverConfig: ServerConfig, db: Database, ethClient: EthClient, postgraphileClient: EthClient, ethProvider: BaseProvider) {
     assert(db);
     assert(ethClient);
 
@@ -89,8 +90,8 @@ export class Indexer {
     this._ethClient = ethClient;
     this._ethProvider = ethProvider;
     this._postgraphileClient = postgraphileClient;
+    this._serverConfig = serverConfig;
     this._baseIndexer = new BaseIndexer(this._db, this._ethClient, this._postgraphileClient);
-    this._checkpointInterval = checkpointInterval || 0;
 
     const { abi, storageLayout } = artifacts;
 
@@ -150,6 +151,7 @@ export class Indexer {
       },
       contractAddress: ipldBlock.contractAddress,
       cid: ipldBlock.cid,
+      kind: ipldBlock.kind,
       data: ipldBlock.data
     };
   }
@@ -217,13 +219,14 @@ export class Indexer {
     // Create a checkpoint IPLDBlock for contracts that were checkpointed checkPointInterval blocks before.
 
     // Return if checkpointInterval is <= 0.
-    if (this._checkpointInterval <= 0) return;
+    const checkpointInterval = this._serverConfig.checkpointInterval;
+    if (checkpointInterval <= 0) return;
 
     const { data: { blockNumber: currentBlockNumber, blockHash: currentBlockHash } } = job;
 
     // Get checkpoint IPLDBlocks with blockNumber: current-checkPointInterval.
     // Assuming checkPointInterval < MAX_REORG_DEPTH.
-    const prevCheckpointBlocks = await this._db.getIPLDBlocks({ block: { blockNumber: currentBlockNumber - this._checkpointInterval }, kind: 'checkpoint' });
+    const prevCheckpointBlocks = await this._db.getIPLDBlocks({ block: { blockNumber: currentBlockNumber - checkpointInterval }, kind: 'checkpoint' });
 
     // For each contractAddress, merge the diff till now.
     for (const checkpointBlock of prevCheckpointBlocks) {
@@ -395,9 +398,9 @@ export class Indexer {
     return { eventName, eventInfo };
   }
 
-  async watchContract (address: string, startingBlock: number, kind: string): Promise<boolean> {
+  async watchContract (address: string, kind: string, startingBlock: number): Promise<boolean> {
     // Always use the checksum address (https://docs.ethers.io/v5/api/utils/address/#utils-getAddress).
-    await this._db.saveContract(ethers.utils.getAddress(address), startingBlock, kind);
+    await this._db.saveContract(ethers.utils.getAddress(address), kind, startingBlock);
 
     // Getting the current block.
     const currentBlock = await this._db.getLatestBlockProgress();
diff --git a/packages/codegen/src/templates/job-runner-template.handlebars b/packages/codegen/src/templates/job-runner-template.handlebars
index a8c2baf0..eaa61705 100644
--- a/packages/codegen/src/templates/job-runner-template.handlebars
+++ b/packages/codegen/src/templates/job-runner-template.handlebars
@@ -19,6 +19,7 @@ import {
   QUEUE_EVENT_PROCESSING,
   QUEUE_BLOCK_CHECKPOINT,
   JobQueueConfig,
+  ServerConfig,
   DEFAULT_CONFIG_PATH
 } from '@vulcanize/util';
 
@@ -32,18 +33,20 @@ export class JobRunner {
   _jobQueue: JobQueue
   _baseJobRunner: BaseJobRunner
   _jobQueueConfig: JobQueueConfig
+  _serverConfig: ServerConfig
 
-  constructor (jobQueueConfig: JobQueueConfig, indexer: Indexer, jobQueue: JobQueue) {
+  constructor (jobQueueConfig: JobQueueConfig, serverConfig: ServerConfig, indexer: Indexer, jobQueue: JobQueue) {
     this._indexer = indexer;
     this._jobQueue = jobQueue;
     this._jobQueueConfig = jobQueueConfig;
+    this._serverConfig = serverConfig;
     this._baseJobRunner = new BaseJobRunner(this._jobQueueConfig, this._indexer, this._jobQueue);
   }
 
-  async start (checkpointing: boolean): Promise<void> {
+  async start (): Promise<void> {
     await this.subscribeBlockProcessingQueue();
     await this.subscribeEventProcessingQueue();
-    if (checkpointing) await this.subscribeBlockCheckpointQueue();
+    if (this._serverConfig.checkpointing) await this.subscribeBlockCheckpointQueue();
   }
 
   async subscribeBlockProcessingQueue (): Promise<void> {
@@ -91,16 +94,15 @@ export const main = async (): Promise<any> => {
 
   const config = await getConfig(argv.f);
 
-  assert(config.server, 'Missing server config');
-
-  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: { checkpointing, checkpointInterval } } = config;
+  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: serverConfig } = config;
 
+  assert(upstream, 'Missing upstream config');
   assert(dbConfig, 'Missing database config');
+  assert(serverConfig, 'Missing server config');
 
   const db = new Database(dbConfig);
   await db.init();
 
-  assert(upstream, 'Missing upstream config');
   const { ethServer: { gqlApiEndpoint, gqlPostgraphileEndpoint, rpcProviderEndpoint }, cache: cacheConfig } = upstream;
   assert(gqlApiEndpoint, 'Missing upstream ethServer.gqlApiEndpoint');
   assert(gqlPostgraphileEndpoint, 'Missing upstream ethServer.gqlPostgraphileEndpoint');
@@ -119,7 +121,7 @@ export const main = async (): Promise<any> => {
   });
 
   const ethProvider = getDefaultProvider(rpcProviderEndpoint);
-  const indexer = new Indexer(db, ethClient, postgraphileClient, ethProvider, checkpointInterval);
+  const indexer = new Indexer(serverConfig, db, ethClient, postgraphileClient, ethProvider);
 
   assert(jobQueueConfig, 'Missing job queue config');
 
@@ -129,8 +131,8 @@ export const main = async (): Promise<any> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const jobRunner = new JobRunner(jobQueueConfig, indexer, jobQueue);
-  await jobRunner.start(checkpointing);
+  const jobRunner = new JobRunner(jobQueueConfig, serverConfig, indexer, jobQueue);
+  await jobRunner.start();
 };
 
 main().then(() => {
diff --git a/packages/codegen/src/templates/resolvers-template.handlebars b/packages/codegen/src/templates/resolvers-template.handlebars
index b408a682..96a8b7d3 100644
--- a/packages/codegen/src/templates/resolvers-template.handlebars
+++ b/packages/codegen/src/templates/resolvers-template.handlebars
@@ -34,9 +34,9 @@ export const createResolvers = async (indexer: Indexer, eventWatcher: EventWatch
     },
 
     Mutation: {
-      watchContract: (_: any, { contractAddress, startingBlock = 1, kind }: { contractAddress: string, startingBlock: number, kind: string }): Promise<boolean> => {
-        log('watchContract', contractAddress, startingBlock, kind);
-        return indexer.watchContract(contractAddress, startingBlock, kind);
+      watchContract: (_: any, { contractAddress, kind, startingBlock = 1 }: { contractAddress: string, kind: string, startingBlock: number }): Promise<boolean> => {
+        log('watchContract', contractAddress, kind, startingBlock);
+        return indexer.watchContract(contractAddress, kind, startingBlock);
       }
     },
 
diff --git a/packages/codegen/src/templates/server-template.handlebars b/packages/codegen/src/templates/server-template.handlebars
index ed588f74..637b8a91 100644
--- a/packages/codegen/src/templates/server-template.handlebars
+++ b/packages/codegen/src/templates/server-template.handlebars
@@ -39,18 +39,17 @@ export const main = async (): Promise<any> => {
 
   const config = await getConfig(argv.f);
 
-  assert(config.server, 'Missing server config');
-
-  const { host, port, kind: watcherKind } = config.server;
-
-  const { upstream, database: dbConfig, jobQueue: jobQueueConfig } = config;
+  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: serverConfig } = config;
 
+  assert(upstream, 'Missing upstream config');
   assert(dbConfig, 'Missing database config');
+  assert(serverConfig, 'Missing server config');
+
+  const { host, port, kind: watcherKind } = serverConfig;
 
   const db = new Database(dbConfig);
   await db.init();
 
-  assert(upstream, 'Missing upstream config');
   const { ethServer: { gqlApiEndpoint, gqlPostgraphileEndpoint, rpcProviderEndpoint }, cache: cacheConfig } = upstream;
   assert(gqlApiEndpoint, 'Missing upstream ethServer.gqlApiEndpoint');
   assert(gqlPostgraphileEndpoint, 'Missing upstream ethServer.gqlPostgraphileEndpoint');
@@ -70,7 +69,7 @@ export const main = async (): Promise<any> => {
 
   const ethProvider = getDefaultProvider(rpcProviderEndpoint);
 
-  const indexer = new Indexer(db, ethClient, postgraphileClient, ethProvider);
+  const indexer = new Indexer(serverConfig, db, ethClient, postgraphileClient, ethProvider);
 
   // Note: In-memory pubsub works fine for now, as each watcher is a single process anyway.
   // Later: https://www.apollographql.com/docs/apollo-server/data/subscriptions/#production-pubsub-libraries
diff --git a/packages/ipld-eth-client/src/eth-client.ts b/packages/ipld-eth-client/src/eth-client.ts
index a1ba84fc..2ebb9386 100644
--- a/packages/ipld-eth-client/src/eth-client.ts
+++ b/packages/ipld-eth-client/src/eth-client.ts
@@ -72,6 +72,16 @@ export class EthClient {
     );
   }
 
+  async getBlock ({ blockNumber, blockHash }: { blockNumber?: number, blockHash?: string }): Promise<any> {
+    return this._graphqlClient.query(
+      ethQueries.getBlock,
+      {
+        blockNumber: blockNumber?.toString(),
+        blockHash
+      }
+    );
+  }
+
   async getBlockByHash (blockHash: string): Promise<any> {
     return this._graphqlClient.query(ethQueries.getBlockByHash, { blockHash });
   }
diff --git a/packages/ipld-eth-client/src/eth-queries.ts b/packages/ipld-eth-client/src/eth-queries.ts
index 9129cc06..143338f9 100644
--- a/packages/ipld-eth-client/src/eth-queries.ts
+++ b/packages/ipld-eth-client/src/eth-queries.ts
@@ -64,6 +64,20 @@ query allEthHeaderCids($blockNumber: BigInt, $blockHash: String) {
 }
 `;
 
+export const getBlock = gql`
+query allEthHeaderCids($blockNumber: BigInt, $blockHash: String) {
+  allEthHeaderCids(condition: { blockNumber: $blockNumber, blockHash: $blockHash }) {
+    nodes {
+      cid
+      blockNumber
+      blockHash
+      parentHash
+      timestamp
+    }
+  }
+}
+`;
+
 export const getBlockByHash = gql`
 query block($blockHash: Bytes32) {
   block(hash: $blockHash) {
@@ -114,6 +128,7 @@ export default {
   getStorageAt,
   getLogs,
   getBlockWithTransactions,
+  getBlock,
   getBlockByHash,
   subscribeBlocks,
   subscribeTransactions
diff --git a/packages/util/src/config.ts b/packages/util/src/config.ts
index 972e89c8..ed05ece2 100644
--- a/packages/util/src/config.ts
+++ b/packages/util/src/config.ts
@@ -18,15 +18,17 @@ export interface JobQueueConfig {
   jobDelayInMilliSecs?: number;
 }
 
+export interface ServerConfig {
+  host: string;
+  port: number;
+  mode: string;
+  kind: string;
+  checkpointing: boolean;
+  checkpointInterval: number;
+}
+
 export interface Config {
-  server: {
-    host: string;
-    port: number;
-    mode: string;
-    kind: string;
-    checkpointing: boolean;
-    checkpointInterval: number;
-  };
+  server: ServerConfig;
   database: ConnectionOptions;
   upstream: {
     cache: CacheConfig,
diff --git a/packages/util/src/indexer.ts b/packages/util/src/indexer.ts
index 51035644..016d81e5 100644
--- a/packages/util/src/indexer.ts
+++ b/packages/util/src/indexer.ts
@@ -112,12 +112,12 @@ export class Indexer {
           {
             cid,
             blockNumber,
-            timestamp,
-            parentHash
+            parentHash,
+            timestamp
           }
         ]
       }
-    } = await this._postgraphileClient.getBlockWithTransactions({ blockHash });
+    } = await this._postgraphileClient.getBlock({ blockHash });
 
     return {
       cid,