diff --git a/contracts/src/AttestationRegistry.sol b/contracts/src/AttestationRegistry.sol
index 75f2d180..36dd3277 100644
--- a/contracts/src/AttestationRegistry.sol
+++ b/contracts/src/AttestationRegistry.sol
@@ -119,20 +119,20 @@ contract AttestationRegistry is OwnableUpgradeable {
     bytes32 id = generateAttestationId(attestationIdCounter);
     assert(id != 0x0 && !isRegistered(id));
     // Create attestation
-    attestations[id] = Attestation(
-      id,
-      attestationPayload.schemaId,
-      bytes32(0),
-      attester,
-      msg.sender,
-      uint64(block.timestamp),
-      attestationPayload.expirationDate,
-      0,
-      version,
-      false,
-      attestationPayload.subject,
-      attestationPayload.attestationData
-    );
+    attestations[id] = Attestation({
+      attestationId: id,
+      schemaId: attestationPayload.schemaId,
+      replacedBy: bytes32(0),
+      attester: attester,
+      portal: msg.sender,
+      attestedDate: uint64(block.timestamp),
+      expirationDate: attestationPayload.expirationDate,
+      revocationDate: 0,
+      version: version,
+      revoked: false,
+      subject: attestationPayload.subject,
+      attestationData: attestationPayload.attestationData
+    });
     emit AttestationRegistered(id);
   }
 
@@ -154,20 +154,20 @@ contract AttestationRegistry is OwnableUpgradeable {
       bytes32 id = generateAttestationId(attestationIdCounter);
       assert(id != 0x0 && !isRegistered(id));
       // Create attestation
-      attestations[id] = Attestation(
-        id,
-        attestationsPayloads[i].schemaId,
-        bytes32(0),
-        msg.sender,
-        portal,
-        uint64(block.timestamp),
-        attestationsPayloads[i].expirationDate,
-        0,
-        version,
-        false,
-        attestationsPayloads[i].subject,
-        attestationsPayloads[i].attestationData
-      );
+      attestations[id] = Attestation({
+        attestationId: id,
+        schemaId: attestationsPayloads[i].schemaId,
+        replacedBy: bytes32(0),
+        attester: msg.sender,
+        portal: portal,
+        attestedDate: uint64(block.timestamp),
+        expirationDate: attestationsPayloads[i].expirationDate,
+        revocationDate: 0,
+        version: version,
+        revoked: false,
+        subject: attestationsPayloads[i].subject,
+        attestationData: attestationsPayloads[i].attestationData
+      });
       emit AttestationRegistered(id);
     }
   }
diff --git a/contracts/src/stdlib/IndexerModuleV2.sol b/contracts/src/stdlib/IndexerModuleV2.sol
index 145923fa..f0bf0562 100644
--- a/contracts/src/stdlib/IndexerModuleV2.sol
+++ b/contracts/src/stdlib/IndexerModuleV2.sol
@@ -190,19 +190,19 @@ contract IndexerModuleV2 is AbstractModuleV2 {
     address portal
   ) internal view returns (Attestation memory) {
     return
-      Attestation(
-        attestationRegistry.getNextAttestationId(),
-        attestationPayload.schemaId,
-        bytes32(0),
-        attester,
-        portal,
-        uint64(block.timestamp),
-        attestationPayload.expirationDate,
-        0,
-        attestationRegistry.getVersionNumber(),
-        false,
-        attestationPayload.subject,
-        attestationPayload.attestationData
-      );
+      Attestation({
+        attestationId: attestationRegistry.getNextAttestationId(),
+        schemaId: attestationPayload.schemaId,
+        replacedBy: bytes32(0),
+        attester: attester,
+        portal: portal,
+        attestedDate: uint64(block.timestamp),
+        expirationDate: attestationPayload.expirationDate,
+        revocationDate: 0,
+        version: attestationRegistry.getVersionNumber(),
+        revoked: false,
+        subject: attestationPayload.subject,
+        attestationData: attestationPayload.attestationData
+      });
   }
 }