diff --git a/Source/ActivityPub.Types/AS/APActor.cs b/Source/ActivityPub.Types/AS/APActor.cs
index ab8bdd0..cc2578e 100644
--- a/Source/ActivityPub.Types/AS/APActor.cs
+++ b/Source/ActivityPub.Types/AS/APActor.cs
@@ -4,10 +4,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using ActivityPub.Types.Conversion.Overrides;
 using ActivityPub.Types.Internal;
 using ActivityPub.Types.Util;
-using JetBrains.Annotations;
 
 namespace ActivityPub.Types.AS;
 
@@ -22,11 +20,11 @@ namespace ActivityPub.Types.AS;
 public class APActor : ASObject, IASModel<APActor, APActorEntity, ASObject>
 {
     /// <inheritdoc />
-    public APActor() => Entity = TypeMap.Extend<APActorEntity>();
+    public APActor() => Entity = TypeMap.Extend<APActor, APActorEntity>();
 
     /// <inheritdoc />
     public APActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<APActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<APActor, APActorEntity>(isExtending);
 
     /// <inheritdoc />
     public APActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -35,7 +33,7 @@ public APActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     [SetsRequiredMembers]
     public APActor(TypeMap typeMap, APActorEntity? entity) : base(typeMap, null)
     {
-        Entity = entity ?? typeMap.AsEntity<APActorEntity>();
+        Entity = entity ?? typeMap.AsEntity<APActor, APActorEntity>();
         Inbox = Entity.Inbox ?? throw new ArgumentException($"The provided entity is invalid - required {nameof(APActorEntity.Inbox)} property is missing");
         Outbox = Entity.Outbox ?? throw new ArgumentException($"The provided entity is invalid - required {nameof(APActorEntity.Outbox)} property is missing");
     }
@@ -134,10 +132,21 @@ public Linkable<ActorEndpoints>? Endpoints
         get => Entity.Endpoints;
         set => Entity.Endpoints = value;
     }
+    
+    /// <inheritdoc />
+    static bool? IASModel<APActor>.ShouldConvertFrom(JsonElement inputJson, TypeMap typeMap)
+    {
+        if (inputJson.ValueKind != JsonValueKind.Object)
+            return false;
+
+        return
+            inputJson.HasProperty("inbox") &&
+            inputJson.HasProperty("outbox");
+    }
 }
 
 /// <inheritdoc cref="APActor" />
-public sealed class APActorEntity : ASEntity<APActor, APActorEntity>, IAnonymousEntity
+public sealed class APActorEntity : ASEntity<APActor, APActorEntity>
 {
     /// <inheritdoc cref="APActor.Inbox" />
     [JsonPropertyName("inbox")]
@@ -170,56 +179,83 @@ public sealed class APActorEntity : ASEntity<APActor, APActorEntity>, IAnonymous
     /// <inheritdoc cref="APActor.Endpoints" />
     [JsonPropertyName("endpoints")]
     public Linkable<ActorEndpoints>? Endpoints { get; set; }
-
-    /// <inheritdoc />
-    public static bool ShouldConvertFrom(JsonElement inputJson, DeserializationMetadata meta)
-    {
-        if (inputJson.ValueKind != JsonValueKind.Object)
-            return false;
-
-        return
-            inputJson.HasProperty("inbox") &&
-            inputJson.HasProperty("outbox");
-    }
 }
 
 /// <summary>
 ///     A json object which maps additional (typically server/domain-wide) endpoints which may be useful for an actor.
 /// </summary>
 /// <seealso href="https://www.w3.org/TR/activitypub/#actor-objects" />
-[UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature, ImplicitUseTargetFlags.WithMembers)]
-public class ActorEndpoints
+public class ActorEndpoints : ASType, IASModel<ActorEndpoints, ActorEndpointsEntity, ASType>
 {
+    /// <inheritdoc />
+    public ActorEndpoints() => Entity = TypeMap.Extend<ActorEndpoints, ActorEndpointsEntity>();
+
+    /// <inheritdoc />
+    public ActorEndpoints(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
+        => Entity = TypeMap.ProjectTo<ActorEndpoints, ActorEndpointsEntity>(isExtending);
+
+    /// <inheritdoc />
+    public ActorEndpoints(ASType existingGraph) : this(existingGraph.TypeMap) {}
+
+    /// <inheritdoc />
+    [SetsRequiredMembers]
+    public ActorEndpoints(TypeMap typeMap, ActorEndpointsEntity? entity) : base(typeMap, null)
+        => Entity = entity ?? typeMap.AsEntity<ActorEndpoints, ActorEndpointsEntity>();
+
+    static ActorEndpoints IASModel<ActorEndpoints>.FromGraph(TypeMap typeMap) => new(typeMap, null);
+
+    private ActorEndpointsEntity Entity { get; }
+    
     /// <summary>
     ///     Endpoint URI so this actor's clients may access remote ActivityStreams objects which require authentication to access.
     ///     To use this endpoint, the client posts an x-www-form-urlencoded id parameter with the value being the id of the requested ActivityStreams object.
     /// </summary>
     [JsonPropertyName("proxyUrl")]
-    public ASLink? ProxyUrl { get; set; }
+    public ASLink? ProxyUrl
+    {
+        get => Entity.ProxyUrl;
+        set => Entity.ProxyUrl = value;
+    }
 
     /// <summary>
     ///     If OAuth 2.0 bearer tokens [RFC6749] [RFC6750] are being used for authenticating client to server interactions, this endpoint specifies a URI at which a browser-authenticated user may obtain a new authorization grant.
     /// </summary>
     [JsonPropertyName("oauthAuthorizationEndpoint")]
-    public ASLink? OAuthAuthorizationEndpoint { get; set; }
+    public ASLink? OAuthAuthorizationEndpoint
+    {
+        get => Entity.OAuthAuthorizationEndpoint;
+        set => Entity.OAuthAuthorizationEndpoint = value;
+    }
 
     /// <summary>
     ///     If OAuth 2.0 bearer tokens [RFC6749] [RFC6750] are being used for authenticating client to server interactions, this endpoint specifies a URI at which a client may acquire an access token.
     /// </summary>
     [JsonPropertyName("oauthTokenEndpoint")]
-    public ASLink? OAuthTokenEndpoint { get; set; }
+    public ASLink? OAuthTokenEndpoint
+    {
+        get => Entity.OAuthTokenEndpoint;
+        set => Entity.OAuthTokenEndpoint = value;
+    }
 
     /// <summary>
     ///     If Linked Data Signatures and HTTP Signatures are being used for authentication and authorization, this endpoint specifies a URI at which browser-authenticated users may authorize a client's public key for client to server interactions.
     /// </summary>
     [JsonPropertyName("provideClientKey")]
-    public ASLink? ProvideClientKey { get; set; }
+    public ASLink? ProvideClientKey
+    {
+        get => Entity.ProvideClientKey;
+        set => Entity.ProvideClientKey = value;
+    }
 
     /// <summary>
     ///     If Linked Data Signatures and HTTP Signatures are being used for authentication and authorization, this endpoint specifies a URI at which a client key may be signed by the actor's key for a time window to act on behalf of the actor in interacting with foreign servers.
     /// </summary>
     [JsonPropertyName("signClientKey")]
-    public ASLink? SignClientKey { get; set; }
+    public ASLink? SignClientKey
+    {
+        get => Entity.SignClientKey;
+        set => Entity.SignClientKey = value;
+    }
 
     /// <summary>
     ///     An optional endpoint used for wide delivery of publicly addressed activities and activities sent to followers.
@@ -227,5 +263,37 @@ public class ActorEndpoints
     ///     Reading from the sharedInbox endpoint MUST NOT present objects which are not addressed to the Public endpoint.
     /// </summary>
     [JsonPropertyName("sharedInbox")]
+    public ASLink? SharedInbox
+    {
+        get => Entity.SharedInbox;
+        set => Entity.SharedInbox = value;
+    }
+}
+
+/// <inheritdoc cref="ActorEndpoints"/>
+public sealed class ActorEndpointsEntity : ASEntity<ActorEndpoints, ActorEndpointsEntity>
+{
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("proxyUrl")]
+    public ASLink? ProxyUrl { get; set; }
+
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("oauthAuthorizationEndpoint")]
+    public ASLink? OAuthAuthorizationEndpoint { get; set; }
+
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("oauthTokenEndpoint")]
+    public ASLink? OAuthTokenEndpoint { get; set; }
+
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("provideClientKey")]
+    public ASLink? ProvideClientKey { get; set; }
+
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("signClientKey")]
+    public ASLink? SignClientKey { get; set; }
+
+    /// <inheritdoc cref="ActorEndpoints"/>
+    [JsonPropertyName("sharedInbox")]
     public ASLink? SharedInbox { get; set; }
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/AS/ASActivity.cs b/Source/ActivityPub.Types/AS/ASActivity.cs
index 26279cf..db9222d 100644
--- a/Source/ActivityPub.Types/AS/ASActivity.cs
+++ b/Source/ActivityPub.Types/AS/ASActivity.cs
@@ -24,11 +24,11 @@ public class ASActivity : ASObject, IASModel<ASActivity, ASActivityEntity, ASObj
     static string IASModel<ASActivity>.ASTypeName => ActivityType;
 
     /// <inheritdoc />
-    public ASActivity() => Entity = TypeMap.Extend<ASActivityEntity>();
+    public ASActivity() => Entity = TypeMap.Extend<ASActivity, ASActivityEntity>();
 
     /// <inheritdoc />
     public ASActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASActivity, ASActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ASActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -36,7 +36,7 @@ public ASActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASActivity(TypeMap typeMap, ASActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASActivity, ASActivityEntity>();
 
     static ASActivity IASModel<ASActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/ASIntransitiveActivity.cs b/Source/ActivityPub.Types/AS/ASIntransitiveActivity.cs
index 9f89eb1..68ae80c 100644
--- a/Source/ActivityPub.Types/AS/ASIntransitiveActivity.cs
+++ b/Source/ActivityPub.Types/AS/ASIntransitiveActivity.cs
@@ -22,11 +22,11 @@ public class ASIntransitiveActivity : ASActivity, IASModel<ASIntransitiveActivit
     static string IASModel<ASIntransitiveActivity>.ASTypeName => IntransitiveActivityType;
 
     /// <inheritdoc />
-    public ASIntransitiveActivity() => Entity = TypeMap.Extend<ASIntransitiveActivityEntity>();
+    public ASIntransitiveActivity() => Entity = TypeMap.Extend<ASIntransitiveActivity, ASIntransitiveActivityEntity>();
 
     /// <inheritdoc />
     public ASIntransitiveActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASIntransitiveActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASIntransitiveActivity, ASIntransitiveActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ASIntransitiveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public ASIntransitiveActivity(ASType existingGraph) : this(existingGraph.TypeMap
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASIntransitiveActivity(TypeMap typeMap, ASIntransitiveActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASIntransitiveActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASIntransitiveActivity, ASIntransitiveActivityEntity>();
 
     static ASIntransitiveActivity IASModel<ASIntransitiveActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/ASLink.cs b/Source/ActivityPub.Types/AS/ASLink.cs
index 4673e94..9508c70 100644
--- a/Source/ActivityPub.Types/AS/ASLink.cs
+++ b/Source/ActivityPub.Types/AS/ASLink.cs
@@ -26,11 +26,11 @@ public class ASLink : ASType, IASModel<ASLink, ASLinkEntity, ASType>
     static string IASModel<ASLink>.ASTypeName => LinkType;
 
     /// <inheritdoc />
-    public ASLink() => Entity = TypeMap.Extend<ASLinkEntity>();
+    public ASLink() => Entity = TypeMap.Extend<ASLink, ASLinkEntity>();
 
     /// <inheritdoc />
     public ASLink(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASLinkEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASLink, ASLinkEntity>(isExtending);
 
     /// <inheritdoc />
     public ASLink(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -39,7 +39,7 @@ public ASLink(ASType existingGraph) : this(existingGraph.TypeMap) {}
     [SetsRequiredMembers]
     public ASLink(TypeMap typeMap, ASLinkEntity? entity) : base(typeMap, null)
     {
-        Entity = entity ?? typeMap.AsEntity<ASLinkEntity>();
+        Entity = entity ?? typeMap.AsEntity<ASLink, ASLinkEntity>();
         HRef = Entity.HRef ?? throw new ArgumentException($"The provided entity is invalid - required {nameof(ASLinkEntity.HRef)} property is missing");
     }
 
diff --git a/Source/ActivityPub.Types/AS/ASObject.cs b/Source/ActivityPub.Types/AS/ASObject.cs
index 0480ad5..a7b0142 100644
--- a/Source/ActivityPub.Types/AS/ASObject.cs
+++ b/Source/ActivityPub.Types/AS/ASObject.cs
@@ -2,12 +2,9 @@
 // If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using ActivityPub.Types.AS.Collection;
 using ActivityPub.Types.AS.Extended.Object;
-using ActivityPub.Types.Conversion.Overrides;
 using ActivityPub.Types.Util;
 using JetBrains.Annotations;
 
@@ -28,22 +25,22 @@ public class ASObject : ASType, IASModel<ASObject, ASObjectEntity, ASType>
     static string IASModel<ASObject>.ASTypeName => ObjectType;
 
     /// <inheritdoc />
-    public ASObject() => Entity = TypeMap.Extend<ASObjectEntity>();
+    public ASObject() => Entity = TypeMap.Extend<ASObject, ASObjectEntity>();
 
     /// <inheritdoc />
     public ASObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASObject, ASObjectEntity>(isExtending);
 
     /// <summary>
     ///     Constructs a new instance and extends an existing type graph from a provided model.
     /// </summary>
-    /// <seealso cref="TypeMap.Extend{TEntity}()" />
+    /// <seealso cref="TypeMap.Extend{TModel, TEntity}()" />
     public ASObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
 
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASObject(TypeMap typeMap, ASObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASObject, ASObjectEntity>();
 
     static ASObject IASModel<ASObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
@@ -222,8 +219,8 @@ public List<ASLink> Url
     /// <seealso href="https://www.w3.org/TR/activitystreams-vocabulary/#dfn-content" />
     public NaturalLanguageString? Content
     {
-        get => Entity.Content;
-        set => Entity.Content = value;
+        get => Entity.ContentMap;
+        set => Entity.ContentMap = value;
     }
 
     /// <summary>
@@ -329,7 +326,7 @@ public Linkable<ASCollection>? Shares
 }
 
 /// <inheritdoc cref="ASObject" />
-public sealed class ASObjectEntity : ASEntity<ASObject, ASObjectEntity>, ICustomConvertedEntity<ASObjectEntity>
+public sealed class ASObjectEntity : ASEntity<ASObject, ASObjectEntity>, IJsonOnDeserialized, IJsonOnSerializing
 {
     /// <inheritdoc cref="ASObject.Attachment" />
     [JsonPropertyName("attachment")]
@@ -393,7 +390,11 @@ public sealed class ASObjectEntity : ASEntity<ASObject, ASObjectEntity>, ICustom
 
     /// <inheritdoc cref="ASObject.Content" />
     [JsonPropertyName("contentMap")]
-    public NaturalLanguageString? Content { get; set; }
+    public NaturalLanguageString? ContentMap { get; set; }
+
+    /// <inheritdoc cref="ASObject.Content" />
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 
     /// <inheritdoc cref="ASObject.Duration" />
     [JsonPropertyName("duration")]
@@ -430,31 +431,25 @@ public sealed class ASObjectEntity : ASEntity<ASObject, ASObjectEntity>, ICustom
     /// <inheritdoc cref="ASObject.Shares" />
     [JsonPropertyName("shares")]
     public Linkable<ASCollection>? Shares { get; set; }
-
-    static void ICustomConvertedEntity<ASObjectEntity>.PostReadEntity(JsonElement jsonElement, DeserializationMetadata meta, ASObjectEntity entity)
+    
+    // Sync up "content" and "contentMap" properties
+    void IJsonOnDeserialized.OnDeserialized()
     {
-        if (!jsonElement.TryGetProperty("content", out var contentProperty))
-            return;
-
-        var content = contentProperty.GetString();
-        if (content == null)
+        if (Content == null)
             return;
 
-        entity.Content ??= new NaturalLanguageString();
-        entity.Content.DefaultValue = content;
+        if (ContentMap == null)
+            ContentMap = Content;
+        else
+            ContentMap.DefaultValue = Content;
     }
-
-    static void ICustomConvertedEntity<ASObjectEntity>.PostWriteEntity(ASObjectEntity entity, SerializationMetadata meta, JsonElement entityJson, JsonObject outputJson)
+    
+    // Sync up "content" and "contentMap" properties
+    void IJsonOnSerializing.OnSerializing()
     {
-        if (entity.Content == null)
-            return;
-        
-        // Copy Content.DefaultValue to "content"
-        if (entity.Content.DefaultValue != null)
-            outputJson["content"] = JsonValue.Create(entity.Content.DefaultValue, meta.JsonNodeOptions);
-
-        // Remove "contentMap" if it's empty
-        if (!entity.Content.LanguageMap.Any())
-            outputJson.Remove("contentMap");
+        Content = ContentMap?.DefaultValue;
+
+        if (ContentMap?.HasLanguages == false)
+            ContentMap = null;
     }
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/AS/ASType.cs b/Source/ActivityPub.Types/AS/ASType.cs
index c204a43..6bd0cad 100644
--- a/Source/ActivityPub.Types/AS/ASType.cs
+++ b/Source/ActivityPub.Types/AS/ASType.cs
@@ -2,6 +2,7 @@
 // If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization;
 using ActivityPub.Types.Util;
 using JetBrains.Annotations;
@@ -27,7 +28,7 @@ public class ASType : IASModel<ASType, ASTypeEntity>
     public ASType()
     {
         TypeMap = new TypeMap();
-        Entity = TypeMap.Extend<ASTypeEntity>();
+        Entity = TypeMap.Extend<ASType, ASTypeEntity>();
     }
 
     /// <summary>
@@ -40,11 +41,11 @@ public ASType()
     /// <exception cref="InvalidOperationException">If <code>extendGraph</code> is <see langword="true"/> and the entity type already exists in the graph</exception>
     /// <exception cref="InvalidOperationException">If <code>extendGraph</code> is <see langword="true"/> and the entity requires another entity that is missing from the graph</exception>
     /// <exception cref="InvalidCastException">If <code>extendGraph</code> is <see langword="false"/> and the object is not of type <code>TEntity</code></exception>
-    /// <seealso cref="TypeMap.ProjectTo{TEntity}(bool)" />
+    /// <seealso cref="TypeMap.ProjectTo{TModel, TEntity}(bool)" />
     public ASType(TypeMap typeMap, bool isExtending = true)
     {
         TypeMap = typeMap;
-        Entity = TypeMap.ProjectTo<ASTypeEntity>(isExtending);
+        Entity = TypeMap.ProjectTo<ASType, ASTypeEntity>(isExtending);
     }
 
     /// <summary>
@@ -54,7 +55,7 @@ public ASType(TypeMap typeMap, bool isExtending = true)
     public ASType(TypeMap typeMap, ASTypeEntity? entity)
     {
         TypeMap = typeMap;
-        Entity = entity ?? typeMap.AsEntity<ASTypeEntity>();
+        Entity = entity ?? typeMap.AsEntity<ASType, ASTypeEntity>();
     }
 
     static ASType IASModel<ASType>.FromGraph(TypeMap typeMap) => new(typeMap, null);
@@ -131,7 +132,6 @@ public string? MediaType
         set => Entity.MediaType = value;
     }
 
-
     /// <inheritdoc cref="Types.TypeMap.IsModel{TModel}()" />
     public bool Is<TModel>()
         where TModel : ASType, IASModel<TModel>
diff --git a/Source/ActivityPub.Types/AS/Collection/ASCollection.cs b/Source/ActivityPub.Types/AS/Collection/ASCollection.cs
index 35b4deb..a30ff91 100644
--- a/Source/ActivityPub.Types/AS/Collection/ASCollection.cs
+++ b/Source/ActivityPub.Types/AS/Collection/ASCollection.cs
@@ -29,11 +29,11 @@ public class ASCollection : ASObject, IASModel<ASCollection, ASCollectionEntity,
     static string IASModel<ASCollection>.ASTypeName => CollectionType;
 
     /// <inheritdoc />
-    public ASCollection() => Entity = TypeMap.Extend<ASCollectionEntity>();
+    public ASCollection() => Entity = TypeMap.Extend<ASCollection, ASCollectionEntity>();
 
     /// <inheritdoc />
     public ASCollection(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASCollectionEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASCollection, ASCollectionEntity>(isExtending);
     
     /// <inheritdoc />
     public ASCollection(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -41,7 +41,7 @@ public ASCollection(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASCollection(TypeMap typeMap, ASCollectionEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASCollectionEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASCollection, ASCollectionEntity>();
 
     static ASCollection IASModel<ASCollection>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Collection/ASCollectionPage.cs b/Source/ActivityPub.Types/AS/Collection/ASCollectionPage.cs
index c9a6fe1..d24afbe 100644
--- a/Source/ActivityPub.Types/AS/Collection/ASCollectionPage.cs
+++ b/Source/ActivityPub.Types/AS/Collection/ASCollectionPage.cs
@@ -26,11 +26,11 @@ public class ASCollectionPage : ASCollection, IASModel<ASCollectionPage, ASColle
     static string IASModel<ASCollectionPage>.ASTypeName => CollectionPageType;
 
     /// <inheritdoc />
-    public ASCollectionPage() => Entity = TypeMap.Extend<ASCollectionPageEntity>();
+    public ASCollectionPage() => Entity = TypeMap.Extend<ASCollectionPage, ASCollectionPageEntity>();
 
     /// <inheritdoc />
     public ASCollectionPage(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASCollectionPageEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASCollectionPage, ASCollectionPageEntity>(isExtending);
 
     /// <inheritdoc />
     public ASCollectionPage(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -38,7 +38,7 @@ public ASCollectionPage(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASCollectionPage(TypeMap typeMap, ASCollectionPageEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASCollectionPageEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASCollectionPage, ASCollectionPageEntity>();
 
     static ASCollectionPage IASModel<ASCollectionPage>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Collection/ASOrderedCollection.cs b/Source/ActivityPub.Types/AS/Collection/ASOrderedCollection.cs
index 7f3fa7f..d07f322 100644
--- a/Source/ActivityPub.Types/AS/Collection/ASOrderedCollection.cs
+++ b/Source/ActivityPub.Types/AS/Collection/ASOrderedCollection.cs
@@ -29,11 +29,11 @@ public class ASOrderedCollection : ASObject, IASModel<ASOrderedCollection, ASOrd
     static string IASModel<ASOrderedCollection>.ASTypeName => OrderedCollectionType;
 
     /// <inheritdoc />
-    public ASOrderedCollection() => Entity = TypeMap.Extend<ASOrderedCollectionEntity>();
+    public ASOrderedCollection() => Entity = TypeMap.Extend<ASOrderedCollection, ASOrderedCollectionEntity>();
 
     /// <inheritdoc />
     public ASOrderedCollection(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASOrderedCollectionEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASOrderedCollection, ASOrderedCollectionEntity>(isExtending);
 
     /// <inheritdoc />
     public ASOrderedCollection(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -41,7 +41,7 @@ public ASOrderedCollection(ASType existingGraph) : this(existingGraph.TypeMap) {
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASOrderedCollection(TypeMap typeMap, ASOrderedCollectionEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASOrderedCollectionEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASOrderedCollection, ASOrderedCollectionEntity>();
 
     static ASOrderedCollection IASModel<ASOrderedCollection>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Collection/ASOrderedCollectionPage.cs b/Source/ActivityPub.Types/AS/Collection/ASOrderedCollectionPage.cs
index cf23d17..a4f90e5 100644
--- a/Source/ActivityPub.Types/AS/Collection/ASOrderedCollectionPage.cs
+++ b/Source/ActivityPub.Types/AS/Collection/ASOrderedCollectionPage.cs
@@ -26,11 +26,11 @@ public class ASOrderedCollectionPage : ASOrderedCollection, IASModel<ASOrderedCo
     static string IASModel<ASOrderedCollectionPage>.ASTypeName => OrderedCollectionPageType;
 
     /// <inheritdoc />
-    public ASOrderedCollectionPage() => Entity = TypeMap.Extend<ASOrderedCollectionPageEntity>();
+    public ASOrderedCollectionPage() => Entity = TypeMap.Extend<ASOrderedCollectionPage, ASOrderedCollectionPageEntity>();
 
     /// <inheritdoc />
     public ASOrderedCollectionPage(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ASOrderedCollectionPageEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ASOrderedCollectionPage, ASOrderedCollectionPageEntity>(isExtending);
 
     /// <inheritdoc />
     public ASOrderedCollectionPage(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -38,7 +38,7 @@ public ASOrderedCollectionPage(ASType existingGraph) : this(existingGraph.TypeMa
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ASOrderedCollectionPage(TypeMap typeMap, ASOrderedCollectionPageEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ASOrderedCollectionPageEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ASOrderedCollectionPage, ASOrderedCollectionPageEntity>();
 
     static ASOrderedCollectionPage IASModel<ASOrderedCollectionPage>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/AcceptActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/AcceptActivity.cs
index 6b47f32..570cc81 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/AcceptActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/AcceptActivity.cs
@@ -20,11 +20,11 @@ public class AcceptActivity : ASActivity, IASModel<AcceptActivity, AcceptActivit
     static string IASModel<AcceptActivity>.ASTypeName => AcceptType;
 
     /// <inheritdoc />
-    public AcceptActivity() => Entity = TypeMap.Extend<AcceptActivityEntity>();
+    public AcceptActivity() => Entity = TypeMap.Extend<AcceptActivity, AcceptActivityEntity>();
 
     /// <inheritdoc />
     public AcceptActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<AcceptActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<AcceptActivity, AcceptActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public AcceptActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public AcceptActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public AcceptActivity(TypeMap typeMap, AcceptActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<AcceptActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<AcceptActivity, AcceptActivityEntity>();
 
     static AcceptActivity IASModel<AcceptActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/AddActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/AddActivity.cs
index 196e512..437be85 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/AddActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/AddActivity.cs
@@ -21,11 +21,11 @@ public class AddActivity : ASActivity, IASModel<AddActivity, AddActivityEntity,
     static string IASModel<AddActivity>.ASTypeName => AddType;
 
     /// <inheritdoc />
-    public AddActivity() => Entity = TypeMap.Extend<AddActivityEntity>();
+    public AddActivity() => Entity = TypeMap.Extend<AddActivity, AddActivityEntity>();
 
     /// <inheritdoc />
     public AddActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<AddActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<AddActivity, AddActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public AddActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public AddActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public AddActivity(TypeMap typeMap, AddActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<AddActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<AddActivity, AddActivityEntity>();
 
     static AddActivity IASModel<AddActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/AnnounceActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/AnnounceActivity.cs
index 8fde35b..92ea1b3 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/AnnounceActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/AnnounceActivity.cs
@@ -21,11 +21,11 @@ public class AnnounceActivity : ASActivity, IASModel<AnnounceActivity, AnnounceA
     static string IASModel<AnnounceActivity>.ASTypeName => AnnounceType;
 
     /// <inheritdoc />
-    public AnnounceActivity() => Entity = TypeMap.Extend<AnnounceActivityEntity>();
+    public AnnounceActivity() => Entity = TypeMap.Extend<AnnounceActivity, AnnounceActivityEntity>();
 
     /// <inheritdoc />
     public AnnounceActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<AnnounceActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<AnnounceActivity, AnnounceActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public AnnounceActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public AnnounceActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public AnnounceActivity(TypeMap typeMap, AnnounceActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<AnnounceActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<AnnounceActivity, AnnounceActivityEntity>();
 
     static AnnounceActivity IASModel<AnnounceActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/ArriveActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/ArriveActivity.cs
index 402bc85..d27bad5 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/ArriveActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/ArriveActivity.cs
@@ -22,11 +22,11 @@ public class ArriveActivity : ASIntransitiveActivity, IASModel<ArriveActivity, A
     static string IASModel<ArriveActivity>.ASTypeName => ArriveType;
 
     /// <inheritdoc />
-    public ArriveActivity() => Entity = TypeMap.Extend<ArriveActivityEntity>();
+    public ArriveActivity() => Entity = TypeMap.Extend<ArriveActivity, ArriveActivityEntity>();
 
     /// <inheritdoc />
     public ArriveActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ArriveActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ArriveActivity, ArriveActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ArriveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public ArriveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ArriveActivity(TypeMap typeMap, ArriveActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ArriveActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ArriveActivity, ArriveActivityEntity>();
 
     static ArriveActivity IASModel<ArriveActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/BlockActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/BlockActivity.cs
index be21d85..e7de536 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/BlockActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/BlockActivity.cs
@@ -23,11 +23,11 @@ public class BlockActivity : IgnoreActivity, IASModel<BlockActivity, BlockActivi
     static string IASModel<BlockActivity>.ASTypeName => BlockType;
 
     /// <inheritdoc />
-    public BlockActivity() => Entity = TypeMap.Extend<BlockActivityEntity>();
+    public BlockActivity() => Entity = TypeMap.Extend<BlockActivity, BlockActivityEntity>();
 
     /// <inheritdoc />
     public BlockActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<BlockActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<BlockActivity, BlockActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public BlockActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -35,7 +35,7 @@ public BlockActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public BlockActivity(TypeMap typeMap, BlockActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<BlockActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<BlockActivity, BlockActivityEntity>();
 
     static BlockActivity IASModel<BlockActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/CreateActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/CreateActivity.cs
index 50f1b3a..6c40290 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/CreateActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/CreateActivity.cs
@@ -20,11 +20,11 @@ public class CreateActivity : ASActivity, IASModel<CreateActivity, CreateActivit
     static string IASModel<CreateActivity>.ASTypeName => CreateType;
 
     /// <inheritdoc />
-    public CreateActivity() => Entity = TypeMap.Extend<CreateActivityEntity>();
+    public CreateActivity() => Entity = TypeMap.Extend<CreateActivity, CreateActivityEntity>();
 
     /// <inheritdoc />
     public CreateActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<CreateActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<CreateActivity, CreateActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public CreateActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public CreateActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public CreateActivity(TypeMap typeMap, CreateActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<CreateActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<CreateActivity, CreateActivityEntity>();
 
     static CreateActivity IASModel<CreateActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/DeleteActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/DeleteActivity.cs
index 335abd3..dd0401f 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/DeleteActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/DeleteActivity.cs
@@ -21,11 +21,11 @@ public class DeleteActivity : ASActivity, IASModel<DeleteActivity, DeleteActivit
     static string IASModel<DeleteActivity>.ASTypeName => DeleteType;
 
     /// <inheritdoc />
-    public DeleteActivity() => Entity = TypeMap.Extend<DeleteActivityEntity>();
+    public DeleteActivity() => Entity = TypeMap.Extend<DeleteActivity, DeleteActivityEntity>();
 
     /// <inheritdoc />
     public DeleteActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<DeleteActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<DeleteActivity, DeleteActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public DeleteActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public DeleteActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public DeleteActivity(TypeMap typeMap, DeleteActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<DeleteActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<DeleteActivity, DeleteActivityEntity>();
 
     static DeleteActivity IASModel<DeleteActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/DislikeActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/DislikeActivity.cs
index f520f50..0939303 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/DislikeActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/DislikeActivity.cs
@@ -20,11 +20,11 @@ public class DislikeActivity : ASActivity, IASModel<DislikeActivity, DislikeActi
     static string IASModel<DislikeActivity>.ASTypeName => DislikeType;
 
     /// <inheritdoc />
-    public DislikeActivity() => Entity = TypeMap.Extend<DislikeActivityEntity>();
+    public DislikeActivity() => Entity = TypeMap.Extend<DislikeActivity, DislikeActivityEntity>();
 
     /// <inheritdoc />
     public DislikeActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<DislikeActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<DislikeActivity, DislikeActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public DislikeActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public DislikeActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public DislikeActivity(TypeMap typeMap, DislikeActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<DislikeActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<DislikeActivity, DislikeActivityEntity>();
 
     static DislikeActivity IASModel<DislikeActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/FlagActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/FlagActivity.cs
index d04daf8..0dc0464 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/FlagActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/FlagActivity.cs
@@ -21,11 +21,11 @@ public class FlagActivity : ASActivity, IASModel<FlagActivity, FlagActivityEntit
     static string IASModel<FlagActivity>.ASTypeName => FlagType;
 
     /// <inheritdoc />
-    public FlagActivity() => Entity = TypeMap.Extend<FlagActivityEntity>();
+    public FlagActivity() => Entity = TypeMap.Extend<FlagActivity, FlagActivityEntity>();
 
     /// <inheritdoc />
     public FlagActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<FlagActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<FlagActivity, FlagActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public FlagActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public FlagActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public FlagActivity(TypeMap typeMap, FlagActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<FlagActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<FlagActivity, FlagActivityEntity>();
 
     static FlagActivity IASModel<FlagActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/FollowActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/FollowActivity.cs
index fe27314..0d5bdfe 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/FollowActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/FollowActivity.cs
@@ -22,11 +22,11 @@ public class FollowActivity : ASActivity, IASModel<FollowActivity, FollowActivit
     static string IASModel<FollowActivity>.ASTypeName => FollowType;
 
     /// <inheritdoc />
-    public FollowActivity() => Entity = TypeMap.Extend<FollowActivityEntity>();
+    public FollowActivity() => Entity = TypeMap.Extend<FollowActivity, FollowActivityEntity>();
 
     /// <inheritdoc />
     public FollowActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<FollowActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<FollowActivity, FollowActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public FollowActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public FollowActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public FollowActivity(TypeMap typeMap, FollowActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<FollowActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<FollowActivity, FollowActivityEntity>();
 
     static FollowActivity IASModel<FollowActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/IgnoreActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/IgnoreActivity.cs
index eaab7ce..cf31d61 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/IgnoreActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/IgnoreActivity.cs
@@ -20,11 +20,11 @@ public class IgnoreActivity : ASActivity, IASModel<IgnoreActivity, IgnoreActivit
     static string IASModel<IgnoreActivity>.ASTypeName => IgnoreType;
 
     /// <inheritdoc />
-    public IgnoreActivity() => Entity = TypeMap.Extend<IgnoreActivityEntity>();
+    public IgnoreActivity() => Entity = TypeMap.Extend<IgnoreActivity, IgnoreActivityEntity>();
 
     /// <inheritdoc />
     public IgnoreActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<IgnoreActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<IgnoreActivity, IgnoreActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public IgnoreActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public IgnoreActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public IgnoreActivity(TypeMap typeMap, IgnoreActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<IgnoreActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<IgnoreActivity, IgnoreActivityEntity>();
 
     static IgnoreActivity IASModel<IgnoreActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/InviteActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/InviteActivity.cs
index 1c9e926..618d519 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/InviteActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/InviteActivity.cs
@@ -20,11 +20,11 @@ public class InviteActivity : OfferActivity, IASModel<InviteActivity, InviteActi
     static string IASModel<InviteActivity>.ASTypeName => InviteType;
 
     /// <inheritdoc />
-    public InviteActivity() => Entity = TypeMap.Extend<InviteActivityEntity>();
+    public InviteActivity() => Entity = TypeMap.Extend<InviteActivity, InviteActivityEntity>();
 
     /// <inheritdoc />
     public InviteActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<InviteActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<InviteActivity, InviteActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public InviteActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public InviteActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public InviteActivity(TypeMap typeMap, InviteActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<InviteActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<InviteActivity, InviteActivityEntity>();
 
     static InviteActivity IASModel<InviteActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/JoinActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/JoinActivity.cs
index efec58e..84fa9e8 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/JoinActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/JoinActivity.cs
@@ -21,11 +21,11 @@ public class JoinActivity : ASActivity, IASModel<JoinActivity, JoinActivityEntit
     static string IASModel<JoinActivity>.ASTypeName => JoinType;
 
     /// <inheritdoc />
-    public JoinActivity() => Entity = TypeMap.Extend<JoinActivityEntity>();
+    public JoinActivity() => Entity = TypeMap.Extend<JoinActivity, JoinActivityEntity>();
 
     /// <inheritdoc />
     public JoinActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<JoinActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<JoinActivity, JoinActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public JoinActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public JoinActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public JoinActivity(TypeMap typeMap, JoinActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<JoinActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<JoinActivity, JoinActivityEntity>();
 
     static JoinActivity IASModel<JoinActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/LeaveActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/LeaveActivity.cs
index e2759b5..3d4d51f 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/LeaveActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/LeaveActivity.cs
@@ -21,11 +21,11 @@ public class LeaveActivity : ASActivity, IASModel<LeaveActivity, LeaveActivityEn
     static string IASModel<LeaveActivity>.ASTypeName => LeaveType;
 
     /// <inheritdoc />
-    public LeaveActivity() => Entity = TypeMap.Extend<LeaveActivityEntity>();
+    public LeaveActivity() => Entity = TypeMap.Extend<LeaveActivity, LeaveActivityEntity>();
 
     /// <inheritdoc />
     public LeaveActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<LeaveActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<LeaveActivity, LeaveActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public LeaveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public LeaveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public LeaveActivity(TypeMap typeMap, LeaveActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<LeaveActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<LeaveActivity, LeaveActivityEntity>();
 
     static LeaveActivity IASModel<LeaveActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/LikeActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/LikeActivity.cs
index bcfdebb..8336886 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/LikeActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/LikeActivity.cs
@@ -21,11 +21,11 @@ public class LikeActivity : ASActivity, IASModel<LikeActivity, LikeActivityEntit
     static string IASModel<LikeActivity>.ASTypeName => LikeType;
 
     /// <inheritdoc />
-    public LikeActivity() => Entity = TypeMap.Extend<LikeActivityEntity>();
+    public LikeActivity() => Entity = TypeMap.Extend<LikeActivity, LikeActivityEntity>();
 
     /// <inheritdoc />
     public LikeActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<LikeActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<LikeActivity, LikeActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public LikeActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public LikeActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public LikeActivity(TypeMap typeMap, LikeActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<LikeActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<LikeActivity, LikeActivityEntity>();
 
     static LikeActivity IASModel<LikeActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/ListenActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/ListenActivity.cs
index 750c59c..58ca893 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/ListenActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/ListenActivity.cs
@@ -20,11 +20,11 @@ public class ListenActivity : ASActivity, IASModel<ListenActivity, ListenActivit
     static string IASModel<ListenActivity>.ASTypeName => ListenType;
 
     /// <inheritdoc />
-    public ListenActivity() => Entity = TypeMap.Extend<ListenActivityEntity>();
+    public ListenActivity() => Entity = TypeMap.Extend<ListenActivity, ListenActivityEntity>();
 
     /// <inheritdoc />
     public ListenActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ListenActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ListenActivity, ListenActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ListenActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ListenActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ListenActivity(TypeMap typeMap, ListenActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ListenActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ListenActivity, ListenActivityEntity>();
 
     static ListenActivity IASModel<ListenActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/MoveActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/MoveActivity.cs
index 4e3eaeb..9a710ee 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/MoveActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/MoveActivity.cs
@@ -21,11 +21,11 @@ public class MoveActivity : ASActivity, IASModel<MoveActivity, MoveActivityEntit
     static string IASModel<MoveActivity>.ASTypeName => MoveType;
 
     /// <inheritdoc />
-    public MoveActivity() => Entity = TypeMap.Extend<MoveActivityEntity>();
+    public MoveActivity() => Entity = TypeMap.Extend<MoveActivity, MoveActivityEntity>();
 
     /// <inheritdoc />
     public MoveActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<MoveActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<MoveActivity, MoveActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public MoveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public MoveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public MoveActivity(TypeMap typeMap, MoveActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<MoveActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<MoveActivity, MoveActivityEntity>();
 
     static MoveActivity IASModel<MoveActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/OfferActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/OfferActivity.cs
index efdf860..49f76bb 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/OfferActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/OfferActivity.cs
@@ -21,11 +21,11 @@ public class OfferActivity : ASActivity, IASModel<OfferActivity, OfferActivityEn
     static string IASModel<OfferActivity>.ASTypeName => OfferType;
 
     /// <inheritdoc />
-    public OfferActivity() => Entity = TypeMap.Extend<OfferActivityEntity>();
+    public OfferActivity() => Entity = TypeMap.Extend<OfferActivity, OfferActivityEntity>();
 
     /// <inheritdoc />
     public OfferActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<OfferActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<OfferActivity, OfferActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public OfferActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public OfferActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public OfferActivity(TypeMap typeMap, OfferActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<OfferActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<OfferActivity, OfferActivityEntity>();
 
     static OfferActivity IASModel<OfferActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/QuestionActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/QuestionActivity.cs
index 13bc656..68af93e 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/QuestionActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/QuestionActivity.cs
@@ -24,11 +24,11 @@ public class QuestionActivity : ASIntransitiveActivity, IASModel<QuestionActivit
     static string IASModel<QuestionActivity>.ASTypeName => QuestionType;
 
     /// <inheritdoc />
-    public QuestionActivity() => Entity = TypeMap.Extend<QuestionActivityEntity>();
+    public QuestionActivity() => Entity = TypeMap.Extend<QuestionActivity, QuestionActivityEntity>();
 
     /// <inheritdoc />
     public QuestionActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<QuestionActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<QuestionActivity, QuestionActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public QuestionActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -36,7 +36,7 @@ public QuestionActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public QuestionActivity(TypeMap typeMap, QuestionActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<QuestionActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<QuestionActivity, QuestionActivityEntity>();
 
     static QuestionActivity IASModel<QuestionActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/ReadActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/ReadActivity.cs
index 33a2ce7..eec891a 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/ReadActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/ReadActivity.cs
@@ -20,11 +20,11 @@ public class ReadActivity : ASActivity, IASModel<ReadActivity, ReadActivityEntit
     static string IASModel<ReadActivity>.ASTypeName => ReadType;
 
     /// <inheritdoc />
-    public ReadActivity() => Entity = TypeMap.Extend<ReadActivityEntity>();
+    public ReadActivity() => Entity = TypeMap.Extend<ReadActivity, ReadActivityEntity>();
 
     /// <inheritdoc />
     public ReadActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ReadActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ReadActivity, ReadActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ReadActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ReadActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ReadActivity(TypeMap typeMap, ReadActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ReadActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ReadActivity, ReadActivityEntity>();
 
     static ReadActivity IASModel<ReadActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/RejectActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/RejectActivity.cs
index 5245e7f..73eab0b 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/RejectActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/RejectActivity.cs
@@ -21,11 +21,11 @@ public class RejectActivity : ASActivity, IASModel<RejectActivity, RejectActivit
     static string IASModel<RejectActivity>.ASTypeName => RejectType;
 
     /// <inheritdoc />
-    public RejectActivity() => Entity = TypeMap.Extend<RejectActivityEntity>();
+    public RejectActivity() => Entity = TypeMap.Extend<RejectActivity, RejectActivityEntity>();
 
     /// <inheritdoc />
     public RejectActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<RejectActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<RejectActivity, RejectActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public RejectActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public RejectActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public RejectActivity(TypeMap typeMap, RejectActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<RejectActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<RejectActivity, RejectActivityEntity>();
 
     static RejectActivity IASModel<RejectActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/RemoveActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/RemoveActivity.cs
index 734b3e8..ad953ae 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/RemoveActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/RemoveActivity.cs
@@ -21,11 +21,11 @@ public class RemoveActivity : ASActivity, IASModel<RemoveActivity, RemoveActivit
     static string IASModel<RemoveActivity>.ASTypeName => RemoveType;
 
     /// <inheritdoc />
-    public RemoveActivity() => Entity = TypeMap.Extend<RemoveActivityEntity>();
+    public RemoveActivity() => Entity = TypeMap.Extend<RemoveActivity, RemoveActivityEntity>();
 
     /// <inheritdoc />
     public RemoveActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<RemoveActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<RemoveActivity, RemoveActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public RemoveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public RemoveActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public RemoveActivity(TypeMap typeMap, RemoveActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<RemoveActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<RemoveActivity, RemoveActivityEntity>();
 
     static RemoveActivity IASModel<RemoveActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/TentativeAcceptActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/TentativeAcceptActivity.cs
index 2949fcf..8f198b0 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/TentativeAcceptActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/TentativeAcceptActivity.cs
@@ -20,11 +20,11 @@ public class TentativeAcceptActivity : AcceptActivity, IASModel<TentativeAcceptA
     static string IASModel<TentativeAcceptActivity>.ASTypeName => TentativeAcceptType;
 
     /// <inheritdoc />
-    public TentativeAcceptActivity() => Entity = TypeMap.Extend<TentativeAcceptActivityEntity>();
+    public TentativeAcceptActivity() => Entity = TypeMap.Extend<TentativeAcceptActivity, TentativeAcceptActivityEntity>();
 
     /// <inheritdoc />
     public TentativeAcceptActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<TentativeAcceptActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<TentativeAcceptActivity, TentativeAcceptActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public TentativeAcceptActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public TentativeAcceptActivity(ASType existingGraph) : this(existingGraph.TypeMa
     /// <inheritdoc />
     [SetsRequiredMembers]
     public TentativeAcceptActivity(TypeMap typeMap, TentativeAcceptActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<TentativeAcceptActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<TentativeAcceptActivity, TentativeAcceptActivityEntity>();
 
     static TentativeAcceptActivity IASModel<TentativeAcceptActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/TentativeRejectActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/TentativeRejectActivity.cs
index b7ceba3..7275982 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/TentativeRejectActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/TentativeRejectActivity.cs
@@ -20,11 +20,11 @@ public class TentativeRejectActivity : RejectActivity, IASModel<TentativeRejectA
     static string IASModel<TentativeRejectActivity>.ASTypeName => TentativeRejectType;
 
     /// <inheritdoc />
-    public TentativeRejectActivity() => Entity = TypeMap.Extend<TentativeRejectActivityEntity>();
+    public TentativeRejectActivity() => Entity = TypeMap.Extend<TentativeRejectActivity, TentativeRejectActivityEntity>();
 
     /// <inheritdoc />
     public TentativeRejectActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<TentativeRejectActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<TentativeRejectActivity, TentativeRejectActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public TentativeRejectActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public TentativeRejectActivity(ASType existingGraph) : this(existingGraph.TypeMa
     /// <inheritdoc />
     [SetsRequiredMembers]
     public TentativeRejectActivity(TypeMap typeMap, TentativeRejectActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<TentativeRejectActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<TentativeRejectActivity, TentativeRejectActivityEntity>();
 
     static TentativeRejectActivity IASModel<TentativeRejectActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/TravelActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/TravelActivity.cs
index ffbf294..45c4717 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/TravelActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/TravelActivity.cs
@@ -22,11 +22,11 @@ public class TravelActivity : ASIntransitiveActivity, IASModel<TravelActivity, T
     static string IASModel<TravelActivity>.ASTypeName => TravelType;
 
     /// <inheritdoc />
-    public TravelActivity() => Entity = TypeMap.Extend<TravelActivityEntity>();
+    public TravelActivity() => Entity = TypeMap.Extend<TravelActivity, TravelActivityEntity>();
 
     /// <inheritdoc />
     public TravelActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<TravelActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<TravelActivity, TravelActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public TravelActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public TravelActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public TravelActivity(TypeMap typeMap, TravelActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<TravelActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<TravelActivity, TravelActivityEntity>();
 
     static TravelActivity IASModel<TravelActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/UndoActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/UndoActivity.cs
index b3ec48d..8414b29 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/UndoActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/UndoActivity.cs
@@ -22,11 +22,11 @@ public class UndoActivity : ASActivity, IASModel<UndoActivity, UndoActivityEntit
     static string IASModel<UndoActivity>.ASTypeName => UndoType;
 
     /// <inheritdoc />
-    public UndoActivity() => Entity = TypeMap.Extend<UndoActivityEntity>();
+    public UndoActivity() => Entity = TypeMap.Extend<UndoActivity, UndoActivityEntity>();
 
     /// <inheritdoc />
     public UndoActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<UndoActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<UndoActivity, UndoActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public UndoActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public UndoActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public UndoActivity(TypeMap typeMap, UndoActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<UndoActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<UndoActivity, UndoActivityEntity>();
 
     static UndoActivity IASModel<UndoActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/UpdateActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/UpdateActivity.cs
index f379983..7a889c4 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/UpdateActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/UpdateActivity.cs
@@ -22,11 +22,11 @@ public class UpdateActivity : ASActivity, IASModel<UpdateActivity, UpdateActivit
     static string IASModel<UpdateActivity>.ASTypeName => UpdateType;
 
     /// <inheritdoc />
-    public UpdateActivity() => Entity = TypeMap.Extend<UpdateActivityEntity>();
+    public UpdateActivity() => Entity = TypeMap.Extend<UpdateActivity, UpdateActivityEntity>();
 
     /// <inheritdoc />
     public UpdateActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<UpdateActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<UpdateActivity, UpdateActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public UpdateActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public UpdateActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public UpdateActivity(TypeMap typeMap, UpdateActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<UpdateActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<UpdateActivity, UpdateActivityEntity>();
 
     static UpdateActivity IASModel<UpdateActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Activity/ViewActivity.cs b/Source/ActivityPub.Types/AS/Extended/Activity/ViewActivity.cs
index fe5f97f..71edb00 100644
--- a/Source/ActivityPub.Types/AS/Extended/Activity/ViewActivity.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Activity/ViewActivity.cs
@@ -20,11 +20,11 @@ public class ViewActivity : ASActivity, IASModel<ViewActivity, ViewActivityEntit
     static string IASModel<ViewActivity>.ASTypeName => ViewType;
 
     /// <inheritdoc />
-    public ViewActivity() => Entity = TypeMap.Extend<ViewActivityEntity>();
+    public ViewActivity() => Entity = TypeMap.Extend<ViewActivity, ViewActivityEntity>();
 
     /// <inheritdoc />
     public ViewActivity(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ViewActivityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ViewActivity, ViewActivityEntity>(isExtending);
 
     /// <inheritdoc />
     public ViewActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ViewActivity(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ViewActivity(TypeMap typeMap, ViewActivityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ViewActivityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ViewActivity, ViewActivityEntity>();
 
     static ViewActivity IASModel<ViewActivity>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Actor/ApplicationActor.cs b/Source/ActivityPub.Types/AS/Extended/Actor/ApplicationActor.cs
index 50c5806..73c627c 100644
--- a/Source/ActivityPub.Types/AS/Extended/Actor/ApplicationActor.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Actor/ApplicationActor.cs
@@ -20,11 +20,11 @@ public class ApplicationActor : APActor, IASModel<ApplicationActor, ApplicationA
     static string IASModel<ApplicationActor>.ASTypeName => ApplicationType;
 
     /// <inheritdoc />
-    public ApplicationActor() => Entity = TypeMap.Extend<ApplicationActorEntity>();
+    public ApplicationActor() => Entity = TypeMap.Extend<ApplicationActor, ApplicationActorEntity>();
 
     /// <inheritdoc />
     public ApplicationActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ApplicationActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ApplicationActor, ApplicationActorEntity>(isExtending);
 
     /// <inheritdoc />
     public ApplicationActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ApplicationActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ApplicationActor(TypeMap typeMap, ApplicationActorEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ApplicationActorEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ApplicationActor, ApplicationActorEntity>();
 
     static ApplicationActor IASModel<ApplicationActor>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Actor/GroupActor.cs b/Source/ActivityPub.Types/AS/Extended/Actor/GroupActor.cs
index 54b9a48..c8f540d 100644
--- a/Source/ActivityPub.Types/AS/Extended/Actor/GroupActor.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Actor/GroupActor.cs
@@ -20,11 +20,11 @@ public class GroupActor : APActor, IASModel<GroupActor, GroupActorEntity, APActo
     static string IASModel<GroupActor>.ASTypeName => GroupType;
 
     /// <inheritdoc />
-    public GroupActor() => Entity = TypeMap.Extend<GroupActorEntity>();
+    public GroupActor() => Entity = TypeMap.Extend<GroupActor, GroupActorEntity>();
 
     /// <inheritdoc />
     public GroupActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<GroupActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<GroupActor, GroupActorEntity>(isExtending);
 
     /// <inheritdoc />
     public GroupActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public GroupActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public GroupActor(TypeMap typeMap, GroupActorEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<GroupActorEntity>();
+        => Entity = entity ?? typeMap.AsEntity<GroupActor, GroupActorEntity>();
 
     static GroupActor IASModel<GroupActor>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Actor/OrganizationActor.cs b/Source/ActivityPub.Types/AS/Extended/Actor/OrganizationActor.cs
index 3c68801..9a4ecf1 100644
--- a/Source/ActivityPub.Types/AS/Extended/Actor/OrganizationActor.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Actor/OrganizationActor.cs
@@ -20,11 +20,11 @@ public class OrganizationActor : APActor, IASModel<OrganizationActor, Organizati
     static string IASModel<OrganizationActor>.ASTypeName => OrganizationType;
 
     /// <inheritdoc />
-    public OrganizationActor() => Entity = TypeMap.Extend<OrganizationActorEntity>();
+    public OrganizationActor() => Entity = TypeMap.Extend<OrganizationActor, OrganizationActorEntity>();
 
     /// <inheritdoc />
     public OrganizationActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<OrganizationActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<OrganizationActor, OrganizationActorEntity>(isExtending);
 
     /// <inheritdoc />
     public OrganizationActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public OrganizationActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public OrganizationActor(TypeMap typeMap, OrganizationActorEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<OrganizationActorEntity>();
+        => Entity = entity ?? typeMap.AsEntity<OrganizationActor, OrganizationActorEntity>();
 
     static OrganizationActor IASModel<OrganizationActor>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Actor/PersonActor.cs b/Source/ActivityPub.Types/AS/Extended/Actor/PersonActor.cs
index d6a424f..d1dd982 100644
--- a/Source/ActivityPub.Types/AS/Extended/Actor/PersonActor.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Actor/PersonActor.cs
@@ -20,11 +20,11 @@ public class PersonActor : APActor, IASModel<PersonActor, PersonActorEntity, APA
     static string IASModel<PersonActor>.ASTypeName => PersonType;
 
     /// <inheritdoc />
-    public PersonActor() => Entity = TypeMap.Extend<PersonActorEntity>();
+    public PersonActor() => Entity = TypeMap.Extend<PersonActor, PersonActorEntity>();
 
     /// <inheritdoc />
     public PersonActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<PersonActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<PersonActor, PersonActorEntity>(isExtending);
 
     /// <inheritdoc />
     public PersonActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public PersonActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public PersonActor(TypeMap typeMap, PersonActorEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<PersonActorEntity>();
+        => Entity = entity ?? typeMap.AsEntity<PersonActor, PersonActorEntity>();
 
     static PersonActor IASModel<PersonActor>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Actor/ServiceActor.cs b/Source/ActivityPub.Types/AS/Extended/Actor/ServiceActor.cs
index 0055ef5..b9b2382 100644
--- a/Source/ActivityPub.Types/AS/Extended/Actor/ServiceActor.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Actor/ServiceActor.cs
@@ -20,11 +20,11 @@ public class ServiceActor : APActor, IASModel<ServiceActor, ServiceActorEntity,
     static string IASModel<ServiceActor>.ASTypeName => ServiceType;
 
     /// <inheritdoc />
-    public ServiceActor() => Entity = TypeMap.Extend<ServiceActorEntity>();
+    public ServiceActor() => Entity = TypeMap.Extend<ServiceActor, ServiceActorEntity>();
 
     /// <inheritdoc />
     public ServiceActor(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ServiceActorEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ServiceActor, ServiceActorEntity>(isExtending);
 
     /// <inheritdoc />
     public ServiceActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ServiceActor(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ServiceActor(TypeMap typeMap, ServiceActorEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ServiceActorEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ServiceActor, ServiceActorEntity>();
 
     static ServiceActor IASModel<ServiceActor>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Link/MentionLink.cs b/Source/ActivityPub.Types/AS/Extended/Link/MentionLink.cs
index e53e6b1..83c49b1 100644
--- a/Source/ActivityPub.Types/AS/Extended/Link/MentionLink.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Link/MentionLink.cs
@@ -20,11 +20,11 @@ public class MentionLink : ASLink, IASModel<MentionLink, MentionLinkEntity, ASLi
     static string IASModel<MentionLink>.ASTypeName => MentionType;
 
     /// <inheritdoc />
-    public MentionLink() => Entity = TypeMap.Extend<MentionLinkEntity>();
+    public MentionLink() => Entity = TypeMap.Extend<MentionLink, MentionLinkEntity>();
 
     /// <inheritdoc />
     public MentionLink(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<MentionLinkEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<MentionLink, MentionLinkEntity>(isExtending);
 
     /// <inheritdoc />
     public MentionLink(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public MentionLink(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public MentionLink(TypeMap typeMap, MentionLinkEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<MentionLinkEntity>();
+        => Entity = entity ?? typeMap.AsEntity<MentionLink, MentionLinkEntity>();
 
     static MentionLink IASModel<MentionLink>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/ArticleObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/ArticleObject.cs
index d1f598d..7ce5730 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/ArticleObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/ArticleObject.cs
@@ -20,11 +20,11 @@ public class ArticleObject : ASObject, IASModel<ArticleObject, ArticleObjectEnti
     static string IASModel<ArticleObject>.ASTypeName => ArticleType;
 
     /// <inheritdoc />
-    public ArticleObject() => Entity = TypeMap.Extend<ArticleObjectEntity>();
+    public ArticleObject() => Entity = TypeMap.Extend<ArticleObject, ArticleObjectEntity>();
 
     /// <inheritdoc />
     public ArticleObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ArticleObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ArticleObject, ArticleObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public ArticleObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ArticleObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ArticleObject(TypeMap typeMap, ArticleObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ArticleObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ArticleObject, ArticleObjectEntity>();
 
     static ArticleObject IASModel<ArticleObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/AudioObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/AudioObject.cs
index f6a1a27..2945fdf 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/AudioObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/AudioObject.cs
@@ -20,11 +20,11 @@ public class AudioObject : DocumentObject, IASModel<AudioObject, AudioObjectEnti
     static string IASModel<AudioObject>.ASTypeName => AudioType;
 
     /// <inheritdoc />
-    public AudioObject() => Entity = TypeMap.Extend<AudioObjectEntity>();
+    public AudioObject() => Entity = TypeMap.Extend<AudioObject, AudioObjectEntity>();
 
     /// <inheritdoc />
     public AudioObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<AudioObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<AudioObject, AudioObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public AudioObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public AudioObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public AudioObject(TypeMap typeMap, AudioObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<AudioObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<AudioObject, AudioObjectEntity>();
 
     static AudioObject IASModel<AudioObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/DocumentObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/DocumentObject.cs
index 315467b..7761abc 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/DocumentObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/DocumentObject.cs
@@ -20,11 +20,11 @@ public class DocumentObject : ASObject, IASModel<DocumentObject, DocumentObjectE
     static string IASModel<DocumentObject>.ASTypeName => DocumentType;
 
     /// <inheritdoc />
-    public DocumentObject() => Entity = TypeMap.Extend<DocumentObjectEntity>();
+    public DocumentObject() => Entity = TypeMap.Extend<DocumentObject, DocumentObjectEntity>();
 
     /// <inheritdoc />
     public DocumentObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<DocumentObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<DocumentObject, DocumentObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public DocumentObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public DocumentObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public DocumentObject(TypeMap typeMap, DocumentObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<DocumentObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<DocumentObject, DocumentObjectEntity>();
 
     static DocumentObject IASModel<DocumentObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/EventObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/EventObject.cs
index 0477c85..bddb681 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/EventObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/EventObject.cs
@@ -20,11 +20,11 @@ public class EventObject : ASObject, IASModel<EventObject, EventObjectEntity, AS
     static string IASModel<EventObject>.ASTypeName => EventType;
 
     /// <inheritdoc />
-    public EventObject() => Entity = TypeMap.Extend<EventObjectEntity>();
+    public EventObject() => Entity = TypeMap.Extend<EventObject, EventObjectEntity>();
 
     /// <inheritdoc />
     public EventObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<EventObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<EventObject, EventObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public EventObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public EventObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public EventObject(TypeMap typeMap, EventObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<EventObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<EventObject, EventObjectEntity>();
 
     static EventObject IASModel<EventObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/ImageObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/ImageObject.cs
index 9639dde..caa1e41 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/ImageObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/ImageObject.cs
@@ -20,11 +20,11 @@ public class ImageObject : DocumentObject, IASModel<ImageObject, ImageObjectEnti
     static string IASModel<ImageObject>.ASTypeName => ImageType;
 
     /// <inheritdoc />
-    public ImageObject() => Entity = TypeMap.Extend<ImageObjectEntity>();
+    public ImageObject() => Entity = TypeMap.Extend<ImageObject, ImageObjectEntity>();
 
     /// <inheritdoc />
     public ImageObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ImageObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ImageObject, ImageObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public ImageObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public ImageObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ImageObject(TypeMap typeMap, ImageObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ImageObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ImageObject, ImageObjectEntity>();
 
     static ImageObject IASModel<ImageObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/NoteObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/NoteObject.cs
index 00f9ce3..99d0d83 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/NoteObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/NoteObject.cs
@@ -20,11 +20,11 @@ public class NoteObject : ASObject, IASModel<NoteObject, NoteObjectEntity, ASObj
     static string IASModel<NoteObject>.ASTypeName => NoteType;
 
     /// <inheritdoc />
-    public NoteObject() => Entity = TypeMap.Extend<NoteObjectEntity>();
+    public NoteObject() => Entity = TypeMap.Extend<NoteObject, NoteObjectEntity>();
 
     /// <inheritdoc />
     public NoteObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<NoteObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<NoteObject, NoteObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public NoteObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public NoteObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public NoteObject(TypeMap typeMap, NoteObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<NoteObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<NoteObject, NoteObjectEntity>();
 
     static NoteObject IASModel<NoteObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/PageObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/PageObject.cs
index c3e1101..fc39f47 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/PageObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/PageObject.cs
@@ -20,11 +20,11 @@ public class PageObject : DocumentObject, IASModel<PageObject, PageObjectEntity,
     static string IASModel<PageObject>.ASTypeName => PageType;
 
     /// <inheritdoc />
-    public PageObject() => Entity = TypeMap.Extend<PageObjectEntity>();
+    public PageObject() => Entity = TypeMap.Extend<PageObject, PageObjectEntity>();
 
     /// <inheritdoc />
     public PageObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<PageObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<PageObject, PageObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public PageObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public PageObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public PageObject(TypeMap typeMap, PageObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<PageObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<PageObject, PageObjectEntity>();
 
     static PageObject IASModel<PageObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/PlaceObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/PlaceObject.cs
index a10166a..d97fe57 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/PlaceObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/PlaceObject.cs
@@ -20,11 +20,11 @@ public class PlaceObject : ASObject, IASModel<PlaceObject, PlaceObjectEntity, AS
     static string IASModel<PlaceObject>.ASTypeName => PlaceType;
 
     /// <inheritdoc />
-    public PlaceObject() => Entity = TypeMap.Extend<PlaceObjectEntity>();
+    public PlaceObject() => Entity = TypeMap.Extend<PlaceObject, PlaceObjectEntity>();
 
     /// <inheritdoc />
     public PlaceObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<PlaceObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<PlaceObject, PlaceObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public PlaceObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public PlaceObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public PlaceObject(TypeMap typeMap, PlaceObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<PlaceObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<PlaceObject, PlaceObjectEntity>();
 
     static PlaceObject IASModel<PlaceObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/ProfileObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/ProfileObject.cs
index ff10f53..035cefa 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/ProfileObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/ProfileObject.cs
@@ -21,11 +21,11 @@ public class ProfileObject : ASObject, IASModel<ProfileObject, ProfileObjectEnti
     static string IASModel<ProfileObject>.ASTypeName => ProfileType;
 
     /// <inheritdoc />
-    public ProfileObject() => Entity = TypeMap.Extend<ProfileObjectEntity>();
+    public ProfileObject() => Entity = TypeMap.Extend<ProfileObject, ProfileObjectEntity>();
 
     /// <inheritdoc />
     public ProfileObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<ProfileObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<ProfileObject, ProfileObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public ProfileObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public ProfileObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public ProfileObject(TypeMap typeMap, ProfileObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<ProfileObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<ProfileObject, ProfileObjectEntity>();
 
     static ProfileObject IASModel<ProfileObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/RelationshipObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/RelationshipObject.cs
index 16a4583..3749e4d 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/RelationshipObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/RelationshipObject.cs
@@ -22,11 +22,11 @@ public class RelationshipObject : ASObject, IASModel<RelationshipObject, Relatio
     static string IASModel<RelationshipObject>.ASTypeName => RelationshipType;
 
     /// <inheritdoc />
-    public RelationshipObject() => Entity = TypeMap.Extend<RelationshipObjectEntity>();
+    public RelationshipObject() => Entity = TypeMap.Extend<RelationshipObject, RelationshipObjectEntity>();
 
     /// <inheritdoc />
     public RelationshipObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<RelationshipObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<RelationshipObject, RelationshipObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public RelationshipObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -34,7 +34,7 @@ public RelationshipObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public RelationshipObject(TypeMap typeMap, RelationshipObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<RelationshipObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<RelationshipObject, RelationshipObjectEntity>();
 
     static RelationshipObject IASModel<RelationshipObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/TombstoneObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/TombstoneObject.cs
index f746b40..4c6cca0 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/TombstoneObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/TombstoneObject.cs
@@ -21,11 +21,11 @@ public class TombstoneObject : ASObject, IASModel<TombstoneObject, TombstoneObje
     static string IASModel<TombstoneObject>.ASTypeName => TombstoneType;
 
     /// <inheritdoc />
-    public TombstoneObject() => Entity = TypeMap.Extend<TombstoneObjectEntity>();
+    public TombstoneObject() => Entity = TypeMap.Extend<TombstoneObject, TombstoneObjectEntity>();
 
     /// <inheritdoc />
     public TombstoneObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<TombstoneObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<TombstoneObject, TombstoneObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public TombstoneObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -33,7 +33,7 @@ public TombstoneObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public TombstoneObject(TypeMap typeMap, TombstoneObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<TombstoneObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<TombstoneObject, TombstoneObjectEntity>();
 
     static TombstoneObject IASModel<TombstoneObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/AS/Extended/Object/VideoObject.cs b/Source/ActivityPub.Types/AS/Extended/Object/VideoObject.cs
index 3654eaa..332d46c 100644
--- a/Source/ActivityPub.Types/AS/Extended/Object/VideoObject.cs
+++ b/Source/ActivityPub.Types/AS/Extended/Object/VideoObject.cs
@@ -20,11 +20,11 @@ public class VideoObject : DocumentObject, IASModel<VideoObject, VideoObjectEnti
     static string IASModel<VideoObject>.ASTypeName => VideoType;
 
     /// <inheritdoc />
-    public VideoObject() => Entity = TypeMap.Extend<VideoObjectEntity>();
+    public VideoObject() => Entity = TypeMap.Extend<VideoObject, VideoObjectEntity>();
 
     /// <inheritdoc />
     public VideoObject(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<VideoObjectEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<VideoObject, VideoObjectEntity>(isExtending);
 
     /// <inheritdoc />
     public VideoObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -32,7 +32,7 @@ public VideoObject(ASType existingGraph) : this(existingGraph.TypeMap) {}
     /// <inheritdoc />
     [SetsRequiredMembers]
     public VideoObject(TypeMap typeMap, VideoObjectEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<VideoObjectEntity>();
+        => Entity = entity ?? typeMap.AsEntity<VideoObject, VideoObjectEntity>();
 
     static VideoObject IASModel<VideoObject>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Source/ActivityPub.Types/Conversion/ASTypeInfoCache.cs b/Source/ActivityPub.Types/Conversion/ASTypeInfoCache.cs
deleted file mode 100644
index a9c9bc9..0000000
--- a/Source/ActivityPub.Types/Conversion/ASTypeInfoCache.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using ActivityPub.Types.AS;
-using ActivityPub.Types.Conversion.Overrides;
-using ActivityPub.Types.Internal;
-
-namespace ActivityPub.Types.Conversion;
-
-/// <summary>
-///     Extracts and stores metadata for ActivityStreams types within the application.
-/// </summary>
-[Obsolete("ASTypeInfoCache will be removed in a future update")]
-public interface IASTypeInfoCache
-{
-    /// <summary>
-    ///     Finds the .NET type(s) that implement a set of AS types.
-    ///     Implied types are automatically included.
-    ///     Unknown types are safely ignored.
-    /// </summary>
-    /// <param name="asTypes">Types to map. Case-sensitive.</param>
-    /// <param name="mappedEntities">All known entities that represent the types.</param>
-    /// <param name="unmappedTypes">Any AS types that did not map to an entity.</param>
-    /// <returns>Set of all located types</returns>
-    public void MapASTypesToEntities(IEnumerable<string> asTypes, out HashSet<Type> mappedEntities, out HashSet<string> unmappedTypes);
-
-    /// <summary>
-    ///     Gets the .NET type that implements a specified AS type.
-    ///     Returns true on success or false on failure, following the TryGet pattern.
-    /// </summary>
-    public bool TryGetModelType(string asType, [NotNullWhen(true)] out Type? modelType);
-    
-    /// <summary>
-    ///     All known types that implement <see cref="IAnonymousEntity"/>.
-    /// </summary>
-    public IEnumerable<Type> AnonymousEntityTypes { get; }
-
-    /// <summary>
-    ///     All known types that implement <see cref="INamelessEntity"/>.
-    /// </summary>
-    public IEnumerable<Type> NamelessEntityTypes { get; }
-    
-    /// <summary>
-    ///     Find and load all ActivityStreams types in a particular assembly.
-    /// </summary>
-    /// <param name="assembly">Assembly to load</param>
-    public void RegisterAssembly(Assembly assembly);
-
-    /// <summary>
-    ///     Find and load all ActivityStreams types in all loaded assemblies.
-    /// </summary>
-    public void RegisterAllAssemblies();
-}
-
-/// <summary>
-///     Default implementation of <see cref="IASTypeInfoCache"/>.
-///     At startup, uses reflection to index all loaded types.
-/// </summary>
-[Obsolete("ASTypeInfoCache will be removed in a future update")]
-public class ASTypeInfoCache : IASTypeInfoCache
-{
-    private static readonly Lazy<ASTypeInfoCache> Lazy = new(() =>
-    {
-        var cache = new ASTypeInfoCache();
-        cache.RegisterAllAssemblies();
-        return cache;
-    });
-    private readonly HashSet<Assembly> _registeredAssemblies = new();
-    
-    private readonly Dictionary<Type, ModelMeta> _typeMetaMap = new();
-    private readonly Dictionary<string, ModelMeta> _nameMetaMap = new();
-
-    /// <inheritdoc />
-    public IEnumerable<Type> AnonymousEntityTypes => _anonymousEntityTypes;
-    private readonly HashSet<Type> _anonymousEntityTypes = new();
-
-    /// <inheritdoc />
-    public IEnumerable<Type> NamelessEntityTypes => _namelessEntityTypes;
-
-    /// <summary>
-    /// A global static instance of ASTypeInfoCache
-    /// </summary>
-    public static ASTypeInfoCache Instance => Lazy.Value;
-    private readonly HashSet<Type> _namelessEntityTypes = new();
-
-    /// <summary>
-    ///     Calls <see cref="CreateModelMetaFor{TModel}"/> with a specified value for <code>TModel</code>.
-    /// </summary>
-    private readonly Func<Type, ModelMeta> _createTypeMetadataFor;
-
-    internal ASTypeInfoCache() =>
-        // I really hate doing this :sob:
-        _createTypeMetadataFor = typeof(ASTypeInfoCache)
-            .GetRequiredMethod(nameof(CreateModelMetaFor), BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotFunc<ModelMeta>(this);
-
-    /// <inheritdoc />
-    public void MapASTypesToEntities(IEnumerable<string> asTypes, out HashSet<Type> mappedEntities, out HashSet<string> unmappedTypes)
-    {
-        mappedEntities = new HashSet<Type>();
-        unmappedTypes = new HashSet<string>();
-
-        foreach (var asType in asTypes)
-        {
-            // Map AS Type to .NET Type.
-            if (_nameMetaMap.TryGetValue(asType, out var meta))
-                mappedEntities.AddRange(meta.EntityTypeChain);
-
-            // Record unknown types too
-            else
-                unmappedTypes.Add(asType);
-        }
-    }
-
-    /// <inheritdoc />
-    public bool TryGetModelType(string asType, [NotNullWhen(true)] out Type? modelType)
-    {
-        if (_nameMetaMap.TryGetValue(asType, out var meta))
-        {
-            modelType = meta.ModelType;
-            return true;
-        }
-
-        modelType = null;
-        return false;
-    }
-
-    /// <inheritdoc />
-    public void RegisterAllAssemblies()
-    {
-        foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-            RegisterAssembly(assembly);
-    }
-
-    /// <inheritdoc />
-    public void RegisterAssembly(Assembly assembly)
-    {
-        // Make sure we only check each assembly once.
-        // Its an extremely heavy operation.
-        if (!_registeredAssemblies.Add(assembly))
-            return;
-
-        // This is a new assembly, so we need to check every type
-        foreach (var type in assembly.GetTypes())
-            RegisterType(type);
-    }
-
-    private void RegisterType(Type type)
-    {
-        // Skip if we've already check it
-        if (_typeMetaMap.ContainsKey(type))
-            return;
-
-        // Skip if it's not an AS type
-        if (!type.IsAssignableTo(typeof(ASType)))
-            // Also register IAnonymousEntitySelectors?
-            // Now that I look at it, I'm not sure it makes sense for those to come from IOptions, anyway
-            return;
-
-        // Skip if it's not a model
-        if (!typeof(IASModel<>).TryMakeGenericType(out var modelType, type))
-            return;
-        if (!type.IsAssignableTo(modelType))
-            return;
-
-        // Make sure that base types are populated first
-        if (type.BaseType != null)
-            RegisterType(type.BaseType);
-
-        var meta = _createTypeMetadataFor(type);
-        _typeMetaMap[type] = meta;
-
-        // Register named entities
-        var asTypeName = meta.ASTypeName;
-        if (asTypeName != null)
-        {
-            // Check for duplicates!
-            if (_nameMetaMap.TryGetValue(asTypeName, out var conflictMeta))
-                throw new ApplicationException($"Multiple classes are using AS type name {asTypeName}: trying to register {type} on top of {conflictMeta.ModelType}");
-
-            _nameMetaMap[asTypeName] = meta;
-        }
-        
-        // Register anonymous entities
-        var entityType = meta.EntityType;
-        if (entityType.IsAssignableTo(typeof(IAnonymousEntity)))
-            _anonymousEntityTypes.Add(entityType);
-        
-        // Register nameless entities
-        if (entityType.IsAssignableTo(typeof(INamelessEntity)))
-            _namelessEntityTypes.Add(entityType);
-    }
-
-    private ModelMeta CreateModelMetaFor<TModel>()
-        where TModel : ASType, IASModel<TModel>
-    {
-        var modelType = typeof(TModel);
-
-        return new ModelMeta
-        {
-            ModelType = modelType,
-            EntityTypeChain = GetEntityTypeChain<TModel>(modelType),
-            EntityType = TModel.EntityType,
-            ASTypeName = TModel.ASTypeName
-        };
-    }
-    
-    private List<Type> GetEntityTypeChain<TModel>(Type modelType)
-        where TModel : ASType, IASModel<TModel>
-    {
-        var entityTypes = new List<Type>
-        {
-            TModel.EntityType
-        };
-        
-        for (var baseType = modelType.BaseType; baseType != null; baseType = baseType.BaseType)
-        {
-            // Some base types may not be models.
-            // If this happens, we need to skip but NOT bail out!
-            if (!_typeMetaMap.TryGetValue(baseType, out var baseMeta))
-                continue;
-            
-            entityTypes.Add(baseMeta.EntityType);
-        }
-
-        return entityTypes;
-    }
-
-    /// <summary>
-    ///     Cached metadata about an AS Model.
-    /// </summary>
-    private class ModelMeta
-    {
-        /// <summary>
-        ///     Type of the model class
-        /// </summary>
-        public required Type ModelType { get; init; }
-        
-        /// <summary>
-        ///     Type of the entity class, taken from <see cref="IASModel{TModel}.EntityType"/>.
-        /// </summary>
-        public required Type EntityType { get; init; }
-        
-        /// <summary>
-        ///     List of all entities required to represent the data used by this model.
-        ///     Effectively, it is <see cref="EntityType"/> along with the entity type of every ancestor model.
-        /// </summary>
-        public required IReadOnlyList<Type> EntityTypeChain { get; init; }
-        
-        /// <summary>
-        ///     The model's AS type name, taken from <see cref="IASModel{TModel}.ASTypeName"/>.
-        /// </summary>
-        public string? ASTypeName { get; init; }
-    }
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Converters/LinkableConverter.cs b/Source/ActivityPub.Types/Conversion/Converters/LinkableConverter.cs
index fcdd05b..ad17c58 100644
--- a/Source/ActivityPub.Types/Conversion/Converters/LinkableConverter.cs
+++ b/Source/ActivityPub.Types/Conversion/Converters/LinkableConverter.cs
@@ -1,12 +1,9 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 // If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using ActivityPub.Types.AS;
-using ActivityPub.Types.Internal;
 using ActivityPub.Types.Util;
 
 namespace ActivityPub.Types.Conversion.Converters;
@@ -16,11 +13,6 @@ namespace ActivityPub.Types.Conversion.Converters;
 /// </summary>
 public class LinkableConverter : JsonConverterFactory
 {
-    private readonly IASTypeInfoCache _asTypeInfoCache;
-
-    /// <inheritdoc />
-    public LinkableConverter(IASTypeInfoCache asTypeInfoCache) => _asTypeInfoCache = asTypeInfoCache;
-    
     /// <inheritdoc />
     public override bool CanConvert(Type type) =>
         // We only convert Linkable<T>
@@ -33,21 +25,13 @@ public override JsonConverter CreateConverter(Type type, JsonSerializerOptions o
         var converterType = typeof(LinkableConverter<>).MakeGenericType(valueType);
         
         // Pivot the type into correct instance
-        return (JsonConverter)Activator.CreateInstance(
-            converterType,
-            BindingFlags.Instance | BindingFlags.Public,
-            null,
-            new object[] { _asTypeInfoCache },
-            null
-        )!;
+        return (JsonConverter)Activator.CreateInstance(converterType)!;
     }
 }
 
 internal class LinkableConverter<T> : JsonConverter<Linkable<T>>
+    where T : ASType, IASModel<T>
 {
-    private readonly IASTypeInfoCache _asTypeInfoCache;
-    public LinkableConverter(IASTypeInfoCache asTypeInfoCache) => _asTypeInfoCache = asTypeInfoCache;
-
     public override Linkable<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType == JsonTokenType.Null)
@@ -55,30 +39,18 @@ internal class LinkableConverter<T> : JsonConverter<Linkable<T>>
 
         // Parse into abstract form
         var jsonElement = JsonElement.ParseValue(ref reader);
+        var typeMap = jsonElement.Deserialize<TypeMap>(options)
+            ?? throw new JsonException($"Failed to parse {typeToConvert} - deserialize returned null");
 
         // If it's a string, then it's a link
-        if (jsonElement.ValueKind == JsonValueKind.String)
-        {
-            var link = jsonElement.Deserialize<ASLink>(options);
-            if (link == null)
-                throw new JsonException($"Failed to parse {typeToConvert} - Could not construct link object of type {typeof(ASLink)}");
+        if (typeMap.IsModel<ASLink>(out var link))
             return new Linkable<T>(link);
-        }
-
-        // If it's an object of type ASLink, then it's still a link
-        if (TryGetLinkType(jsonElement, out var linkType))
-        {
-            var link = (ASLink?)jsonElement.Deserialize(linkType, options);
-            if (link == null)
-                throw new JsonException($"Failed to parse {typeToConvert} - Could not construct link object of type {linkType}");
-            return new Linkable<T>(link);
-        }
 
         // Anything else is the payload data
-        var obj = jsonElement.Deserialize<T>(options);
-        if (obj == null)
-            throw new JsonException($"Failed to parse {typeToConvert} - Could not construct value object");
-        return new Linkable<T>(obj);
+        if (typeMap.IsModel<T>(out var obj))
+            return new Linkable<T>(obj);
+
+        throw new JsonException($"Failed to parse {typeToConvert} - input cannot be projected to that type");
     }
 
     public override void Write(Utf8JsonWriter writer, Linkable<T> linkable, JsonSerializerOptions options)
@@ -92,20 +64,4 @@ public override void Write(Utf8JsonWriter writer, Linkable<T> linkable, JsonSeri
         else
             throw new ArgumentException($"{typeof(Linkable<T>)} is invalid - it has neither a link nor a value");
     }
-
-    private bool TryGetLinkType(JsonElement element, [NotNullWhen(true)] out Type? linkType)
-    {
-        linkType = null;
-
-        // Firstly, it must have a decodable AS type name
-        if (!element.TryGetASType(out var asType))
-            return false;
-
-        // Second, that name must map to a known model type
-        if (!_asTypeInfoCache.TryGetModelType(asType, out linkType))
-            return false;
-
-        // Finally, the model must be a link
-        return linkType.IsAssignableTo(typeof(ASLink));
-    }
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Converters/TypeMapConverter.cs b/Source/ActivityPub.Types/Conversion/Converters/TypeMapConverter.cs
index 855cad9..f54534b 100644
--- a/Source/ActivityPub.Types/Conversion/Converters/TypeMapConverter.cs
+++ b/Source/ActivityPub.Types/Conversion/Converters/TypeMapConverter.cs
@@ -7,186 +7,55 @@
 using ActivityPub.Types.AS;
 using ActivityPub.Types.Conversion.Overrides;
 using ActivityPub.Types.Internal;
-using ActivityPub.Types.Internal.Pivots;
 using ActivityPub.Types.Util;
-using JetBrains.Annotations;
-using Microsoft.Extensions.Options;
 
 namespace ActivityPub.Types.Conversion.Converters;
 
 /// <inheritdoc />
 public class TypeMapConverter : JsonConverter<TypeMap>
 {
-    private readonly IASTypeInfoCache _asTypeInfoCache;
-    private readonly IConversionOptions _conversionOptions;
-    private readonly NamelessEntityPivot _namelessEntityPivot = new();
-    private readonly AnonymousEntityPivot _anonymousEntityPivot = new();
-    private readonly CustomConvertedEntityPivot _customConvertedEntityPivot = new();
-
-    /// <inheritdoc />
-    [UsedImplicitly]
-    public TypeMapConverter(IASTypeInfoCache asTypeInfoCache, IOptions<ConversionOptions> conversionOptions)
-    {
-        _asTypeInfoCache = asTypeInfoCache;
-        _conversionOptions = conversionOptions.Value;
-    }
-
-    /// <inheritdoc />
-    public TypeMapConverter()
-    {
-        _asTypeInfoCache = ASTypeInfoCache.Instance;
-        _conversionOptions = new ConversionOptions();
-    }
-
     /// <inheritdoc />
     public override TypeMap Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         // Read input into temporary object
         var jsonElement = JsonElement.ParseValue(ref reader);
 
-        // Read JSON-LD context from the input JSON
-        var context = ReadContext(jsonElement, options);
-
-        // Construct empty TypeMap.
-        // We will build this out progressively.
-        var typeMap = new TypeMap(context);
-
-        // Construct context for this conversion cycle
-        var meta = new DeserializationMetadata
-        {
-            JsonSerializerOptions = options,
-            LDContext = context,
-            TypeMap = typeMap
-        };
-        
-        ReadKnownEntities(jsonElement, meta);
-        ReadNamelessEntities(jsonElement, meta);
-        ReadAnonymousEntities(jsonElement, meta);
-
-        return typeMap;
-    }
-    
-    private void ReadKnownEntities(JsonElement jsonElement, DeserializationMetadata meta)
-    {
         // String input is a special case of Link
         if (jsonElement.ValueKind == JsonValueKind.String)
-            ReadString(jsonElement, meta.TypeMap);
+            return ReadString(jsonElement);
 
         // Object input can be anything
-        else if (jsonElement.ValueKind == JsonValueKind.Object)
-            ReadObject(jsonElement, meta);
+        if (jsonElement.ValueKind == JsonValueKind.Object)
+            return ReadObject(jsonElement, options);
 
-        // Other input is an error
-        else
-            throw new JsonException($"Can't convert TypeMap from {jsonElement.ValueKind}");
+        // Any other input is an error
+        throw new JsonException($"Can't convert TypeMap from {jsonElement.ValueKind}");
     }
-    private static void ReadString(JsonElement jsonElement, TypeMap typeMap)
+    
+    private static TypeMap ReadString(JsonElement jsonElement)
     {
         // Read Link entity
         var link = new ASLinkEntity
         {
             HRef = jsonElement.GetString()!
         };
-        typeMap.AddEntity(link);
-
-        // Create and attach empty Type entity
-        var type = new ASTypeEntity();
-        typeMap.AddEntity(type);
-    }
-
-    private void ReadObject(JsonElement jsonElement, DeserializationMetadata meta)
-    {
-        // Enumerate and expand the full list of needed types
-        var asTypes = ReadTypes(jsonElement, meta.JsonSerializerOptions);
-        _asTypeInfoCache.MapASTypesToEntities(asTypes, out var mappedTypes, out var unmappedTypes);
-
-        // Convert each AS type that mapped to an object type
-        foreach (var entityType in mappedTypes)
-            ReadEntity(jsonElement, meta, entityType);
-
-        // Record each AS type that did *not* map to an object type
-        foreach (var asType in unmappedTypes)
-            meta.TypeMap.AddUnmappedType(asType);
-    }
-
-    private void ReadNamelessEntities(JsonElement jsonElement, DeserializationMetadata meta)
-    {
-        // Nameless entities must be checked for every input JSON.
-        // Any that match are converted like normal entities, but skipping the usual AS type lookup.
-        foreach (var entityType in _asTypeInfoCache.NamelessEntityTypes)
-            if (_namelessEntityPivot.ShouldConvert(entityType, meta))
-                ReadEntity(jsonElement, meta, entityType);
-    }
-    
-    private void ReadAnonymousEntities(JsonElement jsonElement, DeserializationMetadata meta)
-    {
-        // Anonymous entities must be checked for every input JSON.
-        // Any that match are converted like normal entities, but skipping the usual AS type / context lookup.
-        foreach (var entityType in _asTypeInfoCache.AnonymousEntityTypes)
-            if (_anonymousEntityPivot.ShouldConvert(entityType, jsonElement, meta))
-                ReadEntity(jsonElement, meta, entityType);
-        
-        // Registered anonymous entity selectors must also run for every input.
-        // They can each identify any number of anonymous entities.
-        foreach (var selector in _conversionOptions.AnonymousEntitySelectors)
-            foreach (var entityType in selector.SelectAnonymousEntities(jsonElement, meta))
-                ReadEntity(jsonElement, meta, entityType);
-    }
-
-    private void ReadEntity(JsonElement jsonElement, DeserializationMetadata meta, Type entityType)
-    {
-        // Skip if the entity is already in the graph
-        if (meta.TypeMap.AllEntities.ContainsKey(entityType))
-            return;
-
-        var entity =
-            // Use custom logic, if applicable
-            _customConvertedEntityPivot.ReadEntity(entityType, jsonElement, meta)
-        
-            // Fall back to native JSON conversion
-            ?? (ASEntity?)jsonElement.Deserialize(entityType, meta.JsonSerializerOptions)
         
-            // Bail out if both fail
-            ?? throw new JsonException($"Failed to deserialize {entityType} - JsonElement.Deserialize returned null");
-
-        // Execute callback, if applicable
-        _customConvertedEntityPivot.PostReadEntity(entityType, jsonElement, meta, entity);
+        // Create TypeGraph around it
+        var context = JsonLDContext.CreateASContext();
+        var types = new List<string> { ASLink.LinkType };
+        var typeMap = new TypeMap(context, types);
         
-        // Add it to the graph.
-        meta.TypeMap.AddEntity(entity);
-
-        // Remove the entity-level set.
-        // We need it for conversion, but only until TypeMap is updated
-        entity.UnmappedProperties = null;
-    }
-
-    private static IEnumerable<string> ReadTypes(JsonElement jsonElement, JsonSerializerOptions options)
-    {
-        HashSet<string> types;
-
-        // Try to read types
-        if (jsonElement.TryGetProperty("type", out var typeProp))
-            types = typeProp.Deserialize<HashSet<string>>(options)
-                    ?? throw new JsonException("Can't convert TypeMap - \"type\" is null");
-        else
-            types = new HashSet<string>();
-
-        // Make sure we always have object
-        types.Add(ASObject.ObjectType);
+        // Attach entities
+        typeMap.AddEntity(link);
+        typeMap.AddEntity(new ASTypeEntity());
 
-        return types;
+        return typeMap;
     }
 
-    private static JsonLDContext ReadContext(JsonElement jsonElement, JsonSerializerOptions options)
+    private static TypeMap ReadObject(JsonElement jsonElement, JsonSerializerOptions options)
     {
-        // Try to get the context property.
-        if (jsonElement.ValueKind != JsonValueKind.Object || !jsonElement.TryGetProperty("@context", out var contextProp))
-            // If missing then use default.
-            return JsonLDContext.CreateASContext();
-
-        // Convert context
-        return contextProp.Deserialize<JsonLDContext>(options)
-               ?? throw new JsonException("Can't convert TypeMap - \"@context\" is null");
+        var typeGraphReader = new TypeGraphReader(options, jsonElement);
+        return new TypeMap(typeGraphReader);
     }
 
     /// <inheritdoc />
@@ -222,16 +91,11 @@ public override void Write(Utf8JsonWriter writer, TypeMap typeMap, JsonSerialize
         outputNode.WriteTo(writer, options);
     }
 
-    private void WriteEntity(ASEntity entity, Type entityType, JsonObject outputNode, SerializationMetadata meta)
+    private static void WriteEntity(ASEntity entity, Type entityType, JsonObject outputNode, SerializationMetadata meta)
     {
         // Convert to an intermediate object.
         // This will contain the subset of fields that are owned by this entity.
-        var element = 
-            // Use custom converter, if applicable
-            _customConvertedEntityPivot.WriteEntity(entityType, entity, meta)
-            
-            // Fall back to native conversion
-            ?? JsonSerializer.SerializeToElement(entity, entityType, meta.JsonSerializerOptions);
+        var element = JsonSerializer.SerializeToElement(entity, entityType, meta.JsonSerializerOptions);
         
         // Sanity check
         if (element.ValueKind != JsonValueKind.Object)
@@ -243,12 +107,9 @@ private void WriteEntity(ASEntity entity, Type entityType, JsonObject outputNode
             var valueNode = property.Value.ToNode(meta.JsonNodeOptions);
             outputNode[property.Name] = valueNode;
         }
-        
-        // Execute callback, if applicable
-        _customConvertedEntityPivot.PostWriteEntity(entityType, entity, meta, element, outputNode);
     }
 
-    private void WriteTypeMap(TypeMap typeMap, JsonObject outputNode, SerializationMetadata meta)
+    private static void WriteTypeMap(TypeMap typeMap, JsonObject outputNode, SerializationMetadata meta)
     {
         // "type" - AS / AP types. Can be string or array.
         if (typeMap.ASTypes.Count > 0)
@@ -275,15 +136,12 @@ private static bool TryWriteAsLink(Utf8JsonWriter writer, TypeMap typeMap)
             return false;
 
         // If there is no ASLinkEntity, then bail
-        if (!typeMap.IsEntity<ASLinkEntity>(out var linkEntity))
+        if (!typeMap.IsModel<ASLink>(out var linkModel))
             return false;
 
         // Finally - its safe to write string form
-        var href = linkEntity.HRef?.ToString();
-        if (href == null)
-            writer.WriteNullValue();
-        else
-            writer.WriteStringValue(href);
+        var href = linkModel.HRef.ToString();
+        writer.WriteStringValue(href);
         return true;
     }
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Overrides/ConversionOptions.cs b/Source/ActivityPub.Types/Conversion/Overrides/ConversionOptions.cs
deleted file mode 100644
index e37ec54..0000000
--- a/Source/ActivityPub.Types/Conversion/Overrides/ConversionOptions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-namespace ActivityPub.Types.Conversion.Overrides;
-
-
-/// <summary>
-///     Common options to configure JSON / JSON-LD conversion.
-/// </summary>
-public interface IConversionOptions
-{
-    /// <summary>
-    ///     Additional <see cref="IAnonymousEntitySelector"/> instances to execute when converting any incoming JSON.
-    /// </summary>
-    public IEnumerable<IAnonymousEntitySelector> AnonymousEntitySelectors { get; }
-}
-
-/// <inheritdoc cref="IConversionOptions"/>
-public class ConversionOptions : IConversionOptions
-{
-    /// <inheritdoc cref="IConversionOptions.AnonymousEntitySelectors"/>
-    public HashSet<IAnonymousEntitySelector> AnonymousEntitySelectors { get; set; } = new();
-    IEnumerable<IAnonymousEntitySelector> IConversionOptions.AnonymousEntitySelectors => AnonymousEntitySelectors;
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntity.cs b/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntity.cs
deleted file mode 100644
index f4881b4..0000000
--- a/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntity.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Text.Json;
-
-namespace ActivityPub.Types.Conversion.Overrides;
-
-/// <summary>
-///     Indicates that the entity's presence in an object cannot be detected by any built-in method.
-///     Exposes functionality to dynamically detect the entity within an arbitrary JSON message.
-/// </summary>
-/// <seealso cref="IAnonymousEntitySelector"/>
-/// <seealso cref="INamelessEntity"/>
-public interface IAnonymousEntity
-{
-    /// <summary>
-    ///     Checks if this entity should be deserialized from the given JSON message.
-    /// </summary>
-    /// <param name="inputJson">JSON message that is being converted. May not be an object.</param>
-    /// <param name="meta">Metadata that has already been parsed from the JSON.</param>
-    public static abstract bool ShouldConvertFrom(JsonElement inputJson, DeserializationMetadata meta);
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntitySelector.cs b/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntitySelector.cs
deleted file mode 100644
index 823d630..0000000
--- a/Source/ActivityPub.Types/Conversion/Overrides/IAnonymousEntitySelector.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Text.Json;
-
-namespace ActivityPub.Types.Conversion.Overrides;
-
-
-/// <summary>
-///     Examines an incoming JSON message to determine which - if any - anonymous entities should be converted from it.
-///     This is intended for entities that can't implement <see cref="IAnonymousEntity"/> directly.
-/// </summary>
-/// <seealso cref="IAnonymousEntity"/>
-public interface IAnonymousEntitySelector
-{
-    /// <summary>
-    ///     Checks a JSON message to identify all anonymous entities within it.
-    /// </summary>
-    /// <param name="inputJson">JSON message that is being converted. May not be an object.</param>
-    /// <param name="meta">Metadata that has already been parsed from the JSON.</param>
-    public IEnumerable<Type> SelectAnonymousEntities(JsonElement inputJson, DeserializationMetadata meta);
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Overrides/ICustomConvertedEntity.cs b/Source/ActivityPub.Types/Conversion/Overrides/ICustomConvertedEntity.cs
deleted file mode 100644
index 408a608..0000000
--- a/Source/ActivityPub.Types/Conversion/Overrides/ICustomConvertedEntity.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace ActivityPub.Types.Conversion.Overrides;
-
-/// <summary>
-///     An entity that requires custom JSON conversion logic.
-/// </summary>
-public interface ICustomConvertedEntity<TEntity>
-    where TEntity : ASEntity, ICustomConvertedEntity<TEntity>
-{
-    /// <summary>
-    ///     Converts the entity from a JSON message.
-    ///     Return <see langword="null"/> to bypass and trigger built-in default logic.
-    /// </summary>
-    public static virtual TEntity? ReadEntity(JsonElement jsonElement, DeserializationMetadata meta) => null;
-    
-    /// <summary>
-    ///     Called after the entity is converted from JSON.
-    /// </summary>
-    public static virtual void PostReadEntity(JsonElement jsonElement, DeserializationMetadata meta, TEntity entity) {}
-    
-    /// <summary>
-    ///     Converts the entity into a JSON message.
-    ///     Return <see langword="null"/> to bypass and trigger built-in default logic.
-    /// </summary>
-    public static virtual JsonElement? WriteEntity(TEntity entity, SerializationMetadata meta) => null;
-    
-    /// <summary>
-    ///     Called after the object is converted to JSON.
-    /// </summary>
-    public static virtual void PostWriteEntity(TEntity entity, SerializationMetadata meta, JsonElement entityJson, JsonObject outputJson) {}
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Conversion/Overrides/INamelessEntity.cs b/Source/ActivityPub.Types/Conversion/Overrides/INamelessEntity.cs
deleted file mode 100644
index 238f574..0000000
--- a/Source/ActivityPub.Types/Conversion/Overrides/INamelessEntity.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using ActivityPub.Types.Util;
-
-namespace ActivityPub.Types.Conversion.Overrides;
-
-/// <summary>
-///     Indicates that the entity's presence in an object cannot be determined by AS type name alone.
-///     Instead, nameless entities are identified by the JSON-LD context. 
-/// </summary>
-/// <seealso cref="IAnonymousEntity"/>
-public interface INamelessEntity
-{
-    /// <summary>
-    ///     Checks if this entity should be included by the given JSON-LD context.
-    /// </summary>
-    /// <param name="jsonLDContext">JSON-LD context that describes the JSON message.</param>
-    /// <param name="meta">Metadata that has already been parsed from the JSON.</param>
-    public static abstract bool ShouldConvertFrom(IJsonLDContext jsonLDContext, DeserializationMetadata meta);
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/IASModel.cs b/Source/ActivityPub.Types/IASModel.cs
index e5a26c4..1129d28 100644
--- a/Source/ActivityPub.Types/IASModel.cs
+++ b/Source/ActivityPub.Types/IASModel.cs
@@ -1,9 +1,12 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 // If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using ActivityPub.Types.AS;
+using ActivityPub.Types.Internal;
 using ActivityPub.Types.Util;
+using JetBrains.Annotations;
 
 namespace ActivityPub.Types;
 
@@ -39,6 +42,23 @@ public interface IASModel<out TModel>
     ///     The provided <see cref="TypeMap"/> instance is guaranteed to include an instance of type <see cref="EntityType"/>.
     /// </summary>
     public static abstract TModel FromGraph(TypeMap typeMap);
+
+    /// <summary>
+    ///     Overrides the native type-matching logic.
+    ///     This will be called when an object is being converted to check if it contains this type.
+    ///     Return <see langword="true"/> to forcibly parse the type, <see langword="true"/> to block parsing, or <see langword="null"/> to resume native logic.
+    /// </summary>
+    /// <param name="inputJson">JSON message that is being converted. May not be an object.</param>
+    /// <param name="typeMap">Type graph that may contain the object. Contains the JSON-LD context and other metadata.</param>
+    [PublicAPI]
+    public static virtual bool? ShouldConvertFrom(JsonElement inputJson, TypeMap typeMap) => null;
+    
+    /// <summary>
+    ///     AS name of all types that derive from this one.
+    /// </summary>
+    /// <seealso cref="ASNameTree"/>
+    internal static virtual HashSet<string>? DerivedTypeNames => ASNameTree.GetDerivedTypesFor(TModel.ASTypeName);
+    static IASModel() => ASNameTree.Add(TModel.ASTypeName, TModel.BaseTypeName);
 }
 
 /// <summary>
diff --git a/Source/ActivityPub.Types/Internal/ASNameTree.cs b/Source/ActivityPub.Types/Internal/ASNameTree.cs
new file mode 100644
index 0000000..7a97528
--- /dev/null
+++ b/Source/ActivityPub.Types/Internal/ASNameTree.cs
@@ -0,0 +1,79 @@
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+using System.Runtime.CompilerServices;
+using ActivityPub.Types.AS;
+
+namespace ActivityPub.Types.Internal;
+
+internal static class ASNameTree
+{
+    private static readonly Dictionary<string, string> NameBaseMap = new();
+    private static readonly Dictionary<string, HashSet<string>> NameDescendentsMap = new();
+
+    public static void Add(string? asTypeName, string? baseTypeName)
+    {
+        if (asTypeName == null || baseTypeName == null)
+            return;
+
+        // When adding a new entry, we may be filling in a gap.
+        // If so, then we need to "promote" the existing descendents up to the base(s).
+        if (
+            NameBaseMap.TryAdd(asTypeName, baseTypeName) &&
+            NameDescendentsMap.TryGetValue(asTypeName, out var existingDescendents))
+        {
+            foreach (var descendentName in existingDescendents)
+            {
+                AddRecursive(baseTypeName, descendentName);
+            }
+        }
+        
+        // We have to recursively update all base types
+        AddRecursive(baseTypeName, asTypeName);
+    }
+    
+    private static void AddRecursive(string? asTypeName, string descendentTypeName)
+    {
+        if (asTypeName == null)
+            return;
+        
+        do
+        {
+            if (!NameDescendentsMap.TryGetValue(asTypeName, out var derivedTypes))
+            {
+                derivedTypes = new HashSet<string>();
+                NameDescendentsMap[asTypeName] = derivedTypes;
+            }
+
+            derivedTypes.Add(descendentTypeName);
+        } while (NameBaseMap.TryGetValue(asTypeName, out asTypeName));
+    }
+
+    public static HashSet<string>? GetDerivedTypesFor(string? asTypeName)
+    {
+        if (asTypeName != null && NameDescendentsMap.TryGetValue(asTypeName, out var derivedTypes))
+            return derivedTypes;
+
+        return null;
+    }
+    
+    
+    /// <summary>
+    ///     Static constructor to ensure that all AS types have been statically initialized.
+    ///     The CLR will not automatically call static initializers in interfaces.
+    ///     https://stackoverflow.com/questions/5299737/static-constructor-on-a-net-interface-is-not-run
+    ///     https://learn.microsoft.com/en-us/dotnet/api/system.runtime.compilerservices.runtimehelpers.runclassconstructor?view=net-8.0
+    /// </summary>
+    static ASNameTree()
+    {
+        var interfaceTypes = AppDomain.CurrentDomain.GetAssemblies()
+            .SelectMany(a => a.GetTypes())
+            .Where(t => t.IsAssignableTo(typeof(ASType)))
+            .SelectMany(t => t.GetInterfaces());
+        
+        foreach (var type in interfaceTypes)
+        {
+            RuntimeHelpers.RunClassConstructor(type.TypeHandle);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Internal/CompositeASType.cs b/Source/ActivityPub.Types/Internal/CompositeASType.cs
index f6d2e93..f6e630c 100644
--- a/Source/ActivityPub.Types/Internal/CompositeASType.cs
+++ b/Source/ActivityPub.Types/Internal/CompositeASType.cs
@@ -35,9 +35,8 @@ internal class CompositeASType
     public void Add(string type, string? replacedType = null)
     {
         // Add it to the superset.
-        // This doubles as a duplicate check to avoid extra set operations.
-        if (!_allASTypes.Add(type))
-            return;
+        // This may happen repeatedly as a type graph is hydrated.
+        _allASTypes.Add(type);
         
         // Replace the base type
         if (replacedType != null)
@@ -50,4 +49,16 @@ public void Add(string type, string? replacedType = null)
         if (!_replacedASTypes.Contains(type))
             _flatASTypes.Add(type);
     }
+    
+    /// <summary>
+    ///     Adds a collection of type names.
+    ///     These are assumed to to not shadow anything, but may be shadowed by existing types.
+    /// </summary>
+    public void AddRange(IEnumerable<string> asTypes)
+    {
+        foreach (var asType in asTypes)
+        {
+            Add(asType);
+        }
+    }
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Internal/Pivots/AnonymousEntityPivot.cs b/Source/ActivityPub.Types/Internal/Pivots/AnonymousEntityPivot.cs
deleted file mode 100644
index e7bc20e..0000000
--- a/Source/ActivityPub.Types/Internal/Pivots/AnonymousEntityPivot.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Reflection;
-using System.Text.Json;
-using ActivityPub.Types.Conversion.Overrides;
-
-namespace ActivityPub.Types.Internal.Pivots;
-
-internal class AnonymousEntityPivot
-{
-    private readonly Dictionary<Type, AnonymousChecker> _anonymousCheckerCache = new();
-    private readonly Func<Type, AnonymousChecker> _createAnonymousChecker =
-        typeof(AnonymousEntityPivot)
-            .GetRequiredMethod(nameof(CreateAnonymousChecker), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotFunc<AnonymousChecker>();
-
-    public bool ShouldConvert(Type entityType, JsonElement jsonElement, DeserializationMetadata meta)
-    {
-        var checker = GetAnonymousChecker(entityType);
-        return checker.ShouldConvert(jsonElement, meta);
-    }
-    
-    private AnonymousChecker GetAnonymousChecker(Type entityType)
-    {
-        if (!_anonymousCheckerCache.TryGetValue(entityType, out var checker))
-        {
-            checker = _createAnonymousChecker(entityType);
-            _anonymousCheckerCache[entityType] = checker;
-        }
-
-        return checker;
-    }
-    
-    private static AnonymousChecker CreateAnonymousChecker<TEntity>()
-        where TEntity : IAnonymousEntity
-        => new AnonymousChecker<TEntity>();
-    
-    private abstract class AnonymousChecker
-    {
-        public abstract bool ShouldConvert(JsonElement jsonElement, DeserializationMetadata meta);
-    }
-
-    private class AnonymousChecker<T> : AnonymousChecker
-        where T : IAnonymousEntity
-    {
-        public override bool ShouldConvert(JsonElement jsonElement, DeserializationMetadata meta)
-            => T.ShouldConvertFrom(jsonElement, meta);
-    }
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Internal/Pivots/CustomConvertedEntityPivot.cs b/Source/ActivityPub.Types/Internal/Pivots/CustomConvertedEntityPivot.cs
deleted file mode 100644
index b59fef7..0000000
--- a/Source/ActivityPub.Types/Internal/Pivots/CustomConvertedEntityPivot.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using ActivityPub.Types.Conversion.Overrides;
-
-namespace ActivityPub.Types.Internal.Pivots;
-
-internal class CustomConvertedEntityPivot
-{
-    private readonly Dictionary<Type, bool> _knownCustomConverters = new();
-    
-    /// <summary>
-    ///     Pivots to <see cref="ReadEntity{TEntity}"/> from a <see cref="Type"/> provided as first argument.
-    /// </summary>
-    private readonly Func<Type, JsonElement, DeserializationMetadata, ASEntity?> _readEntityPivot =
-        typeof(CustomConvertedEntityPivot)
-        .GetRequiredMethod(nameof(ReadEntity), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-        .CreateGenericPivotFunc<JsonElement, DeserializationMetadata, ASEntity?>();
-    
-    /// <summary>
-    ///     Pivots to <see cref="PostReadEntity{TEntity}"/> from a <see cref="Type"/> provided as first argument.
-    /// </summary>
-    private readonly Action<Type, JsonElement, DeserializationMetadata, ASEntity> _postReadEntityPivot = 
-        typeof(CustomConvertedEntityPivot)
-            .GetRequiredMethod(nameof(PostReadEntity), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotAction<JsonElement, DeserializationMetadata, ASEntity>();
-    
-    /// <summary>
-    ///     Pivots to <see cref="WriteEntity{TEntity}"/> from a <see cref="Type"/> provided as first argument.
-    /// </summary>
-    private readonly Func<Type, ASEntity, SerializationMetadata, JsonElement?> _writeEntityPivot =
-        typeof(CustomConvertedEntityPivot)
-            .GetRequiredMethod(nameof(WriteEntity), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotFunc<ASEntity, SerializationMetadata, JsonElement?>();
-    
-    /// <summary>
-    ///     Pivots to <see cref="PostWriteEntity{TEntity}"/> from a <see cref="Type"/> provided as first argument.
-    /// </summary>
-    private readonly Action<Type, ASEntity, SerializationMetadata, JsonElement, JsonObject> _postWriteEntityPivot =
-        typeof(CustomConvertedEntityPivot)
-            .GetRequiredMethod(nameof(PostWriteEntity), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotAction<ASEntity, SerializationMetadata, JsonElement, JsonObject>();
-
-
-    public ASEntity? ReadEntity(Type entityType, JsonElement jsonElement, DeserializationMetadata meta)
-    {
-        if (IsCustomConverted(entityType))
-            return _readEntityPivot(entityType, jsonElement, meta);
-
-        return null;
-    }
-
-    public void PostReadEntity(Type entityType, JsonElement jsonElement, DeserializationMetadata meta, ASEntity entity)
-    {
-        if (IsCustomConverted(entityType))
-            _postReadEntityPivot(entityType, jsonElement, meta, entity);
-    }
-
-    public JsonElement? WriteEntity(Type entityType, ASEntity entity, SerializationMetadata meta)
-    {
-        if (IsCustomConverted(entityType))
-            return _writeEntityPivot(entityType, entity, meta);
-
-        return null;
-    }
-
-    public void PostWriteEntity(Type entityType, ASEntity entity, SerializationMetadata meta, JsonElement entityJson, JsonObject outputJson)
-    {
-        if (IsCustomConverted(entityType))
-            _postWriteEntityPivot(entityType, entity, meta, entityJson, outputJson);
-    }
-
-    /// <summary>
-    ///     Checks if a provided entity type is an implementation of <see cref="ICustomConvertedEntity{TEntity}"/>.
-    /// </summary>
-    private bool IsCustomConverted(Type entityType)
-    {
-        if (!_knownCustomConverters.TryGetValue(entityType, out var isCustomConverted))
-        {
-            // This is all just a complicated way to avoid a crash in the case where entityType does *not* implement ICustomConvertedEntity<entityType>
-            if (typeof(ICustomConvertedEntity<>).TryMakeGenericType(out var interfaceType, entityType))
-                isCustomConverted = entityType.IsAssignableTo(interfaceType);
-            else
-                isCustomConverted = false;
-            
-            _knownCustomConverters.Add(entityType, isCustomConverted);
-        }
-
-        return isCustomConverted;
-    }
-
-
-    /// <summary>
-    ///     Calls <see cref="ICustomConvertedEntity{TEntity}.ReadEntity"/> for a given type of <code>TEntity</code>.
-    /// </summary>
-    private static TEntity? ReadEntity<TEntity>(JsonElement jsonElement, DeserializationMetadata meta)
-        where TEntity : ASEntity, ICustomConvertedEntity<TEntity>
-        => TEntity.ReadEntity(jsonElement, meta);
-
-    /// <summary>
-    ///     Calls <see cref="ICustomConvertedEntity{TEntity}.PostReadEntity"/> for a given type of <code>TEntity</code>.
-    ///     Parameter types are relaxed to simplify generic binding.
-    /// </summary>
-    private static void PostReadEntity<TEntity>(JsonElement jsonElement, DeserializationMetadata meta, ASEntity entity)
-        where TEntity : ASEntity, ICustomConvertedEntity<TEntity>
-        => TEntity.PostReadEntity(jsonElement, meta, (TEntity)entity);
-
-    /// <summary>
-    ///     Calls <see cref="ICustomConvertedEntity{TEntity}.WriteEntity"/> for a given type of <code>TEntity</code>.
-    ///     Parameter types are relaxed to simplify generic binding.
-    /// </summary>
-    private static JsonElement? WriteEntity<TEntity>(ASEntity entity, SerializationMetadata meta)
-        where TEntity : ASEntity, ICustomConvertedEntity<TEntity>
-        => TEntity.WriteEntity((TEntity)entity, meta);
-
-    /// <summary>
-    ///     Calls <see cref="ICustomConvertedEntity{TEntity}.PostWriteEntity"/> for a given type of <code>TEntity</code>.
-    ///     Parameter types are relaxed to simplify generic binding.
-    /// </summary>
-    private static void PostWriteEntity<TEntity>(ASEntity entity, SerializationMetadata meta, JsonElement entityJson, JsonObject outputJson)
-        where TEntity : ASEntity, ICustomConvertedEntity<TEntity>
-        => TEntity.PostWriteEntity((TEntity)entity, meta, entityJson, outputJson);
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Internal/Pivots/NamelessEntityPivot.cs b/Source/ActivityPub.Types/Internal/Pivots/NamelessEntityPivot.cs
deleted file mode 100644
index b36849d..0000000
--- a/Source/ActivityPub.Types/Internal/Pivots/NamelessEntityPivot.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Reflection;
-using ActivityPub.Types.Conversion.Overrides;
-
-namespace ActivityPub.Types.Internal.Pivots;
-
-internal class NamelessEntityPivot
-{
-    private readonly Dictionary<Type, NamelessChecker> _namelessCheckerCache = new();
-    private readonly Func<Type, NamelessChecker> _createNamelessChecker =
-        typeof(NamelessEntityPivot)
-            .GetRequiredMethod(nameof(CreateNamelessChecker), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.DeclaredOnly)
-            .CreateGenericPivotFunc<NamelessChecker>();
-
-    public bool ShouldConvert(Type entityType, DeserializationMetadata meta)
-    {
-        var checker = GetNamelessChecker(entityType);
-        return checker.ShouldConvert(meta);
-    }
-    
-    private NamelessChecker GetNamelessChecker(Type entityType)
-    {
-        if (!_namelessCheckerCache.TryGetValue(entityType, out var checker))
-        {
-            checker = _createNamelessChecker(entityType);
-            _namelessCheckerCache[entityType] = checker;
-        }
-
-        return checker;
-    }
-    
-    private static NamelessChecker CreateNamelessChecker<TEntity>()
-        where TEntity : INamelessEntity
-        => new NamelessChecker<TEntity>();
-    
-    private abstract class NamelessChecker
-    {
-        public abstract bool ShouldConvert(DeserializationMetadata meta);
-    }
-
-    private class NamelessChecker<T> : NamelessChecker
-        where T : INamelessEntity
-    {
-        public override bool ShouldConvert(DeserializationMetadata meta)
-            => T.ShouldConvertFrom(meta.LDContext, meta);
-    }
-}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Internal/TypeGraphReader.cs b/Source/ActivityPub.Types/Internal/TypeGraphReader.cs
new file mode 100644
index 0000000..23a0818
--- /dev/null
+++ b/Source/ActivityPub.Types/Internal/TypeGraphReader.cs
@@ -0,0 +1,132 @@
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
+using ActivityPub.Types.AS;
+using ActivityPub.Types.Util;
+
+namespace ActivityPub.Types.Internal;
+
+internal interface ITypeGraphReader
+{
+    public JsonLDContext GetASContext();
+    public List<string> GetASTypes();
+
+    public bool TryReadEntity<TModel, TEntity>(TypeMap typeMap, [NotNullWhen(true)] out TEntity? entity)
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new();
+
+    public bool TryReadEntity<TModel>(TypeMap typeMap, [NotNullWhen(true)] out ASEntity? entity)
+        where TModel : ASType, IASModel<TModel>;
+}
+
+internal class TypeGraphReader : ITypeGraphReader
+{
+    private readonly JsonSerializerOptions _jsonOptions;
+    private readonly JsonElement _sourceElement;
+
+    private readonly JsonLDContext _context;
+    private readonly HashSet<string> _asTypes;
+
+    public TypeGraphReader(JsonSerializerOptions jsonOptions, JsonElement sourceElement)
+    {
+        _jsonOptions = jsonOptions;
+        _sourceElement = sourceElement;
+
+        if (sourceElement.ValueKind != JsonValueKind.Object)
+            throw new ArgumentException($"{nameof(TypeGraphReader)} can only convert JSON objects. Input is of type {sourceElement.ValueKind}.", nameof(sourceElement));
+        
+        _context = ReadASContext(_sourceElement, _jsonOptions);
+        _asTypes = ReadASTypes(_sourceElement, _jsonOptions);
+    }
+
+    public JsonLDContext GetASContext()
+        => _context.Clone();
+
+    public List<string> GetASTypes()
+        => _asTypes.ToList();
+    
+    
+    public bool TryReadEntity<TModel, TEntity>(TypeMap typeMap, [NotNullWhen(true)] out TEntity? entity)
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new()
+    {
+        var shouldConvert = TModel.ShouldConvertFrom(_sourceElement, typeMap) ?? ShouldConvertObject<TModel>();
+        if (shouldConvert)
+        { 
+            entity = _sourceElement.Deserialize<TEntity>(_jsonOptions)
+                ?? throw new JsonException($"Failed to deserialize {TModel.EntityType} - JsonElement.Deserialize returned null");
+            return true;
+        }
+        
+        entity = null;
+        return false;
+    }
+    
+    public bool TryReadEntity<TModel>(TypeMap typeMap, [NotNullWhen(true)] out ASEntity? entity)
+        where TModel : ASType, IASModel<TModel>
+    {
+        var shouldConvert = TModel.ShouldConvertFrom(_sourceElement, typeMap) ?? ShouldConvertObject<TModel>();
+        if (shouldConvert)
+        { 
+            entity = (ASEntity?)_sourceElement.Deserialize(TModel.EntityType, _jsonOptions)
+                ?? throw new JsonException($"Failed to deserialize {TModel.EntityType} - JsonElement.Deserialize returned null");
+            return true;
+        }
+        
+        entity = null;
+        return false;
+    }
+
+    private bool ShouldConvertObject<TModel>()
+        where TModel : ASType, IASModel<TModel>
+    {
+        // Check context first
+        if (!_context.IsSupersetOf(TModel.DefiningContext))
+            return false;
+        
+        // If this is a nameless entity, then we're done.
+        if (TModel.ASTypeName == null)
+            return true;
+        
+        // Next, we need to check the AS type name.
+        if (_asTypes.Contains(TModel.ASTypeName))
+            return true;
+
+        // Finally, we need to check the AS type name of all *derived* types.
+        // Otherwise, an object like {"type":"Create"} would not be detected as a type of Activity. 
+        // This is non-trivial, as we must do this without reflection (this code is on the hot path).
+        // Fortunately, most of the work is done for us by ASNameTree.
+        var derivedTypes = TModel.DerivedTypeNames;
+        return derivedTypes != null && _asTypes.Overlaps(derivedTypes);
+    }
+
+    private static JsonLDContext ReadASContext(JsonElement element, JsonSerializerOptions options)
+    {
+        // Try to get the context property.
+        if (!element.TryGetProperty("@context", out var contextProp))
+            // If missing then use default.
+            return JsonLDContext.CreateASContext();
+
+        // Convert context
+        return contextProp.Deserialize<JsonLDContext>(options)
+               ?? throw new JsonException("Can't convert TypeMap - \"@context\" property is null");
+    }
+
+    private static HashSet<string> ReadASTypes(JsonElement element, JsonSerializerOptions options)
+    {
+        // An object without the types field is just "object"
+        if (!element.TryGetProperty("type", out var typeProp))
+            return new HashSet<string>
+            {
+                ASObject.ObjectType
+            };
+        
+        // Everything thing else must be converted
+        var types = typeProp.Deserialize<HashSet<string>>(options) 
+            ?? throw new JsonException("Can't convert TypeMap - \"type\" is null");
+        types.Add(ASObject.ObjectType);
+        return types;
+    }
+}
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/TypeMap.cs b/Source/ActivityPub.Types/TypeMap.cs
index e79951a..a58117d 100644
--- a/Source/ActivityPub.Types/TypeMap.cs
+++ b/Source/ActivityPub.Types/TypeMap.cs
@@ -27,18 +27,41 @@ public class TypeMap
     // Cache of entity classes that have been added to this type graph.
     private readonly Dictionary<Type, ASEntity> _entityCache = new();
 
+    // Optional JSON wrapper to source missing data.
+    private readonly ITypeGraphReader? _sourceJson;
+
     /// <summary>
     ///     Constructs a new, empty type graph initialized with the ActivityStreams context.
     /// </summary>
-    public TypeMap() : this(JsonLDContext.CreateASContext()) {}
+    public TypeMap() => _ldContext = JsonLDContext.CreateASContext();
+    
+    /// <summary>
+    ///     Constructs a TypeMap from a JSON message
+    /// </summary>
+    internal TypeMap(ITypeGraphReader sourceJson)
+    {
+        _sourceJson = sourceJson;
+        _ldContext = sourceJson.GetASContext();
+        _asTypes.AddRange(sourceJson.GetASTypes());
+    }
 
     /// <summary>
-    ///     Constructs a TypeMap with a pre-populated JSON-LD context.
+    ///     Constructs an empty TypeMap from pre-constructed context.
+    ///     The caller is responsible for populating any associated entities. 
     /// </summary>
-    /// <param name="ldContext"></param>
+    /// <remarks>
+    ///     This constructor is required to convert links in string-form.
+    ///     That specific case is not supported by <see cref="TypeGraphReader"/>. 
+    /// </remarks>
+    internal TypeMap(JsonLDContext ldContext, IEnumerable<string> asTypes)
+    {
+        _ldContext = ldContext;
+        _asTypes.AddRange(asTypes);
+    }
+    
+    /// <inheritdoc cref="TypeMap(JsonLDContext, IEnumerable{string})"/>
     internal TypeMap(JsonLDContext ldContext) => _ldContext = ldContext;
 
-
     /// <inheritdoc cref="CompositeASType.Types"/>
     /// <seealso cref="AllASTypes"/>
     public IReadOnlySet<string> ASTypes => _asTypes.Types;
@@ -71,45 +94,56 @@ public TypeMap() : this(JsonLDContext.CreateASContext()) {}
     /// <summary>
     ///     Checks if the object contains a particular entity type.
     /// </summary>
-    public bool IsEntity<TEntity>()
-        where TEntity : ASEntity
-        => _entityCache.ContainsKey(typeof(TEntity));
-
+    public bool IsEntity<TModel, TEntity>()
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
+        => IsEntity<TModel, TEntity>(out _);
+    
     /// <summary>
     ///     Checks if the object contains a particular type entity.
     ///     If so, then the instance of that type is extracted and returned.
     /// </summary>
-    /// <seealso cref="IsEntity{TEntity}()" />
-    /// <seealso cref="AsEntity{TEntity}" />
-    public bool IsEntity<TEntity>([NotNullWhen(true)] out TEntity? instance)
-        where TEntity : ASEntity
+    /// <seealso cref="IsEntity{TModel, TEntity}()" />
+    /// <seealso cref="AsEntity{TModel, TEntity}" />
+    public bool IsEntity<TModel, TEntity>([NotNullWhen(true)] out TEntity? instance)
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
     {
+        // 1. See if the entity is already in the type
         if (_entityCache.TryGetValue(typeof(TEntity), out var instanceT))
         {
             instance = (TEntity)instanceT;
             return true;
         }
-
+    
+        // 2. See if we can construct the entity from JSON
+        if (_sourceJson != null && _sourceJson.TryReadEntity<TModel, TEntity>(this, out instance))
+        {
+            AddEntity(instance);
+            return true;
+        }
+    
         instance = null;
         return false;
     }
-
+    
     /// <summary>
     ///     Gets an entity representing the object as entity type <code>TEntity</code>.
     /// </summary>
     /// <remarks>
     ///     This function will not extend the object to include a new type.
-    ///     To safely convert to an instance that *might* be present, use <see cref="IsEntity{TEntity}(out TEntity)"/>.
+    ///     To safely convert to an instance that *might* be present, use <see cref="IsEntity{TModel, TEntity}(out TEntity)"/>.
     /// </remarks>
-    /// <seealso cref="IsEntity{TEntity}(out TEntity)" />
+    /// <seealso cref="IsEntity{TModel, TEntity}(out TEntity)" />
     /// <exception cref="InvalidCastException">If the object is not of type <code>TEntity</code></exception>
-    public TEntity AsEntity<TEntity>()
-        where TEntity : ASEntity
+    public TEntity AsEntity<TModel, TEntity>()
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
     {
-        var type = typeof(TEntity);
-        if (!_entityCache.TryGetValue(type, out var instance))
-            throw new InvalidCastException($"Can't represent the graph as entity {typeof(TEntity)}");
-        return (TEntity)instance;
+        if (IsEntity<TModel, TEntity>(out var entity))
+            return entity;
+        
+        throw new InvalidCastException($"Can't represent the graph as entity {typeof(TEntity)}");
     }
 
     /// <summary>
@@ -119,20 +153,7 @@ public TEntity AsEntity<TEntity>()
     /// <seealso cref="AsModel{TModel}()" />
     public bool IsModel<TModel>()
         where TModel : ASType, IASModel<TModel>
-    {
-        var type = typeof(TModel);
-
-        // Already cached -> yes
-        if (_modelCache.ContainsKey(type))
-            return true;
-
-        // Can create it (entity is in the graph) -> yes
-        if (_entityCache.ContainsKey(TModel.EntityType))
-            return true;
-
-        // Otherwise -> no
-        return false;
-    }
+        => IsModel<TModel>(out _);
 
     /// <summary>
     ///     Checks if the graph contains a particular model type.
@@ -159,6 +180,15 @@ public bool IsModel<TModel>([NotNullWhen(true)] out TModel? instance)
             _modelCache[type] = instance;
             return true;
         }
+        
+        // Fallback can create it (entity is NOT in the graph) -> yes
+        if (_sourceJson != null && _sourceJson.TryReadEntity<TModel>(this, out var entity))
+        {
+            AddEntity(entity);
+            instance = TModel.FromGraph(this);
+            _modelCache[type] = instance;
+            return true;
+        }
 
         // Otherwise -> no
         instance = null;
@@ -175,13 +205,13 @@ public bool IsModel<TModel>([NotNullWhen(true)] out TModel? instance)
     /// <seealso cref="IsModel{TModel}()"/>
     /// <seealso cref="IsModel{TModel}(out TModel)" />
     /// <exception cref="InvalidCastException">If the graph cannot be represented by the type</exception>
-    public TObject AsModel<TObject>()
-        where TObject : ASType, IASModel<TObject>
+    public TModel AsModel<TModel>()
+        where TModel : ASType, IASModel<TModel>
     {
-        if (IsModel<TObject>(out var instance))
+        if (IsModel<TModel>(out var instance))
             return instance;
 
-        throw new InvalidCastException($"Can't represent the graph as type {typeof(TObject)}");
+        throw new InvalidCastException($"Can't represent the graph as type {typeof(TModel)}");
     }
 
     /// <summary>
@@ -191,18 +221,19 @@ public TObject AsModel<TObject>()
     /// </summary>
     /// <remarks>
     ///     This function cannot accomodate entities with required members.
-    ///     Instead, <see cref="Extend{TEntity}(TEntity)"/> must be used.
+    ///     Instead, <see cref="Extend{TModel, TEntity}(TEntity)"/> must be used.
     /// </remarks>
     /// <exception cref="InvalidOperationException">If <code>extendGraph</code> is <see langword="true"/> and the entity type already exists in the graph</exception>
     /// <exception cref="InvalidOperationException">If <code>extendGraph</code> is <see langword="true"/> and the entity requires another entity that is missing from the graph</exception>
     /// <exception cref="InvalidCastException">If <code>extendGraph</code> is <see langword="false"/> and the object is not of type <code>TEntity</code></exception>
-    /// <seealso cref="Extend{TEntity}()"/>
-    /// <seealso cref="AsEntity{TEntity}"/>
-    public TEntity ProjectTo<TEntity>(bool extendGraph)
-        where TEntity : ASEntity, new() 
+    /// <seealso cref="Extend{TModel, TEntity}()"/>
+    /// <seealso cref="AsEntity{TModel, TEntity}"/>
+    public TEntity ProjectTo<TModel, TEntity>(bool extendGraph)
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
         => extendGraph
-            ? Extend<TEntity>()
-            : AsEntity<TEntity>();
+            ? Extend<TModel, TEntity>()
+            : AsEntity<TModel, TEntity>();
 
     /// <summary>
     ///     Extends the TypeGraph to include a new entity.
@@ -211,33 +242,32 @@ public TEntity ProjectTo<TEntity>(bool extendGraph)
     /// </summary>
     /// <remarks>
     ///     This function cannot accomodate entities with required members.
-    ///     Instead, <see cref="Extend{TEntity}(TEntity)"/> must be used.
+    ///     Instead, <see cref="Extend{TModel, TEntity}(TEntity)"/> must be used.
     /// </remarks>
     /// <exception cref="InvalidOperationException">If the entity type already exists in the graph</exception>
     /// <exception cref="InvalidOperationException">If the entity requires another entity that is missing from the graph</exception>
-    /// <see cref="Extend{TEntity}(TEntity)"/>
+    /// <see cref="Extend{TModel, TEntity}(TEntity)"/>
     /// <seealso cref="AddEntity"/>
     /// <seealso cref="TryAddEntity"/>
-    public TEntity Extend<TEntity>()
-        where TEntity : ASEntity, new()
-        => Extend(new TEntity());
+    public TEntity Extend<TModel, TEntity>()
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
+        => Extend<TModel, TEntity>(new TEntity());
     
     /// <summary>
     ///     Extends the TypeGraph to include a new entity.
     ///     Throws an exception if the entity would be a duplicate or have unmet dependencies.
     /// </summary>
-    /// <param name="entity"></param>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <returns></returns>
     /// <exception cref="InvalidOperationException">If the entity type already exists in the graph</exception>
     /// <exception cref="InvalidOperationException">If the entity requires another entity that is missing from the graph</exception>
-    /// <see cref="Extend{TEntity}()"/>
+    /// <see cref="Extend{TModel, TEntity}()"/>
     /// <seealso cref="AddEntity"/>
     /// <seealso cref="TryAddEntity"/>
-    public TEntity Extend<TEntity>(TEntity entity)
-        where TEntity : ASEntity
+    public TEntity Extend<TModel, TEntity>(TEntity entity)
+        where TModel : ASType, IASModel<TModel, TEntity>
+        where TEntity : ASEntity<TModel, TEntity>, new() 
     {
-        if (IsEntity<TEntity>())
+        if (IsEntity<TModel, TEntity>())
             throw new InvalidOperationException($"Cannot extend the graph with entity {typeof(TEntity)}: that type already exists in the graph");
         
         // Check dependencies - this is a workaround to avoid the risk case described in TryAdd().
@@ -261,7 +291,7 @@ internal void AddEntity(ASEntity instance)
     /// <summary>
     ///     Adds a new typed instance to the graph.
     ///     Metadata such as AS types and JSON-LD context is automatically updated.
-    ///     User code should not call this method; use <see cref="Extend{TEntity}()"/> instead.
+    ///     User code should not call this method; use <see cref="Extend{TModel, TEntity}()"/> instead.
     /// </summary>
     /// <remarks>
     ///     <para>
@@ -281,22 +311,21 @@ internal void AddEntity(ASEntity instance)
     ///         This can be extremely hard to diagnose because <see cref="ASObjectEntity"/> does not even appear in the visible code.
     ///     </para>
     ///     <para>
-    ///         The <see cref="Extend{TEntity}()"/> function, however, avoids this with an included dependency check.
+    ///         The <see cref="Extend{TModel, TEntity}()"/> function, however, avoids this with an included dependency check.
     ///         The second call to <see cref="AddEntity"/> will fail with a descriptive error message indicating that <code>Object</code> is missing from the graph.
     ///         While still somewhat confusing, this method will additionally <b>fail fast</b> before the graph can even enter an invalid state.
     ///         This ensures that errors are caught quickly and before they can spread to corrupt the application state.
     ///     </para>
     /// </remarks>
     /// <returns>true if the type was added, false if it was already in the type map</returns>
-    /// <seealso cref="Extend{TEntity}()"/>
+    /// <seealso cref="Extend{TModel, TEntity}()"/>
     internal bool TryAddEntity(ASEntity entity)
     {
         var type = entity.GetType();
-        if (_entityCache.ContainsKey(type))
-            return false;
-
+        
         // Map the instance
-        _entityCache[type] = entity;
+        if (!_entityCache.TryAdd(type, entity))
+            return false;
 
         // Map the AS type
         if (entity.ASTypeName != null)
@@ -330,10 +359,4 @@ private void NarrowUnmappedProperties(ASEntity entity)
                 .ToList()
                 .ForEach(k => UnmappedProperties.Remove(k));
     }
-
-    /// <summary>
-    ///     Records an ActivityStreams type name as being present in the type graph, but not mapped to any known implementation class.
-    ///     Duplicates will be ignored.
-    /// </summary>
-    internal void AddUnmappedType(string asTypeName) => _asTypes.Add(asTypeName);
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/TypesModule.cs b/Source/ActivityPub.Types/TypesModule.cs
index 2805d9c..0f032df 100644
--- a/Source/ActivityPub.Types/TypesModule.cs
+++ b/Source/ActivityPub.Types/TypesModule.cs
@@ -25,15 +25,6 @@ public static void TryAddTypesModule(this IServiceCollection services)
     {
         services.TryAddSingleton<IJsonLdSerializer, JsonLdSerializer>();
         
-        services.TryAddSingleton<IASTypeInfoCache>(
-            _ =>
-            {
-                var cache = new ASTypeInfoCache();
-                cache.RegisterAllAssemblies();
-                return cache;
-            }
-        );
-        
         services.AddSingleton<TypeMapConverter>();
         services.AddSingleton<ASTypeConverter>();
         services.AddSingleton<LinkableConverter>();
diff --git a/Source/ActivityPub.Types/Util/JsonLDContext.cs b/Source/ActivityPub.Types/Util/JsonLDContext.cs
index 36c1c72..1c75554 100644
--- a/Source/ActivityPub.Types/Util/JsonLDContext.cs
+++ b/Source/ActivityPub.Types/Util/JsonLDContext.cs
@@ -45,4 +45,9 @@ public JsonLDContext(IEnumerable<JsonLDContextObject> objects) : base(objects) {
     {
         JsonLDContextObject.ActivityStreams
     };
+    
+    /// <summary>
+    ///     Creates a shallow copy of this Json-LD context.
+    /// </summary>
+    public JsonLDContext Clone() => new(this);
 }
\ No newline at end of file
diff --git a/Source/ActivityPub.Types/Util/Linkable.cs b/Source/ActivityPub.Types/Util/Linkable.cs
index a333cb6..9682b5f 100644
--- a/Source/ActivityPub.Types/Util/Linkable.cs
+++ b/Source/ActivityPub.Types/Util/Linkable.cs
@@ -11,6 +11,7 @@ namespace ActivityPub.Types.Util;
 /// </summary>
 /// <typeparam name="T">Type of element</typeparam>
 public sealed class Linkable<T>
+    where T : ASType
 {
     /// <summary>
     ///     Creates a Linkable from a reference link
diff --git a/Source/ActivityPub.Types/Util/LinkableList.cs b/Source/ActivityPub.Types/Util/LinkableList.cs
index fb1563d..fa44aa2 100644
--- a/Source/ActivityPub.Types/Util/LinkableList.cs
+++ b/Source/ActivityPub.Types/Util/LinkableList.cs
@@ -9,6 +9,7 @@ namespace ActivityPub.Types.Util;
 ///     Synthetic type to represent a list of <code>T</code> or Links to <code>T</code>
 /// </summary>
 public class LinkableList<T> : List<Linkable<T>>
+    where T : ASType
 {
     /// <inheritdoc />
     public LinkableList() {}
diff --git a/Source/ActivityPub.Types/Util/NaturalLanguageString.cs b/Source/ActivityPub.Types/Util/NaturalLanguageString.cs
index 56bcf85..828b69b 100644
--- a/Source/ActivityPub.Types/Util/NaturalLanguageString.cs
+++ b/Source/ActivityPub.Types/Util/NaturalLanguageString.cs
@@ -31,6 +31,12 @@ public string? DefaultValue
     public IReadOnlyDictionary<string, string> LanguageMap => _languageMap;
     private readonly Dictionary<string, string> _languageMap = new();
     
+    /// <summary>
+    ///     <see langword="true"/> if this string contains any language-tagged values.
+    ///     <see cref="DefaultValue"/> is ignored.
+    /// </summary>
+    public bool HasLanguages => _languageMap.Any();
+    
     /// <summary>
     ///     Constructs a NaturalLanguageString from a map of BCP47 Language-Tags.
     /// </summary>
diff --git a/Source/ActivityPub.Types/readme.md b/Source/ActivityPub.Types/readme.md
index 3af4ef7..e40b196 100644
--- a/Source/ActivityPub.Types/readme.md
+++ b/Source/ActivityPub.Types/readme.md
@@ -68,12 +68,9 @@ However, it will be necessary if implementing a new extension or handling some r
 
 ### Entity Mapping
 
-APSharp includes a 4-step process to determine which entities should be constructed from an incoming JSON message.
-All entities detected by at least one test will be converted and parsed.
-1. Map values of the `type` property to registered AS type names.
-2. Try all entities that implement [`INamelessEntity`](Conversion/Overrides/INamelessEntity.cs).
-3. Try all entities that implement [`IAnonymousEntity`](Conversion/Overrides/IAnonymousEntity.cs).
-4. Try all configured [`IAnonymousEntitySelector`](Conversion/Overrides/IAnonymousEntitySelector.cs) instances.
+By default, APSharp checks the `@context` and `type` properties to determine whether an object can be projected to a given model or entity.
+Entities without a type will be converted purely based on the context.
+This logic can be altered by overriding `IASModel.ShouldConvertFrom` and performing additional checks.
 
 ## Utility Types
 
@@ -138,4 +135,3 @@ See the [ActivityStreams documentation](https://www.w3.org/TR/activitystreams-co
 | Service                                               | Implementation                                          | Description                                                           |
 |-------------------------------------------------------|---------------------------------------------------------|-----------------------------------------------------------------------|
 | [`IJsonLdSerializer`](Conversion/JsonLdSerializer.cs) | [`JsonLdSerializer.cs`](Conversion/JsonLdSerializer.cs) | Parses and serializes ActivityStreams messages from JSON or JSON-LD.  |
-| [`IASTypeInfoCache`](Conversion/ASTypeInfoCache.cs)   | [`ASTypeInfoCache`](Conversion/ASTypeInfoCache.cs)      | Indexes metadata related to AS / AP types defined in the application. |
diff --git a/Test/ActivityPub.Types.Tests/Integration/Deserialization/ExtensionDeserializationTests.cs b/Test/ActivityPub.Types.Tests/Integration/Deserialization/ExtensionDeserializationTests.cs
index 85bdb67..bf38b1e 100644
--- a/Test/ActivityPub.Types.Tests/Integration/Deserialization/ExtensionDeserializationTests.cs
+++ b/Test/ActivityPub.Types.Tests/Integration/Deserialization/ExtensionDeserializationTests.cs
@@ -45,23 +45,6 @@ public void Convert_FromBothProperties()
             ObjectUnderTest.As<AnonymousExtensionFake>().ExtendedString.Should().Be("Hello, world!");
             ObjectUnderTest.As<AnonymousExtensionFake>().ExtendedInt.Should().Be(123);
         }
-
-        [Fact]
-        public void Convert_FromEntitySelector()
-        {
-            SerializerFixture.ConversionOptions.AnonymousEntitySelectors.Add
-            (
-                new AnonymousEntitySelectorFake
-                {
-                    PropertyNameMapping =
-                    {
-                        [nameof(ASActivity.Actor)] = typeof(ASActivityEntity)
-                    }
-                }    
-            );
-            JsonUnderTest = """{"@context":"https://www.w3.org/ns/activitystreams","type":"Object","Actor":{}}""";
-            ObjectUnderTest.Is<ASActivity>().Should().BeTrue();
-        }
         
         public AnonymousExtensionsShould(JsonLdSerializerFixture fixture) : base(fixture) {}
     }
diff --git a/Test/ActivityPub.Types.Tests/Integration/Serialization/ObjectSerializationTests.cs b/Test/ActivityPub.Types.Tests/Integration/Serialization/ObjectSerializationTests.cs
index 8e8b35c..78ec164 100644
--- a/Test/ActivityPub.Types.Tests/Integration/Serialization/ObjectSerializationTests.cs
+++ b/Test/ActivityPub.Types.Tests/Integration/Serialization/ObjectSerializationTests.cs
@@ -61,6 +61,7 @@ public void WriteDefaultValueToContentJson()
             };
 
             JsonUnderTest.Should().HaveStringProperty("content", "default");
+            JsonUnderTest.Should().NotHaveProperty("contentMap");
         }
 
         [Fact]
diff --git a/Test/ActivityPub.Types.Tests/Integration/Serialization/ValueStripSerializationTests.cs b/Test/ActivityPub.Types.Tests/Integration/Serialization/ValueStripSerializationTests.cs
index 60c89c4..33aad32 100644
--- a/Test/ActivityPub.Types.Tests/Integration/Serialization/ValueStripSerializationTests.cs
+++ b/Test/ActivityPub.Types.Tests/Integration/Serialization/ValueStripSerializationTests.cs
@@ -122,11 +122,11 @@ public class FakeObjectWithSpecialNullability : ASObject, IASModel<FakeObjectWit
     static string IASModel<FakeObjectWithSpecialNullability>.ASTypeName => FakeObjectWithSpecialNullabilityType;
 
     /// <inheritdoc />
-    public FakeObjectWithSpecialNullability() => Entity = TypeMap.Extend<FakeObjectWithSpecialNullabilityEntity>();
+    public FakeObjectWithSpecialNullability() => Entity = TypeMap.Extend<FakeObjectWithSpecialNullability, FakeObjectWithSpecialNullabilityEntity>();
 
     /// <inheritdoc />
     public FakeObjectWithSpecialNullability(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<FakeObjectWithSpecialNullabilityEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<FakeObjectWithSpecialNullability, FakeObjectWithSpecialNullabilityEntity>(isExtending);
 
     /// <inheritdoc />
     public FakeObjectWithSpecialNullability(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -134,7 +134,7 @@ public FakeObjectWithSpecialNullability(ASType existingGraph) : this(existingGra
     /// <inheritdoc />
     [SetsRequiredMembers]
     public FakeObjectWithSpecialNullability(TypeMap typeMap, FakeObjectWithSpecialNullabilityEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<FakeObjectWithSpecialNullabilityEntity>();
+        => Entity = entity ?? typeMap.AsEntity<FakeObjectWithSpecialNullability, FakeObjectWithSpecialNullabilityEntity>();
 
     static FakeObjectWithSpecialNullability IASModel<FakeObjectWithSpecialNullability>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Test/ActivityPub.Types.Tests/Unit/AS/ASTypeTests.cs b/Test/ActivityPub.Types.Tests/Unit/AS/ASTypeTests.cs
index e0eae47..0f01654 100644
--- a/Test/ActivityPub.Types.Tests/Unit/AS/ASTypeTests.cs
+++ b/Test/ActivityPub.Types.Tests/Unit/AS/ASTypeTests.cs
@@ -74,11 +74,11 @@ private class StubASType : ASType, IASModel<StubASType, StubASTypeEntity, ASType
         static string IASModel<StubASType>.ASTypeName => StubType;
         
         /// <inheritdoc />
-        public StubASType() => Entity = TypeMap.Extend<StubASTypeEntity>();
+        public StubASType() => Entity = TypeMap.Extend<StubASType, StubASTypeEntity>();
 
         /// <inheritdoc />
         public StubASType(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-            => Entity = TypeMap.ProjectTo<StubASTypeEntity>(isExtending);
+            => Entity = TypeMap.ProjectTo<StubASType, StubASTypeEntity>(isExtending);
 
         /// <inheritdoc />
         public StubASType(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -86,7 +86,7 @@ public StubASType(ASType existingGraph) : this(existingGraph.TypeMap) {}
         /// <inheritdoc />
         [SetsRequiredMembers]
         public StubASType(TypeMap typeMap, StubASTypeEntity? entity) : base(typeMap, null)
-            => Entity = entity ?? typeMap.AsEntity<StubASTypeEntity>();
+            => Entity = entity ?? typeMap.AsEntity<StubASType, StubASTypeEntity>();
 
         static StubASType IASModel<StubASType>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Test/ActivityPub.Types.Tests/Unit/Internal/ASTypeInfoCacheTests.cs b/Test/ActivityPub.Types.Tests/Unit/Internal/ASTypeInfoCacheTests.cs
deleted file mode 100644
index 6f75f11..0000000
--- a/Test/ActivityPub.Types.Tests/Unit/Internal/ASTypeInfoCacheTests.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using System.Diagnostics.CodeAnalysis;
-using ActivityPub.Types.AS;
-using ActivityPub.Types.Conversion;
-using ActivityPub.Types.Conversion.Overrides;
-using ActivityPub.Types.Tests.Util.Fakes;
-using ActivityPub.Types.Util;
-
-namespace ActivityPub.Types.Tests.Unit.Internal;
-
-public abstract class ASTypeInfoCacheTests
-{
-    private ASTypeInfoCache CacheUnderTest { get; } = new();
-
-    public class RegisterAllAssembliesShould : ASTypeInfoCacheTests
-    {
-        public RegisterAllAssembliesShould() => CacheUnderTest.RegisterAllAssemblies();
-
-        [Fact]
-        public void IncludeTypesPackage()
-        {
-            CacheUnderTest.TryGetModelType(ASObject.ObjectType, out _).Should().BeTrue();
-        }
-
-        [Fact]
-        public void IncludeOtherPackages()
-        {
-            CacheUnderTest.TryGetModelType(FakeTypeForASTypeInfoCacheTests.FakeTypeForASTypeInfoCacheTestsType, out _).Should().BeTrue();
-        }
-    }
-
-    public class RegisterAssemblyShould : ASTypeInfoCacheTests
-    {
-        public RegisterAssemblyShould() => CacheUnderTest.RegisterAssembly(typeof(ASObjectEntity).Assembly);
-
-        [Fact]
-        public void IncludeThatAssembly()
-        {
-            CacheUnderTest.TryGetModelType(ASObject.ObjectType, out _).Should().BeTrue();
-        }
-
-        [Fact]
-        public void NotIncludeOtherAssemblies()
-        {
-            CacheUnderTest.TryGetModelType(FakeTypeForASTypeInfoCacheTests.FakeTypeForASTypeInfoCacheTestsType, out _).Should().BeFalse();
-        }
-    }
-
-    public class AnonymousEntityTypesShould : ASTypeInfoCacheTests
-    {
-        public AnonymousEntityTypesShould() => CacheUnderTest.RegisterAllAssemblies();
-
-        [Fact]
-        public void IncludeAllDetectedAnonymousTypes()
-        {
-            var expectedType = typeof(AnonymousExtensionFakeEntity);
-            CacheUnderTest.AnonymousEntityTypes.Should().Contain(expectedType);
-        }
-
-        [Fact]
-        public void ExcludeInvalidAnonymousTypes()
-        {
-            var unexpectedType = typeof(FakeTypeWithInvalidInterfaces);
-            CacheUnderTest.AnonymousEntityTypes.Should().NotContain(unexpectedType);
-        }
-    }
-
-    public class NamelessEntityTypesShould : ASTypeInfoCacheTests
-    {
-        public NamelessEntityTypesShould() => CacheUnderTest.RegisterAllAssemblies();
-
-        [Fact]
-        public void IncludeAllDetectedNamelessTypes()
-        {
-            var expectedType = typeof(NamelessExtensionFakeEntity);
-            CacheUnderTest.NamelessEntityTypes.Should().Contain(expectedType);
-        }
-
-        [Fact]
-        public void ExcludeInvalidNamelessTypes()
-        {
-            var unexpectedType = typeof(FakeTypeWithInvalidInterfaces);
-            CacheUnderTest.NamelessEntityTypes.Should().NotContain(unexpectedType);
-        }
-    }
-}
-
-public class FakeTypeWithInvalidInterfaces : ASType, IAnonymousEntity, INamelessEntity
-{
-    public static bool ShouldConvertFrom(JsonElement inputJson, DeserializationMetadata meta) => throw new NotSupportedException();
-    public static bool ShouldConvertFrom(IJsonLDContext jsonLDContext, DeserializationMetadata meta) => throw new NotSupportedException();
-}
-
-public class FakeTypeForASTypeInfoCacheTests : ASLink, IASModel<FakeTypeForASTypeInfoCacheTests, FakeTypeForASTypeInfoCacheTestsEntity, ASLink>
-{
-    /// <summary>
-    ///     ActivityStreams type name for "FakeTypeForASTypeInfoCacheTests" types.
-    /// </summary>
-    public const string FakeTypeForASTypeInfoCacheTestsType = "FakeTypeForASTypeInfoCacheTests";
-    static string IASModel<FakeTypeForASTypeInfoCacheTests>.ASTypeName => FakeTypeForASTypeInfoCacheTestsType;
-
-    /// <inheritdoc />
-    public FakeTypeForASTypeInfoCacheTests() => Entity = TypeMap.Extend<FakeTypeForASTypeInfoCacheTestsEntity>();
-
-    /// <inheritdoc />
-    public FakeTypeForASTypeInfoCacheTests(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<FakeTypeForASTypeInfoCacheTestsEntity>(isExtending);
-
-    /// <inheritdoc />
-    public FakeTypeForASTypeInfoCacheTests(ASType existingGraph) : this(existingGraph.TypeMap) {}
-
-    /// <inheritdoc />
-    [SetsRequiredMembers]
-    public FakeTypeForASTypeInfoCacheTests(TypeMap typeMap, FakeTypeForASTypeInfoCacheTestsEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<FakeTypeForASTypeInfoCacheTestsEntity>();
-
-    static FakeTypeForASTypeInfoCacheTests IASModel<FakeTypeForASTypeInfoCacheTests>.FromGraph(TypeMap typeMap) => new(typeMap, null);
-
-    private FakeTypeForASTypeInfoCacheTestsEntity Entity { get; }
-}
-
-public class FakeTypeForASTypeInfoCacheTestsEntity : ASEntity<FakeTypeForASTypeInfoCacheTests, FakeTypeForASTypeInfoCacheTestsEntity> {}
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Unit/Internal/AnonymousEntityPivotTests.cs b/Test/ActivityPub.Types.Tests/Unit/Internal/AnonymousEntityPivotTests.cs
deleted file mode 100644
index 09f7e13..0000000
--- a/Test/ActivityPub.Types.Tests/Unit/Internal/AnonymousEntityPivotTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using ActivityPub.Types.AS;
-using ActivityPub.Types.Conversion.Overrides;
-using ActivityPub.Types.Internal.Pivots;
-using ActivityPub.Types.Tests.Util.Fakes;
-using ActivityPub.Types.Util;
-
-namespace ActivityPub.Types.Tests.Unit.Internal;
-
-public abstract class AnonymousEntityPivotTests
-{
-    private AnonymousEntityPivot PivotUnderTest { get; } = new();
-
-    private DeserializationMetadata StubDeserializationMetadata { get; } = new()
-    {
-        TypeMap = new TypeMap(),
-        JsonSerializerOptions = JsonSerializerOptions.Default,
-        LDContext = new JsonLDContext()
-    };
-    
-    public class ShouldConvertShould : AnonymousEntityPivotTests
-    {
-        [Fact]
-        public void Throw_WhenTypeDoesNotImplementInterface()
-        {
-            Assert.ThrowsAny<Exception>(() =>
-            {
-                PivotUnderTest.ShouldConvert(typeof(ASType), new JsonElement(), StubDeserializationMetadata);
-            });
-        }
-        
-        [Fact]
-        public void ReturnFalse_WhenMethodReturnsFalse()
-        {
-            var result = PivotUnderTest.ShouldConvert(typeof(AnonymousExtensionFakeEntity), new JsonElement(), StubDeserializationMetadata);
-            result.Should().BeFalse();
-        }
-        
-        [Fact]
-        public void ReturnTrue_WhenMethodReturnsTrue()
-        {
-            const string Json = """{"ExtendedString":"value"}""";
-            var jsonElement = JsonSerializer.Deserialize<JsonElement>(Json);
-            var result = PivotUnderTest.ShouldConvert(typeof(AnonymousExtensionFakeEntity), jsonElement, StubDeserializationMetadata);
-            result.Should().BeTrue();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Unit/Internal/CompositeASTypeTests.cs b/Test/ActivityPub.Types.Tests/Unit/Internal/CompositeASTypeTests.cs
deleted file mode 100644
index 597d19a..0000000
--- a/Test/ActivityPub.Types.Tests/Unit/Internal/CompositeASTypeTests.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using ActivityPub.Types.Internal;
-
-namespace ActivityPub.Types.Tests.Unit.Internal;
-
-public abstract class CompositeASTypeTests
-{
-    /// <summary>
-    ///     Contents:<br/>
-    ///     <ul>
-    ///         <li>Top-level types: 1.1, 1.2.1, 1.2.2, 1.3.1.1</li>
-    ///         <li>Shadowed types: 1, 1.2, 1.3, 1.3.1</li>
-    ///     </ul>
-    /// </summary>
-    private CompositeASType TypeUnderTest { get; } = new();
-
-    protected CompositeASTypeTests()
-    {
-        TypeUnderTest.Add("1");
-        TypeUnderTest.Add("1.1", "1");
-        TypeUnderTest.Add("1.2", "1");
-        TypeUnderTest.Add("1.2.1", "1.2");
-        TypeUnderTest.Add("1.2.2", "1.2");
-        TypeUnderTest.Add("1.3", "1");
-        TypeUnderTest.Add("1.3.1", "1.3");
-        TypeUnderTest.Add("1.3.1.1", "1.3.1");
-    }
-
-    public class TypesShould : CompositeASTypeTests
-    {
-        [Fact]
-        public void ContainOnlyTopLevelTypes()
-        {
-            TypeUnderTest.Types.Should()
-                .HaveCount(4)
-                .And.Contain("1.1")
-                .And.Contain("1.2.1")
-                .And.Contain("1.2.2")
-                .And.Contain("1.3.1.1");
-        }
-    }
-
-    public class AllTypesShould : CompositeASTypeTests
-    {
-        [Fact]
-        public void ContainAllTypes()
-        {
-            TypeUnderTest.AllTypes.Should()
-                .HaveCount(8)
-                .And.Contain("1")
-                .And.Contain("1.1")
-                .And.Contain("1.2")
-                .And.Contain("1.2.1")
-                .And.Contain("1.2.2")
-                .And.Contain("1.3")
-                .And.Contain("1.3.1")
-                .And.Contain("1.3.1.1");
-        }
-    }
-
-    public class AddShould : CompositeASTypeTests
-    {
-        [Fact]
-        public void DoNothing_IfTypeIsDuplicate()
-        {
-            TypeUnderTest.Add("1");
-            TypeUnderTest.Add("1.1", "1");
-
-            TypeUnderTest.AllTypes.Should().HaveCount(8);
-        }
-        
-        [Fact]
-        public void UpdateAllTypes_IfNotDuplicate()
-        {
-            TypeUnderTest.Add("1.4", "1");
-
-            TypeUnderTest.AllTypes.Should().Contain("1.4");
-        }
-
-        [Fact]
-        public void UpdateTypes_IfNotShadowed()
-        {
-            TypeUnderTest.Add("1.4", "1");
-
-            TypeUnderTest.Types.Should().Contain("1.4");
-        }
-
-        [Fact]
-        public void NotUpdateTypes_IfShadowed()
-        {
-            TypeUnderTest.Add("1.4.1", "1.4");
-            TypeUnderTest.Add("1.4", "1");
-
-            TypeUnderTest.Types.Should().NotContain("1.4");
-        }
-
-        [Fact]
-        public void RemoveShadowedTypes()
-        {
-            TypeUnderTest.Add("1.1.1", "1.1");
-            
-            TypeUnderTest.Types.Should().NotContain("1.1");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousEntitySelectorFake.cs b/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousEntitySelectorFake.cs
deleted file mode 100644
index 74e5560..0000000
--- a/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousEntitySelectorFake.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-// If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using ActivityPub.Types.Conversion.Overrides;
-using ActivityPub.Types.Internal;
-
-namespace ActivityPub.Types.Tests.Util.Fakes;
-
-public class AnonymousEntitySelectorFake : IAnonymousEntitySelector
-{
-    public Dictionary<string, Type> PropertyNameMapping { get; set; } = new();
-
-    public IEnumerable<Type> SelectAnonymousEntities(JsonElement inputJson, DeserializationMetadata meta)
-    {
-        if (inputJson.ValueKind != JsonValueKind.Object)
-            yield break;
-        
-        foreach (var (propName, entityType) in PropertyNameMapping)
-            if (inputJson.HasProperty(propName))
-                yield return entityType;
-    }
-}
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousExtensionFake.cs b/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousExtensionFake.cs
index 2b5b3ef..fe44bf2 100644
--- a/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousExtensionFake.cs
+++ b/Test/ActivityPub.Types.Tests/Util/Fakes/AnonymousExtensionFake.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using ActivityPub.Types.AS;
-using ActivityPub.Types.Conversion.Overrides;
 using ActivityPub.Types.Internal;
 
 namespace ActivityPub.Types.Tests.Util.Fakes;
@@ -12,7 +11,7 @@ public class AnonymousExtensionFake : ASObject, IASModel<AnonymousExtensionFake,
 {
     /// <inheritdoc />
     public AnonymousExtensionFake(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<AnonymousExtensionFakeEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<AnonymousExtensionFake, AnonymousExtensionFakeEntity>(isExtending);
 
     /// <inheritdoc />
     public AnonymousExtensionFake(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -20,7 +19,7 @@ public AnonymousExtensionFake(ASType existingGraph) : this(existingGraph.TypeMap
     /// <inheritdoc />
     [SetsRequiredMembers]
     public AnonymousExtensionFake(TypeMap typeMap, AnonymousExtensionFakeEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<AnonymousExtensionFakeEntity>();
+        => Entity = entity ?? typeMap.AsEntity<AnonymousExtensionFake, AnonymousExtensionFakeEntity>();
 
     static AnonymousExtensionFake IASModel<AnonymousExtensionFake>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
@@ -37,20 +36,14 @@ public int ExtendedInt
         get => Entity.ExtendedInt;
         set => Entity.ExtendedInt = value;
     }
+
+    public static bool? ShouldConvertFrom(JsonElement inputJson, TypeMap typeMap) =>
+        inputJson.HasProperty(nameof(ExtendedString)) 
+        || inputJson.HasProperty(nameof(ExtendedInt));
 }
 
-public sealed class AnonymousExtensionFakeEntity : ASEntity<AnonymousExtensionFake, AnonymousExtensionFakeEntity>, IAnonymousEntity
+public sealed class AnonymousExtensionFakeEntity : ASEntity<AnonymousExtensionFake, AnonymousExtensionFakeEntity>
 {
     public string ExtendedString { get; set; } = "";
     public int ExtendedInt { get; set; }
-
-    public static bool ShouldConvertFrom(JsonElement inputJson, DeserializationMetadata meta)
-    {
-        if (inputJson.ValueKind != JsonValueKind.Object)
-            return false;
-
-        return
-            inputJson.HasProperty(nameof(ExtendedString)) ||
-            inputJson.HasProperty(nameof(ExtendedInt));
-    }
 }
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Util/Fakes/EmptyExtendedTypeFake.cs b/Test/ActivityPub.Types.Tests/Util/Fakes/EmptyExtendedTypeFake.cs
index edabce0..8eea5ca 100644
--- a/Test/ActivityPub.Types.Tests/Util/Fakes/EmptyExtendedTypeFake.cs
+++ b/Test/ActivityPub.Types.Tests/Util/Fakes/EmptyExtendedTypeFake.cs
@@ -17,11 +17,11 @@ public class EmptyExtendedTypeFake : ASType, IASModel<EmptyExtendedTypeFake, Emp
     };
 
     /// <inheritdoc />
-    public EmptyExtendedTypeFake() => Entity = TypeMap.Extend<EmptyExtendedTypeFakeEntity>();
+    public EmptyExtendedTypeFake() => Entity = TypeMap.Extend<EmptyExtendedTypeFake, EmptyExtendedTypeFakeEntity>();
 
     /// <inheritdoc />
     public EmptyExtendedTypeFake(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<EmptyExtendedTypeFakeEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<EmptyExtendedTypeFake, EmptyExtendedTypeFakeEntity>(isExtending);
 
     /// <inheritdoc />
     public EmptyExtendedTypeFake(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -29,7 +29,7 @@ public EmptyExtendedTypeFake(ASType existingGraph) : this(existingGraph.TypeMap)
     /// <inheritdoc />
     [SetsRequiredMembers]
     public EmptyExtendedTypeFake(TypeMap typeMap, EmptyExtendedTypeFakeEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<EmptyExtendedTypeFakeEntity>();
+        => Entity = entity ?? typeMap.AsEntity<EmptyExtendedTypeFake, EmptyExtendedTypeFakeEntity>();
 
     static EmptyExtendedTypeFake IASModel<EmptyExtendedTypeFake>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
diff --git a/Test/ActivityPub.Types.Tests/Util/Fakes/NamessExtensionFake.cs b/Test/ActivityPub.Types.Tests/Util/Fakes/NamessExtensionFake.cs
index 77f1bf2..c0940c3 100644
--- a/Test/ActivityPub.Types.Tests/Util/Fakes/NamessExtensionFake.cs
+++ b/Test/ActivityPub.Types.Tests/Util/Fakes/NamessExtensionFake.cs
@@ -3,26 +3,24 @@
 
 using System.Diagnostics.CodeAnalysis;
 using ActivityPub.Types.AS;
-using ActivityPub.Types.Conversion.Overrides;
 using ActivityPub.Types.Util;
 
 namespace ActivityPub.Types.Tests.Util.Fakes;
 
 public class NamelessExtensionFake : ASObject, IASModel<NamelessExtensionFake, NamelessExtensionFakeEntity, ASObject>
 {
-    public static JsonLDContextObject NamelessExtensionContext { get;  }= "https://example.com/nameless";
     static IJsonLDContext IASModel<NamelessExtensionFake>.DefiningContext { get; } = new JsonLDContext
     {
         JsonLDContextObject.ActivityStreams,
-        NamelessExtensionContext
+        "https://example.com/nameless"
     };
 
     /// <inheritdoc />
-    public NamelessExtensionFake() => Entity = TypeMap.Extend<NamelessExtensionFakeEntity>();
+    public NamelessExtensionFake() => Entity = TypeMap.Extend<NamelessExtensionFake, NamelessExtensionFakeEntity>();
 
     /// <inheritdoc />
     public NamelessExtensionFake(TypeMap typeMap, bool isExtending = true) : base(typeMap, false)
-        => Entity = TypeMap.ProjectTo<NamelessExtensionFakeEntity>(isExtending);
+        => Entity = TypeMap.ProjectTo<NamelessExtensionFake, NamelessExtensionFakeEntity>(isExtending);
 
     /// <inheritdoc />
     public NamelessExtensionFake(ASType existingGraph) : this(existingGraph.TypeMap) {}
@@ -30,7 +28,7 @@ public NamelessExtensionFake(ASType existingGraph) : this(existingGraph.TypeMap)
     /// <inheritdoc />
     [SetsRequiredMembers]
     public NamelessExtensionFake(TypeMap typeMap, NamelessExtensionFakeEntity? entity) : base(typeMap, null)
-        => Entity = entity ?? typeMap.AsEntity<NamelessExtensionFakeEntity>();
+        => Entity = entity ?? typeMap.AsEntity<NamelessExtensionFake, NamelessExtensionFakeEntity>();
 
     static NamelessExtensionFake IASModel<NamelessExtensionFake>.FromGraph(TypeMap typeMap) => new(typeMap, null);
 
@@ -49,11 +47,8 @@ public int ExtendedInt
     }
 }
 
-public sealed class NamelessExtensionFakeEntity : ASEntity<NamelessExtensionFake, NamelessExtensionFakeEntity>, INamelessEntity
+public sealed class NamelessExtensionFakeEntity : ASEntity<NamelessExtensionFake, NamelessExtensionFakeEntity>
 {
     public string ExtendedString { get; set; } = "";
     public int ExtendedInt { get; set; }
-
-    public static bool ShouldConvertFrom(IJsonLDContext jsonLDContext, DeserializationMetadata meta)
-        => jsonLDContext.Contains(NamelessExtensionFake.NamelessExtensionContext);
 }
\ No newline at end of file
diff --git a/Test/ActivityPub.Types.Tests/Util/Fixtures/JsonLdSerializerFixture.cs b/Test/ActivityPub.Types.Tests/Util/Fixtures/JsonLdSerializerFixture.cs
index 863d350..7708103 100644
--- a/Test/ActivityPub.Types.Tests/Util/Fixtures/JsonLdSerializerFixture.cs
+++ b/Test/ActivityPub.Types.Tests/Util/Fixtures/JsonLdSerializerFixture.cs
@@ -3,8 +3,6 @@
 
 using ActivityPub.Types.Conversion;
 using ActivityPub.Types.Conversion.Converters;
-using ActivityPub.Types.Conversion.Overrides;
-using ActivityPub.Types.Internal;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Options;
 
@@ -21,25 +19,18 @@ public sealed class JsonLdSerializerFixture
 {
     public JsonLdSerializerFixture()
     {
-        ASTypeInfoCache = new ASTypeInfoCache();
-        ASTypeInfoCache.RegisterAllAssemblies();
-
         JsonLdSerializerOptions = new JsonLdSerializerOptions();
         var serializerOptions = Options.Create(JsonLdSerializerOptions);
 
-        ConversionOptions = new ConversionOptions();
-        var conversionOptions = Options.Create(ConversionOptions);
-        var typeMapConverter = new TypeMapConverter(ASTypeInfoCache, conversionOptions);
+        var typeMapConverter = new TypeMapConverter();
 
         var asTypeConverter = new ASTypeConverter();
-        var linkableConverter = new LinkableConverter(ASTypeInfoCache);
+        var linkableConverter = new LinkableConverter();
         var listableConverter = new ListableConverter();
         var listableReadOnlyConverter = new ListableReadOnlyConverter();
         JsonLdSerializer = new JsonLdSerializer(serializerOptions, typeMapConverter, asTypeConverter, linkableConverter, listableConverter, listableReadOnlyConverter);
     }
 
-    internal IASTypeInfoCache ASTypeInfoCache { get; }
     internal IJsonLdSerializer JsonLdSerializer { get; }
     internal JsonLdSerializerOptions JsonLdSerializerOptions { get; }
-    internal ConversionOptions ConversionOptions { get; }
 }
\ No newline at end of file