diff --git a/streams/streams_manual_data_test.go b/streams/streams_manual_data_test.go
index 86e375a..a4200f1 100644
--- a/streams/streams_manual_data_test.go
+++ b/streams/streams_manual_data_test.go
@@ -5831,3 +5831,140 @@ func example159Type() vocab.ActivityStreamsMove {
 	example159Type.SetActivityStreamsTarget(tobj)
 	return example159Type
 }
+
+const personExampleWithPublicKey = `{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://w3id.org/security/v1"
+  ],
+  "id":"https://mastodon.technology/users/cj",
+  "type":"Person",
+  "following":"https://mastodon.technology/users/cj/following",
+  "followers":"https://mastodon.technology/users/cj/followers",
+  "inbox":"https://mastodon.technology/users/cj/inbox",
+  "outbox":"https://mastodon.technology/users/cj/outbox",
+  "preferredUsername":"cj",
+  "name":"cj",
+  "url":"https://mastodon.technology/@cj",
+  "publicKey": {
+    "id":"https://mastodon.technology/users/cj#main-key",
+    "owner":"https://mastodon.technology/users/cj",
+    "publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArYzMmldblHfnAPbwfVIo\nFpV6ej3JUS9boZHJbYh9c3IpumDoDXJyThTx19wM8M04fJljJ74aTp+fZdIng6l3\nswT24dvgahMUoD4/NLrPOjulhIOGfYzGYfTduh6wT+aaxV5w+OPO5plOVgrgS+RK\n9mv5SOQIaSLQGNCc5RSKuea8H4fG/bUiPpCXlqq2iVp0hoc3rI3K2NOErxOeex1B\nzcBLupBiXBB5a4hxwTVMfjmxqEZSuC1xnx2c8R9FpZPmhGovqlVzK/JlTPBU53f/\nDT773fOqr2jLTLfS0VNrI0jYpz0GG687O/FDRi2YR91D9NSs9WFHeuVC/A5mhuMH\npQIDAQAB\n-----END PUBLIC KEY-----\n"
+  }
+}`
+
+func personExampleWithPublicKeyType() vocab.ActivityStreamsPerson {
+	personExampleType := NewActivityStreamsPerson()
+	idIRI := MustParseURL("https://mastodon.technology/users/cj")
+	idProp := NewActivityStreamsIdProperty()
+	idProp.Set(idIRI)
+	personExampleType.SetActivityStreamsId(idProp)
+	followingIRI := MustParseURL("https://mastodon.technology/users/cj/following")
+	followingProp := NewActivityStreamsFollowingProperty()
+	followingProp.SetIRI(followingIRI)
+	personExampleType.SetActivityStreamsFollowing(followingProp)
+	followersIRI := MustParseURL("https://mastodon.technology/users/cj/followers")
+	followersProp := NewActivityStreamsFollowersProperty()
+	followersProp.SetIRI(followersIRI)
+	personExampleType.SetActivityStreamsFollowers(followersProp)
+	inboxIRI := MustParseURL("https://mastodon.technology/users/cj/inbox")
+	inboxProp := NewActivityStreamsInboxProperty()
+	inboxProp.SetIRI(inboxIRI)
+	personExampleType.SetActivityStreamsInbox(inboxProp)
+	outboxIRI := MustParseURL("https://mastodon.technology/users/cj/outbox")
+	outboxProp := NewActivityStreamsOutboxProperty()
+	outboxProp.SetIRI(outboxIRI)
+	personExampleType.SetActivityStreamsOutbox(outboxProp)
+	preferredUsernameProp := NewActivityStreamsPreferredUsernameProperty()
+	preferredUsernameProp.SetXMLSchemaString("cj")
+	personExampleType.SetActivityStreamsPreferredUsername(preferredUsernameProp)
+	nameProp := NewActivityStreamsNameProperty()
+	nameProp.AppendXMLSchemaString("cj")
+	personExampleType.SetActivityStreamsName(nameProp)
+	urlIRI := MustParseURL("https://mastodon.technology/@cj")
+	urlProp := NewActivityStreamsUrlProperty()
+	urlProp.AppendIRI(urlIRI)
+	personExampleType.SetActivityStreamsUrl(urlProp)
+	publicKeyProp := NewW3IDSecurityV1PublicKeyProperty()
+	publicKeyType := NewW3IDSecurityV1PublicKey()
+	pubKeyIdIRI := MustParseURL("https://mastodon.technology/users/cj#main-key")
+	pubKeyIdProp := NewActivityStreamsIdProperty()
+	pubKeyIdProp.Set(pubKeyIdIRI)
+	publicKeyType.SetActivityStreamsId(pubKeyIdProp)
+	ownerIRI := MustParseURL("https://mastodon.technology/users/cj")
+	ownerProp := NewW3IDSecurityV1OwnerProperty()
+	ownerProp.SetIRI(ownerIRI)
+	publicKeyType.SetW3IDSecurityV1Owner(ownerProp)
+	publicKeyPemProp := NewW3IDSecurityV1PublicKeyPemProperty()
+	publicKeyPemProp.Set("-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArYzMmldblHfnAPbwfVIo\nFpV6ej3JUS9boZHJbYh9c3IpumDoDXJyThTx19wM8M04fJljJ74aTp+fZdIng6l3\nswT24dvgahMUoD4/NLrPOjulhIOGfYzGYfTduh6wT+aaxV5w+OPO5plOVgrgS+RK\n9mv5SOQIaSLQGNCc5RSKuea8H4fG/bUiPpCXlqq2iVp0hoc3rI3K2NOErxOeex1B\nzcBLupBiXBB5a4hxwTVMfjmxqEZSuC1xnx2c8R9FpZPmhGovqlVzK/JlTPBU53f/\nDT773fOqr2jLTLfS0VNrI0jYpz0GG687O/FDRi2YR91D9NSs9WFHeuVC/A5mhuMH\npQIDAQAB\n-----END PUBLIC KEY-----\n")
+	publicKeyType.SetW3IDSecurityV1PublicKeyPem(publicKeyPemProp)
+	publicKeyProp.AppendW3IDSecurityV1PublicKey(publicKeyType)
+	personExampleType.SetW3IDSecurityV1PublicKey(publicKeyProp)
+	return personExampleType
+}
+
+type testContextWrapper struct {
+	vocab.Type
+}
+
+func (a *testContextWrapper) JSONLDContext() map[string]string {
+	m := a.Type.JSONLDContext()
+	m["https://schema.org#"] = "schema"
+	m["schema:PropertyValue"] = "PropertyValue"
+	m["schema:value"] = "value"
+	return m
+}
+
+const serviceHasAttachmentWithUnknown = `{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      "schema": "https://schema.org#",
+      "PropertyValue": "schema:PropertyValue",
+      "value": "schema:value"
+    }
+  ],
+  "id": "https://example.com/service",
+  "type": "Service",
+  "attachment": [
+    {
+      "type": "PropertyValue",
+      "name": "First Object",
+      "value": "test value on first object"
+    },
+    {
+      "type": "PropertyValue",
+      "name": "Second Object",
+      "value": "test value on second object"
+    }
+  ]
+}`
+
+func serviceHasAttachmentWithUnknownType() vocab.ActivityStreamsService {
+	serviceType := NewActivityStreamsService()
+	idProp := NewActivityStreamsIdProperty()
+	idIRI := MustParseURL("https://example.com/service")
+	idProp.Set(idIRI)
+	serviceType.SetActivityStreamsId(idProp)
+	attachmentProp := NewActivityStreamsAttachmentProperty()
+	firstObject := NewActivityStreamsObject()
+	firstObjectTypeProp := NewActivityStreamsTypeProperty()
+	firstObjectTypeProp.AppendXMLSchemaString("PropertyValue")
+	firstObject.SetActivityStreamsType(firstObjectTypeProp)
+	firstObjectNameProp := NewActivityStreamsNameProperty()
+	firstObjectNameProp.AppendXMLSchemaString("First Object")
+	firstObject.SetActivityStreamsName(firstObjectNameProp)
+	firstObject.GetUnknownProperties()["value"] = "test value on first object"
+	attachmentProp.AppendType(&testContextWrapper{firstObject})
+	secondObject := NewActivityStreamsObject()
+	secondObjectTypeProp := NewActivityStreamsTypeProperty()
+	secondObjectTypeProp.AppendXMLSchemaString("PropertyValue")
+	secondObject.SetActivityStreamsType(secondObjectTypeProp)
+	secondObjectNameProp := NewActivityStreamsNameProperty()
+	secondObjectNameProp.AppendXMLSchemaString("Second Object")
+	secondObject.SetActivityStreamsName(secondObjectNameProp)
+	secondObject.GetUnknownProperties()["value"] = "test value on second object"
+	attachmentProp.AppendType(secondObject)
+	serviceType.SetActivityStreamsAttachment(attachmentProp)
+	return serviceType
+}
diff --git a/streams/streams_test.go b/streams/streams_test.go
index c3ca293..c5d26dc 100644
--- a/streams/streams_test.go
+++ b/streams/streams_test.go
@@ -9,10 +9,6 @@ import (
 	"testing"
 )
 
-type serializer interface {
-	Serialize() (map[string]interface{}, error)
-}
-
 // IsKnownResolverError returns true if it is known that an example from
 // GetTestTable will trigger a JSONResolver error.
 func IsKnownResolverError(t TestTable) (b bool, reason string) {
@@ -38,12 +34,11 @@ func TestJSONResolver(t *testing.T) {
 		name := example.name
 		t.Logf("Testing table test case %q", name)
 		ex := example.expectedJSON
-		resFn := func(s serializer) error {
-			m, err := s.Serialize()
+		resFn := func(s vocab.Type) error {
+			m, err := Serialize(s)
 			if err != nil {
 				return err
 			}
-			m["@context"] = "https://www.w3.org/ns/activitystreams"
 			actual, err := json.Marshal(m)
 			if diff, err := GetJSONDiff(actual, []byte(ex)); err == nil && diff != nil {
 				t.Errorf("%s: Serialize JSON equality is false:\n%s", name, diff)
@@ -243,7 +238,7 @@ func TestJSONResolverErrors(t *testing.T) {
 		name := example.name
 		t.Logf("Testing table test case %q", name)
 		ex := example.expectedJSON
-		resFn := func(s serializer) error { return nil }
+		resFn := func(s vocab.Type) error { return nil }
 		r, err := NewJSONResolver(
 			func(c context.Context, x vocab.ActivityStreamsAccept) error {
 				return resFn(x)
@@ -492,10 +487,10 @@ func TestNulls(t *testing.T) {
 	expectedUpdate.SetActivityStreamsObject(objectNote)
 
 	// Variable to aid in deserialization in tests
-	var actual serializer
+	var actual vocab.Type
 	tables := []struct {
 		name              string
-		expected          serializer
+		expected          vocab.Type
 		callback          interface{}
 		input             string
 		inputWithoutNulls string
diff --git a/streams/util.go b/streams/util.go
index d58a133..ea27f2f 100644
--- a/streams/util.go
+++ b/streams/util.go
@@ -50,6 +50,7 @@ func Serialize(a vocab.Type) (m map[string]interface{}, e error) {
 	}
 	// TODO: Update the context instead if it already exists
 	m[jsonLDContext] = contextValue
+	// TODO: Sort the context based on arbitrary order.
 	// Delete any existing `@context` in child maps.
 	var cleanFnRecur func(map[string]interface{})
 	cleanFnRecur = func(r map[string]interface{}) {
diff --git a/streams/vocab_test.go b/streams/vocab_test.go
index cf7cc2a..1993102 100644
--- a/streams/vocab_test.go
+++ b/streams/vocab_test.go
@@ -2,6 +2,7 @@ package streams
 
 import (
 	"encoding/json"
+	"github.com/go-fed/activity/streams/vocab"
 	"github.com/go-test/deep"
 	"reflect"
 	"testing"
@@ -14,8 +15,8 @@ type TestTable struct {
 	name         string
 	expectedJSON string
 	// The following may be nil
-	expectedStruct serializer
-	deserializer   func(map[string]interface{}) (serializer, error)
+	expectedStruct vocab.Type
+	deserializer   func(map[string]interface{}) (vocab.Type, error)
 	unknown        func(map[string]interface{}) map[string]interface{}
 }
 
@@ -26,7 +27,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 1",
 			expectedJSON:   example1,
 			expectedStruct: example1Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeObjectActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -34,7 +35,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 2",
 			expectedJSON:   example2,
 			expectedStruct: example2Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -42,7 +43,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 3",
 			expectedJSON:   example3,
 			expectedStruct: example3Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeActivityActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -50,7 +51,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 4",
 			expectedJSON:   example4,
 			expectedStruct: example4Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTravelActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -58,7 +59,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 5",
 			expectedJSON:   example5,
 			expectedStruct: example5Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -66,7 +67,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 6",
 			expectedJSON:   example6,
 			expectedStruct: example6Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrderedCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -74,7 +75,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 7",
 			expectedJSON:   example7,
 			expectedStruct: example7Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -82,7 +83,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 8",
 			expectedJSON:   example8,
 			expectedStruct: example8Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrderedCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -90,7 +91,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 9",
 			expectedJSON:   example9,
 			expectedStruct: example9Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAcceptActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -98,7 +99,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 10",
 			expectedJSON:   example10,
 			expectedStruct: example10Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAcceptActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -106,7 +107,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 11",
 			expectedJSON:   example11,
 			expectedStruct: example11Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTentativeAcceptActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -114,7 +115,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 12",
 			expectedJSON:   example12,
 			expectedStruct: example12Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAddActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -122,7 +123,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 13",
 			expectedJSON:   example13,
 			expectedStruct: example13Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAddActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -130,7 +131,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 14",
 			expectedJSON:   example14,
 			expectedStruct: example14Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeArriveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -138,7 +139,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 15",
 			expectedJSON:   example15,
 			expectedStruct: example15Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCreateActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -146,7 +147,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 16",
 			expectedJSON:   example16,
 			expectedStruct: example16Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDeleteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -154,7 +155,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 17",
 			expectedJSON:   example17,
 			expectedStruct: example17Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeFollowActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -162,7 +163,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 18",
 			expectedJSON:   example18,
 			expectedStruct: example18Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeIgnoreActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -170,7 +171,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 19",
 			expectedJSON:   example19,
 			expectedStruct: example19Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeJoinActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -178,7 +179,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 20",
 			expectedJSON:   example20,
 			expectedStruct: example20Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLeaveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -186,7 +187,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 21",
 			expectedJSON:   example21,
 			expectedStruct: example21Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLeaveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -194,7 +195,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 22",
 			expectedJSON:   example22,
 			expectedStruct: example22Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLikeActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -202,7 +203,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 23",
 			expectedJSON:   example23,
 			expectedStruct: example23Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 			unknown: example23Unknown,
@@ -211,7 +212,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 24",
 			expectedJSON:   example24,
 			expectedStruct: example24Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeInviteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -219,7 +220,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 25",
 			expectedJSON:   example25,
 			expectedStruct: example25Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRejectActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -227,7 +228,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 26",
 			expectedJSON:   example26,
 			expectedStruct: example26Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTentativeRejectActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -235,7 +236,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 27",
 			expectedJSON:   example27,
 			expectedStruct: example27Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRemoveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -243,7 +244,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 28",
 			expectedJSON:   example28,
 			expectedStruct: example28Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRemoveActivityStreams()(m, map[string]string{})
 			},
 			unknown: example28Unknown,
@@ -252,7 +253,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 29",
 			expectedJSON:   example29,
 			expectedStruct: example29Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeUndoActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -260,7 +261,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 30",
 			expectedJSON:   example30,
 			expectedStruct: example30Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeUpdateActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -268,7 +269,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 31",
 			expectedJSON:   example31,
 			expectedStruct: example31Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeViewActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -276,7 +277,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 32",
 			expectedJSON:   example32,
 			expectedStruct: example32Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeListenActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -284,7 +285,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 33",
 			expectedJSON:   example33,
 			expectedStruct: example33Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeReadActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -292,7 +293,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 34",
 			expectedJSON:   example34,
 			expectedStruct: example34Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeMoveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -300,7 +301,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 35",
 			expectedJSON:   example35,
 			expectedStruct: example35Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTravelActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -308,7 +309,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 36",
 			expectedJSON:   example36,
 			expectedStruct: example36Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAnnounceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -316,7 +317,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 37",
 			expectedJSON:   example37,
 			expectedStruct: example37Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeBlockActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -324,7 +325,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 38",
 			expectedJSON:   example38,
 			expectedStruct: example38Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeFlagActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -332,7 +333,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 39",
 			expectedJSON:   example39,
 			expectedStruct: example39Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDislikeActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -340,7 +341,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 40",
 			expectedJSON:   example40,
 			expectedStruct: example40Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -348,7 +349,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 41",
 			expectedJSON:   example41,
 			expectedStruct: example41Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -356,7 +357,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 42",
 			expectedJSON:   example42,
 			expectedStruct: example42Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeApplicationActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -364,7 +365,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 43",
 			expectedJSON:   example43,
 			expectedStruct: example43Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeGroupActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -372,7 +373,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 44",
 			expectedJSON:   example44,
 			expectedStruct: example44Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrganizationActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -380,7 +381,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 45",
 			expectedJSON:   example45,
 			expectedStruct: example45Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePersonActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -388,7 +389,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 46",
 			expectedJSON:   example46,
 			expectedStruct: example46Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeServiceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -396,7 +397,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 47",
 			expectedJSON:   example47,
 			expectedStruct: example47Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRelationshipActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -404,7 +405,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 48",
 			expectedJSON:   example48,
 			expectedStruct: example48Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeArticleActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -412,7 +413,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 49",
 			expectedJSON:   example49,
 			expectedStruct: example49Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDocumentActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -420,7 +421,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 50",
 			expectedJSON:   example50,
 			expectedStruct: example50Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeAudioActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -428,7 +429,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 51",
 			expectedJSON:   example51,
 			expectedStruct: example51Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeImageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -436,7 +437,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 52",
 			expectedJSON:   example52,
 			expectedStruct: example52Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeVideoActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -444,7 +445,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 53",
 			expectedJSON:   example53,
 			expectedStruct: example53Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -452,7 +453,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 54",
 			expectedJSON:   example54,
 			expectedStruct: example54Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -460,7 +461,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 55",
 			expectedJSON:   example55,
 			expectedStruct: example55Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeEventActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -468,7 +469,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 56",
 			expectedJSON:   example56,
 			expectedStruct: example56Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -476,7 +477,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 57",
 			expectedJSON:   example57,
 			expectedStruct: example57Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -484,7 +485,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 58",
 			expectedJSON:   example58,
 			expectedStruct: example58Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeMentionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -492,7 +493,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 59",
 			expectedJSON:   example59,
 			expectedStruct: example59Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeProfileActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -500,7 +501,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 60",
 			expectedJSON:   example60,
 			expectedStruct: example60Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrderedCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -518,7 +519,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 63",
 			expectedJSON:   example63,
 			expectedStruct: example63Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -526,7 +527,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 64",
 			expectedJSON:   example64,
 			expectedStruct: example64Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -534,7 +535,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 65",
 			expectedJSON:   example65,
 			expectedStruct: example65Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -542,7 +543,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 66",
 			expectedJSON:   example66,
 			expectedStruct: example66Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -550,7 +551,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 67",
 			expectedJSON:   example67,
 			expectedStruct: example67Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeImageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -558,7 +559,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 68",
 			expectedJSON:   example68,
 			expectedStruct: example68Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeImageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -566,7 +567,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 69",
 			expectedJSON:   example69,
 			expectedStruct: example69Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 			unknown: example69Unknown,
@@ -575,7 +576,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 70",
 			expectedJSON:   example70,
 			expectedStruct: example70Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -583,7 +584,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 71",
 			expectedJSON:   example71,
 			expectedStruct: example71Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -591,7 +592,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 72",
 			expectedJSON:   example72,
 			expectedStruct: example72Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -599,7 +600,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 73",
 			expectedJSON:   example73,
 			expectedStruct: example73Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -607,7 +608,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 74",
 			expectedJSON:   example74,
 			expectedStruct: example74Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -615,7 +616,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 75",
 			expectedJSON:   example75,
 			expectedStruct: example75Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -623,7 +624,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 76",
 			expectedJSON:   example76,
 			expectedStruct: example76Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -631,7 +632,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 77",
 			expectedJSON:   example77,
 			expectedStruct: example77Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -639,7 +640,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 78",
 			expectedJSON:   example78,
 			expectedStruct: example78Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -647,7 +648,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 79",
 			expectedJSON:   example79,
 			expectedStruct: example79Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -655,7 +656,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 80",
 			expectedJSON:   example80,
 			expectedStruct: example80Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -663,7 +664,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 81",
 			expectedJSON:   example81,
 			expectedStruct: example81Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -671,7 +672,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 82",
 			expectedJSON:   example82,
 			expectedStruct: example82Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -679,7 +680,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 83",
 			expectedJSON:   example83,
 			expectedStruct: example83Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -687,7 +688,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 84",
 			expectedJSON:   example84,
 			expectedStruct: example84Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -695,7 +696,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 85",
 			expectedJSON:   example85,
 			expectedStruct: example85Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeListenActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -703,7 +704,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 86",
 			expectedJSON:   example86,
 			expectedStruct: example86Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -711,7 +712,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 87",
 			expectedJSON:   example87,
 			expectedStruct: example87Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -719,7 +720,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 88",
 			expectedJSON:   example88,
 			expectedStruct: example88Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePersonActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -727,7 +728,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 89",
 			expectedJSON:   example89,
 			expectedStruct: example89Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -735,7 +736,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 90",
 			expectedJSON:   example90,
 			expectedStruct: example90Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrderedCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -743,7 +744,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 91",
 			expectedJSON:   example91,
 			expectedStruct: example91Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -751,7 +752,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 92",
 			expectedJSON:   example92,
 			expectedStruct: example92Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -759,7 +760,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 93",
 			expectedJSON:   example93,
 			expectedStruct: example93Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -767,7 +768,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 94",
 			expectedJSON:   example94,
 			expectedStruct: example94Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeMoveActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -775,7 +776,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 95",
 			expectedJSON:   example95,
 			expectedStruct: example95Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -783,7 +784,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 96",
 			expectedJSON:   example96,
 			expectedStruct: example96Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -791,7 +792,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 97",
 			expectedJSON:   example97,
 			expectedStruct: example97Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLikeActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -799,7 +800,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 98",
 			expectedJSON:   example98,
 			expectedStruct: example98Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLikeActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -807,7 +808,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 99",
 			expectedJSON:   example99,
 			expectedStruct: example99Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLikeActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -815,7 +816,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 100",
 			expectedJSON:   example100,
 			expectedStruct: example100Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -823,7 +824,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 101",
 			expectedJSON:   example101,
 			expectedStruct: example101Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -831,7 +832,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 102",
 			expectedJSON:   example102,
 			expectedStruct: example102Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeVideoActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -839,7 +840,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 103",
 			expectedJSON:   example103,
 			expectedStruct: example103Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeActivityActivityStreams()(m, map[string]string{})
 			},
 			unknown: example103Unknown,
@@ -848,7 +849,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 104",
 			expectedJSON:   example104,
 			expectedStruct: example104Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -856,7 +857,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 105",
 			expectedJSON:   example105,
 			expectedStruct: example105Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeImageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -864,7 +865,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 106",
 			expectedJSON:   example106,
 			expectedStruct: example106Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -872,7 +873,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 107",
 			expectedJSON:   example107,
 			expectedStruct: example107Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -880,7 +881,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 108",
 			expectedJSON:   example108,
 			expectedStruct: example108Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -888,7 +889,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 109",
 			expectedJSON:   example109,
 			expectedStruct: example109Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDocumentActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -896,7 +897,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 110",
 			expectedJSON:   example110,
 			expectedStruct: example110Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDocumentActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -904,7 +905,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 111",
 			expectedJSON:   example111,
 			expectedStruct: example111Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeDocumentActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -912,7 +913,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 112",
 			expectedJSON:   example112,
 			expectedStruct: example112Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -920,7 +921,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 113",
 			expectedJSON:   example113,
 			expectedStruct: example113Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -928,7 +929,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 114",
 			expectedJSON:   example114,
 			expectedStruct: example114Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -936,7 +937,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 115",
 			expectedJSON:   example115,
 			expectedStruct: example115Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -944,7 +945,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 116",
 			expectedJSON:   example116,
 			expectedStruct: example116Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -952,7 +953,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 117",
 			expectedJSON:   example117,
 			expectedStruct: example117Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -960,7 +961,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 118",
 			expectedJSON:   example118,
 			expectedStruct: example118Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -968,7 +969,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 119",
 			expectedJSON:   example119,
 			expectedStruct: example119Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeVideoActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -976,7 +977,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 120",
 			expectedJSON:   example120,
 			expectedStruct: example120Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -984,7 +985,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 121",
 			expectedJSON:   example121,
 			expectedStruct: example121Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -992,7 +993,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 122",
 			expectedJSON:   example122,
 			expectedStruct: example122Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1000,7 +1001,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 123",
 			expectedJSON:   example123,
 			expectedStruct: example123Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1008,7 +1009,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 124",
 			expectedJSON:   example124,
 			expectedStruct: example124Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1016,7 +1017,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 125",
 			expectedJSON:   example125,
 			expectedStruct: example125Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1024,7 +1025,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 126",
 			expectedJSON:   example126,
 			expectedStruct: example126Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1032,7 +1033,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 127",
 			expectedJSON:   example127,
 			expectedStruct: example127Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeEventActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1040,7 +1041,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 128",
 			expectedJSON:   example128,
 			expectedStruct: example128Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1048,7 +1049,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 129",
 			expectedJSON:   example129,
 			expectedStruct: example129Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeEventActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1056,7 +1057,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 130",
 			expectedJSON:   example130,
 			expectedStruct: example130Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1064,7 +1065,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 131",
 			expectedJSON:   example131,
 			expectedStruct: example131Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1072,7 +1073,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 132",
 			expectedJSON:   example132,
 			expectedStruct: example132Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOrderedCollectionPageActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1080,7 +1081,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 133",
 			expectedJSON:   example133,
 			expectedStruct: example133Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1088,7 +1089,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 134",
 			expectedJSON:   example134,
 			expectedStruct: example134Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1096,7 +1097,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 135",
 			expectedJSON:   example135,
 			expectedStruct: example135Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1104,7 +1105,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 136",
 			expectedJSON:   example136,
 			expectedStruct: example136Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1112,7 +1113,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 137",
 			expectedJSON:   example137,
 			expectedStruct: example137Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1120,7 +1121,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 138",
 			expectedJSON:   example138,
 			expectedStruct: example138Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeLinkActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1128,7 +1129,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 139",
 			expectedJSON:   example139,
 			expectedStruct: example139Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRelationshipActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1136,7 +1137,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 140",
 			expectedJSON:   example140,
 			expectedStruct: example140Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeRelationshipActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1144,7 +1145,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 141",
 			expectedJSON:   example141,
 			expectedStruct: example141Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeProfileActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1152,7 +1153,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 142",
 			expectedJSON:   example142,
 			expectedStruct: example142Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTombstoneActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1160,7 +1161,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 143",
 			expectedJSON:   example143,
 			expectedStruct: example143Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeTombstoneActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1168,7 +1169,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 144",
 			expectedJSON:   example144,
 			expectedStruct: example144Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 			unknown: example144Unknown,
@@ -1177,7 +1178,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 145",
 			expectedJSON:   example145,
 			expectedStruct: example145Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1185,7 +1186,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 146",
 			expectedJSON:   example146,
 			expectedStruct: example146Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCreateActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1193,7 +1194,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 147",
 			expectedJSON:   example147,
 			expectedStruct: example147Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeOfferActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1201,7 +1202,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 148",
 			expectedJSON:   example148,
 			expectedStruct: example148Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1209,7 +1210,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 149",
 			expectedJSON:   example149,
 			expectedStruct: example149Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1217,7 +1218,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 150",
 			expectedJSON:   example150,
 			expectedStruct: example150Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializePlaceActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1225,7 +1226,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 151",
 			expectedJSON:   example151,
 			expectedStruct: example151Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1233,7 +1234,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 152",
 			expectedJSON:   example152,
 			expectedStruct: example152Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 			unknown: example152Unknown,
@@ -1247,7 +1248,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 154",
 			expectedJSON:   example154,
 			expectedStruct: example154Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeQuestionActivityStreams()(m, map[string]string{})
 			},
 			unknown: example154Unknown,
@@ -1256,7 +1257,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 155",
 			expectedJSON:   example155,
 			expectedStruct: example155Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1264,7 +1265,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 156",
 			expectedJSON:   example156,
 			expectedStruct: example156Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeCollectionActivityStreams()(m, map[string]string{})
 			},
 		},
@@ -1272,7 +1273,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 157",
 			expectedJSON:   example157,
 			expectedStruct: example157Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 			unknown: example157Unknown,
@@ -1281,7 +1282,7 @@ func GetTestTable() []TestTable {
 			name:           "Example 158",
 			expectedJSON:   example158,
 			expectedStruct: example158Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeNoteActivityStreams()(m, map[string]string{})
 			},
 			unknown: example158Unknown,
@@ -1290,10 +1291,26 @@ func GetTestTable() []TestTable {
 			name:           "Example 159",
 			expectedJSON:   example159,
 			expectedStruct: example159Type(),
-			deserializer: func(m map[string]interface{}) (serializer, error) {
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
 				return mgr.DeserializeMoveActivityStreams()(m, map[string]string{})
 			},
 		},
+		{
+			name:           "Person Example (With Public Key)",
+			expectedJSON:   personExampleWithPublicKey,
+			expectedStruct: personExampleWithPublicKeyType(),
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
+				return mgr.DeserializePersonActivityStreams()(m, map[string]string{})
+			},
+		},
+		{
+			name:           "Service w/ Multiple schema:PropertyValue Attachments",
+			expectedJSON:   serviceHasAttachmentWithUnknown,
+			expectedStruct: serviceHasAttachmentWithUnknownType(),
+			deserializer: func(m map[string]interface{}) (vocab.Type, error) {
+				return mgr.DeserializeServiceActivityStreams()(m, map[string]string{})
+			},
+		},
 	}
 }