diff --git a/model/actordumps/fevm_actor_dump.go b/model/actordumps/fevm_actor_dump.go
index 91c720924..4f265725a 100644
--- a/model/actordumps/fevm_actor_dump.go
+++ b/model/actordumps/fevm_actor_dump.go
@@ -15,7 +15,7 @@ type FEVMActorDump struct {
 	// Height message was executed at.
 	Height int64 `pg:",pk,notnull,use_zero"`
 	// Actor address.
-	ActorID string `pg:",notnull"`
+	ActorID string `pg:",pk,notnull"`
 	// Actor Address in ETH.
 	EthAddress string `pg:",notnull"`
 	// Contract Bytecode.
@@ -25,7 +25,7 @@ type FEVMActorDump struct {
 	// Balance of EVM actor in attoFIL.
 	Balance string `pg:"type:numeric,notnull"`
 	// The next actor nonce that is expected to appear on chain.
-	Nonce uint64 `pg:",use_zero"`
+	Nonce uint64 `pg:",pk,use_zero"`
 	// Actor Name
 	ActorName string `pg:",notnull"`
 }
diff --git a/model/actors/common/actors.go b/model/actors/common/actors.go
index 356c4e095..60ab83524 100644
--- a/model/actors/common/actors.go
+++ b/model/actors/common/actors.go
@@ -79,6 +79,8 @@ type ActorState struct {
 	Code string `pg:",pk,notnull"`
 	// Top level of state data as json.
 	State string `pg:",type:jsonb,notnull"`
+	// Address of actor.
+	Address string `pg:",pk,notnull"`
 }
 
 func (as *ActorState) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/actors/market/dealstate.go b/model/actors/market/dealstate.go
index b939b436c..dad6d245f 100644
--- a/model/actors/market/dealstate.go
+++ b/model/actors/market/dealstate.go
@@ -13,11 +13,11 @@ import (
 type MarketDealState struct {
 	Height           int64  `pg:",pk,notnull,use_zero"`
 	DealID           uint64 `pg:",pk,use_zero"`
-	SectorStartEpoch int64  `pg:",pk,use_zero"`
-	LastUpdateEpoch  int64  `pg:",pk,use_zero"`
-	SlashEpoch       int64  `pg:",pk,use_zero"`
+	SectorStartEpoch int64  `pg:",use_zero"`
+	LastUpdateEpoch  int64  `pg:",use_zero"`
+	SlashEpoch       int64  `pg:",use_zero"`
 
-	StateRoot string `pg:",notnull"`
+	StateRoot string `pg:",pk,notnull"`
 }
 
 func (ds *MarketDealState) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/actors/miner/sectorevents.go b/model/actors/miner/sectorevents.go
index e710e6bae..6ff83d272 100644
--- a/model/actors/miner/sectorevents.go
+++ b/model/actors/miner/sectorevents.go
@@ -36,7 +36,7 @@ type MinerSectorEvent struct {
 	SectorID  uint64 `pg:",pk,use_zero"`
 	StateRoot string `pg:",pk,notnull"`
 
-	Event string `pg:"type:miner_sector_event_type" pg:",pk,notnull"` // nolint: staticcheck
+	Event string `pg:",pk,type:miner_sector_event_type,notnull"` // nolint: staticcheck
 }
 
 func (mse *MinerSectorEvent) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/blocks/drand.go b/model/blocks/drand.go
index 3149c9947..497bb2ae7 100644
--- a/model/blocks/drand.go
+++ b/model/blocks/drand.go
@@ -29,7 +29,7 @@ type DrandBlockEntrie struct {
 	// Round is the round number of randomness used.
 	Round uint64 `pg:",pk,use_zero"`
 	// Block is the CID of the block.
-	Block string `pg:",notnull"`
+	Block string `pg:",pk,notnull"`
 }
 
 func (dbe *DrandBlockEntrie) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/blocks/parent.go b/model/blocks/parent.go
index af12bc145..ef0676610 100644
--- a/model/blocks/parent.go
+++ b/model/blocks/parent.go
@@ -14,7 +14,7 @@ import (
 type BlockParent struct {
 	Height int64  `pg:",pk,notnull,use_zero"`
 	Block  string `pg:",pk,notnull"`
-	Parent string `pg:",notnull"`
+	Parent string `pg:",pk,notnull"`
 }
 
 func (bp *BlockParent) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/chain/economics.go b/model/chain/economics.go
index 09064a3a6..33a8a42e4 100644
--- a/model/chain/economics.go
+++ b/model/chain/economics.go
@@ -15,7 +15,7 @@ import (
 type ChainEconomics struct {
 	tableName           struct{} `pg:"chain_economics"` // nolint: structcheck
 	Height              int64    `pg:",pk,notnull,use_zero"`
-	ParentStateRoot     string   `pg:",notnull"`
+	ParentStateRoot     string   `pg:",pk,notnull"`
 	CirculatingFil      string   `pg:"type:numeric,notnull"`
 	VestedFil           string   `pg:"type:numeric,notnull"`
 	MinedFil            string   `pg:"type:numeric,notnull"`
diff --git a/model/fevm/contract.go b/model/fevm/contract.go
index 9c6fff6d3..4423a5a6e 100644
--- a/model/fevm/contract.go
+++ b/model/fevm/contract.go
@@ -15,7 +15,7 @@ type FEVMContract struct {
 	// Height message was executed at.
 	Height int64 `pg:",pk,notnull,use_zero"`
 	// Actor address.
-	ActorID string `pg:",notnull"`
+	ActorID string `pg:",pk,notnull"`
 	// Actor Address in ETH.
 	EthAddress string `pg:",notnull"`
 	// Contract Bytecode.
@@ -25,7 +25,7 @@ type FEVMContract struct {
 	// Balance of EVM actor in attoFIL.
 	Balance string `pg:"type:numeric,notnull"`
 	// The next actor nonce that is expected to appear on chain.
-	Nonce uint64 `pg:",use_zero"`
+	Nonce uint64 `pg:",pk,use_zero"`
 }
 
 func (f *FEVMContract) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/fevm/receipt.go b/model/fevm/receipt.go
index ef07a1d9b..1b4c986f9 100644
--- a/model/fevm/receipt.go
+++ b/model/fevm/receipt.go
@@ -17,7 +17,7 @@ type FEVMReceipt struct {
 	// Message CID
 	Message string `pg:",use_zero"`
 	// Hash of transaction.
-	TransactionHash string `pg:",notnull"`
+	TransactionHash string `pg:",pk,notnull"`
 	// Integer of the transactions index position in the block.
 	TransactionIndex uint64 `pg:",use_zero"`
 	// Hash of the block where this transaction was in.
diff --git a/model/messages/actorevent.go b/model/messages/actorevent.go
index 1c1878cee..ea81d1886 100644
--- a/model/messages/actorevent.go
+++ b/model/messages/actorevent.go
@@ -17,11 +17,12 @@ type ActorEvent struct {
 	MessageCid string `pg:",pk,notnull"`
 	EventIndex int64  `pg:",pk,notnull,use_zero"`
 
-	Emitter string `pg:",notnull"`
-	Flags   []byte `pg:",notnull"`
-	Codec   uint64 `pg:",notnull,use_zero"`
-	Key     string `pg:",notnull"`
-	Value   []byte `pg:",notnull"`
+	Emitter    string `pg:",notnull"`
+	Flags      []byte `pg:",notnull"`
+	Codec      uint64 `pg:",notnull,use_zero"`
+	Key        string `pg:",notnull"`
+	Value      []byte `pg:",notnull"`
+	EntryIndex int64  `pg:",pk,notnull,use_zero"`
 }
 
 func (a *ActorEvent) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/model/messages/vm.go b/model/messages/vm.go
index 8abd9543d..2e737dc7b 100644
--- a/model/messages/vm.go
+++ b/model/messages/vm.go
@@ -40,7 +40,7 @@ type VMMessage struct {
 	// Returns value of message receipt.
 	Returns string `pg:",type:jsonb"`
 	// Index indicating the order of the messages execution.
-	Index uint64 `pg:",notnull,use_zero"`
+	Index uint64 `pg:",pk,notnull,use_zero"`
 }
 
 func (v *VMMessage) Persist(ctx context.Context, s model.StorageBatch, _ model.Version) error {
diff --git a/schemas/v1/35_add_pkey_for_tables.go b/schemas/v1/35_add_pkey_for_tables.go
new file mode 100644
index 000000000..b5d250f50
--- /dev/null
+++ b/schemas/v1/35_add_pkey_for_tables.go
@@ -0,0 +1,15 @@
+package v1
+
+func init() {
+	patches.Register(
+		35,
+		`
+		ALTER TABLE {{ .SchemaName | default "public"}}.drand_block_entries DROP CONSTRAINT IF EXISTS drand_block_entries_pkey CASCADE, ADD PRIMARY KEY (round, block);
+		ALTER TABLE {{ .SchemaName | default "public"}}.vm_messages DROP CONSTRAINT IF EXISTS vm_messages_pkey CASCADE, ADD PRIMARY KEY(height, state_root, cid, source, index);
+		ALTER TABLE {{ .SchemaName | default "public"}}.actor_events ADD COLUMN IF NOT EXISTS entry_index bigint;
+		ALTER TABLE {{ .SchemaName | default "public"}}.actor_events DROP CONSTRAINT IF EXISTS actor_events_pkey CASCADE, ADD PRIMARY KEY(height, state_root, message_cid, event_index, entry_index);
+		ALTER TABLE {{ .SchemaName | default "public"}}.actor_states ADD COLUMN IF NOT EXISTS address text DEFAULT '';
+		ALTER TABLE {{ .SchemaName | default "public"}}.actor_states DROP CONSTRAINT IF EXISTS actor_states_pkey CASCADE, ADD PRIMARY KEY(height, head, code, address);
+`,
+	)
+}
diff --git a/storage/sql.go b/storage/sql.go
index 1b2f797b1..9c7652806 100644
--- a/storage/sql.go
+++ b/storage/sql.go
@@ -438,8 +438,17 @@ func (s *TxStorage) PersistModel(ctx context.Context, m interface{}) error {
 		}
 
 	}
+
+	// Prepare the conflict and upsert sql string
+	conflict := ""
+	upsert := ""
 	if s.upsert {
-		conflict, upsert := GenerateUpsertStrings(m)
+		conflict, upsert = GenerateUpsertStrings(m)
+	}
+
+	// If the upsert string is left blank, indicating that all fields serve as primary keys.
+	// In such a case, proceed with the standard insert process.
+	if s.upsert && len(upsert) > 0 {
 		if _, err := s.tx.ModelContext(ctx, m).
 			OnConflict(conflict).
 			Set(upsert).
diff --git a/tasks/actorstate/actorstate.go b/tasks/actorstate/actorstate.go
index c7c117832..c1e9bf309 100644
--- a/tasks/actorstate/actorstate.go
+++ b/tasks/actorstate/actorstate.go
@@ -67,6 +67,8 @@ type ActorStateAPI interface {
 	DiffPreCommitsV8(ctx context.Context, addr address.Address, ts, pts *types.TipSet, pre, cur miner.State) (*miner.PreCommitChangesV8, error)
 
 	MinerLoad(store adt.Store, act *types.Actor) (miner.State, error)
+
+	LookupRobustAddress(ctx context.Context, idAddr address.Address, tsk types.TipSetKey) (address.Address, error)
 }
 
 // An ActorStateExtractor extracts actor state into a persistable format
diff --git a/tasks/actorstate/raw/actor_state.go b/tasks/actorstate/raw/actor_state.go
index 1ae379c55..748c840ac 100644
--- a/tasks/actorstate/raw/actor_state.go
+++ b/tasks/actorstate/raw/actor_state.go
@@ -39,11 +39,18 @@ func (RawActorStateExtractor) Extract(ctx context.Context, a actorstate.ActorInf
 		return nil, err
 	}
 
+	// get the roubust address address from api
+	address, err := node.LookupRobustAddress(ctx, a.Address, a.Current.Key())
+	if err != nil {
+		address = a.Address
+	}
+
 	return &commonmodel.ActorState{
-		Height: int64(a.Current.Height()),
-		Head:   a.Actor.Head.String(),
-		Code:   a.Actor.Code.String(),
-		State:  string(state),
+		Height:  int64(a.Current.Height()),
+		Head:    a.Actor.Head.String(),
+		Code:    a.Actor.Code.String(),
+		Address: address.String(),
+		State:   string(state),
 	}, nil
 }
 
diff --git a/tasks/actorstate/task.go b/tasks/actorstate/task.go
index ad77b1f87..94633fc2b 100644
--- a/tasks/actorstate/task.go
+++ b/tasks/actorstate/task.go
@@ -161,7 +161,6 @@ func (t *Task) startActorStateExtraction(ctx context.Context, current, executed
 	for addr, ac := range actors {
 		addr := addr
 		ac := ac
-
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
diff --git a/tasks/messages/actorevent/task.go b/tasks/messages/actorevent/task.go
index 3bdcb02da..0cdf6bfd4 100644
--- a/tasks/messages/actorevent/task.go
+++ b/tasks/messages/actorevent/task.go
@@ -90,7 +90,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			}
 
 			for evtIdx, event := range events {
-				for _, e := range event.Entries {
+				for entryIdx, e := range event.Entries {
 					emitter, err := address.NewIDAddress(uint64(event.Emitter))
 					if err != nil {
 						errorsDetected = append(errorsDetected, &messages.MessageError{
@@ -109,6 +109,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 						Codec:      e.Codec,
 						Key:        e.Key,
 						Value:      e.Value,
+						EntryIndex: int64(entryIdx),
 					})
 				}
 			}
diff --git a/tasks/test/api.go b/tasks/test/api.go
index c8af74f36..81e1dd176 100644
--- a/tasks/test/api.go
+++ b/tasks/test/api.go
@@ -63,6 +63,11 @@ func (m *MockActorStateAPI) Store() adt.Store {
 	return nil
 }
 
+func (m *MockActorStateAPI) LookupRobustAddress(_ context.Context, _ address.Address, _ types.TipSetKey) (address.Address, error) {
+	m.Called()
+	return address.TestAddress, nil
+}
+
 func (m *MockActorStateAPI) DiffPreCommits(ctx context.Context, _ address.Address, ts, pts *types.TipSet, pre, cur miner.State) (*miner.PreCommitChanges, error) {
 	args := m.Called(ctx, ts, pts, pre, cur)
 	tsmsgs := args.Get(0)