diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 # Add here internal Software Heritage dependencies, one per line.
 swh.core[http] >= 0.3
-swh.model >= 0.9.0
+swh.model >= 1.0.0
 swh.storage >= 0.11.1
diff --git a/swh/clearlydefined/mapping_utils.py b/swh/clearlydefined/mapping_utils.py
--- a/swh/clearlydefined/mapping_utils.py
+++ b/swh/clearlydefined/mapping_utils.py
@@ -18,12 +18,11 @@
     ToolNotSupported,
 )
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
-from swh.model.identifiers import parse_swhid
+from swh.model.identifiers import ExtendedSWHID
 from swh.model.model import (
     MetadataAuthority,
     MetadataAuthorityType,
     MetadataFetcher,
-    MetadataTargetType,
     Origin,
     RawExtrinsicMetadata,
 )
@@ -67,7 +66,6 @@
 
 def map_row_data_with_metadata(
     swh_id: str,
-    type: MetadataTargetType,
     origin: Optional[Origin],
     metadata: Dict,
     date: datetime,
@@ -79,8 +77,7 @@
     swh storage
     """
     return RawExtrinsicMetadata(
-        type=type,
-        target=parse_swhid(swh_id),
+        target=ExtendedSWHID.from_string(swh_id),
         discovery_date=date,
         authority=AUTHORITY,
         fetcher=FETCHER,
@@ -140,7 +137,6 @@
             data.append(
                 map_row_data_with_metadata(
                     swh_id=swh_id,
-                    type=MetadataTargetType.CONTENT,
                     origin=None,
                     metadata=file,
                     date=date,
@@ -264,7 +260,6 @@
         if not sha1_git_in_revisions(sha1_git=sha1_git, storage=storage):
             return MappingStatus.UNMAPPED, []
         swh_id = "swh:1:rev:{sha1_git}".format(sha1_git=sha1_git)
-        metadata_type = MetadataTargetType.REVISION
 
     else:
         return MappingStatus.IGNORE, []
@@ -272,7 +267,6 @@
     return MappingStatus.MAPPED, [
         map_row_data_with_metadata(
             swh_id=swh_id,
-            type=metadata_type,
             origin=origin,
             metadata=metadata,
             date=date,
diff --git a/swh/clearlydefined/tests/test_mapping_utils.py b/swh/clearlydefined/tests/test_mapping_utils.py
--- a/swh/clearlydefined/tests/test_mapping_utils.py
+++ b/swh/clearlydefined/tests/test_mapping_utils.py
@@ -27,12 +27,11 @@
 )
 from swh.model import from_disk
 from swh.model.hashutil import hash_to_bytes
-from swh.model.identifiers import parse_swhid
+from swh.model.identifiers import ExtendedSWHID
 from swh.model.model import (
     Content,
     Directory,
     DirectoryEntry,
-    MetadataTargetType,
     Person,
     RawExtrinsicMetadata,
     Revision,
@@ -198,8 +197,7 @@
         MappingStatus.MAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.REVISION,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:rev:4c66129b968ab8122964823d1d77677f50884cf6"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -235,8 +233,7 @@
         MappingStatus.UNMAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:d81cc0710eb6cf9efd5b920a8453e1e07157b6cd"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -271,8 +268,7 @@
         MappingStatus.MAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:d81cc0710eb6cf9efd5b920a8453e1e07157b6cd"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -307,8 +303,7 @@
         MappingStatus.UNMAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:36fade77193cb6d2bd826161a0979d64c28ab4fa"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -344,8 +339,7 @@
         MappingStatus.MAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:36fade77193cb6d2bd826161a0979d64c28ab4fa"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -381,8 +375,7 @@
         MappingStatus.UNMAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:36fade77193cb6d2bd826161a0979d64c28ab4fa"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -397,8 +390,7 @@
                 ).encode("utf-8"),
             ),
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:d81cc0710eb6cf9efd5b920a8453e1e07157b6cd"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -436,8 +428,7 @@
         MappingStatus.MAPPED,
         [
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:36fade77193cb6d2bd826161a0979d64c28ab4fa"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),
@@ -452,8 +443,7 @@
                 ).encode("utf-8"),
             ),
             RawExtrinsicMetadata(
-                type=MetadataTargetType.CONTENT,
-                target=parse_swhid(
+                target=ExtendedSWHID.from_string(
                     "swh:1:cnt:d81cc0710eb6cf9efd5b920a8453e1e07157b6cd"
                 ),
                 discovery_date=datetime(year=2021, month=2, day=6, tzinfo=timezone.utc),