diff --git a/sql/01_tables_graph_database.sql b/sql/01_tables_graph_database.sql
index 37596944..d9622781 100644
--- a/sql/01_tables_graph_database.sql
+++ b/sql/01_tables_graph_database.sql
@@ -1,7 +1,7 @@
 CREATE TABLE networks
 (
     id          UUID PRIMARY KEY,
-    chain_id    NUMERIC     NOT NULL UNIQUE,
+    chain_id    BIGINT      NOT NULL UNIQUE,
     name        TEXT        NOT NULL,
     description TEXT        NOT NULL,
     symbol      VARCHAR(16) NOT NULL
@@ -20,7 +20,7 @@ CREATE TABLE collections
     id               UUID PRIMARY KEY,
     network_id       UUID         NOT NULL REFERENCES networks ON DELETE CASCADE,
     contract_address VARCHAR(128) NOT NULL,
-    start_height     NUMERIC      NOT NULL,
+    start_height     BIGINT       NOT NULL,
     name             TEXT         NOT NULL,
     description      TEXT         NOT NULL,
     symbol           VARCHAR(16)  NOT NULL,
@@ -86,7 +86,7 @@ CREATE TABLE networks_marketplaces
     network_id       UUID         NOT NULL REFERENCES networks ON DELETE CASCADE,
     marketplace_id   UUID         NOT NULL REFERENCES marketplaces ON DELETE CASCADE,
     contract_address VARCHAR(128) NOT NULL,
-    start_height     NUMERIC      NOT NULL,
+    start_height     BIGINT       NOT NULL,
     PRIMARY KEY (network_id, marketplace_id, contract_address)
 );
 
diff --git a/sql/02_tables_events_database.sql b/sql/02_tables_events_database.sql
index cc878fce..cd857c5c 100644
--- a/sql/02_tables_events_database.sql
+++ b/sql/02_tables_events_database.sql
@@ -1,11 +1,11 @@
 CREATE TABLE transfers
 (
     id                 UUID PRIMARY KEY,
-    chain_id           NUMERIC      NOT NULL,
+    chain_id           BIGINT       NOT NULL,
     token_standard     VARCHAR(128) NOT NULL,
     collection_address VARCHAR(128) NOT NULL,
     token_id           VARCHAR(128) NOT NULL,
-    block_number       NUMERIC      NOT NULL,
+    block_number       BIGINT      NOT NULL,
     transaction_hash   VARCHAR(128) NOT NULL,
     event_index        INTEGER      NOT NULL,
     sender_address     VARCHAR(128) NOT NULL,
@@ -23,11 +23,11 @@ CREATE INDEX transfers_token_id_idx ON transfers (token_id);
 CREATE TABLE sales
 (
     id                  UUID PRIMARY KEY,
-    chain_id            NUMERIC      NOT NULL,
+    chain_id            BIGINT       NOT NULL,
     marketplace_address VARCHAR(128) NOT NULL,
     collection_address  VARCHAR(128) NOT NULL,
     token_id            VARCHAR(128) NOT NULL,
-    block_number        NUMERIC      NOT NULL,
+    block_number        BIGINT       NOT NULL,
     transaction_hash    VARCHAR(128) NOT NULL,
     event_index         INTEGER      NOT NULL,
     seller_address      VARCHAR(128) NOT NULL,
@@ -42,7 +42,7 @@ CREATE TABLE sales
 
 CREATE INDEX sales_marketplace_address_idx ON sales (LOWER(marketplace_address));
 
-CREATE INDEX sales_collection_address_idx ON sales (LOWER(collection_address));
+CREATE INDEX sales_collection_address_idx ON sales (LOWER(collection_address), token_id);
 
 CREATE INDEX sales_currency_address_idx ON sales (LOWER(currency_address));