diff --git a/nsActivitystreams.go b/nsActivitystreams.go
index ddc2297..d4137a8 100644
--- a/nsActivitystreams.go
+++ b/nsActivitystreams.go
@@ -3,7 +3,6 @@ package goap
 import (
 	"time"
 
-	"gitlab.com/mstarongitlab/goutils/maputils"
 	"gitlab.com/mstarongitlab/goutils/sliceutils"
 )
 
diff --git a/nsMasto.go b/nsMasto.go
index a8d2dd8..fa5abd3 100644
--- a/nsMasto.go
+++ b/nsMasto.go
@@ -1 +1,88 @@
 package goap
+
+type DevicesData struct {
+	FullIdType
+}
+
+func (actor *DevicesData) GetSelfOrBase() (BaseApChain, bool) {
+	return actor.FullIdType.GetSelfOrBase()
+}
+
+func (actor *DevicesData) MarshalToMap() map[string]any {
+	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_DEVICES)
+}
+
+type DiscoverableData struct {
+	Next  BaseApChain
+	Value ValueValue[bool]
+}
+
+func (namedata *DiscoverableData) GetSelfOrBase() (BaseApChain, bool) {
+	return namedata.Next, true
+}
+
+func (namedata *DiscoverableData) MarshalToMap() map[string]any {
+	return appendWithKey(
+		namedata.Next.MarshalToMap(),
+		KEY_MASTO_DISCOVERABLE,
+		[]map[string]any{namedata.Value.Marshal()},
+	)
+}
+
+type FeaturedData struct {
+	FullIdType
+}
+
+func (actor *FeaturedData) GetSelfOrBase() (BaseApChain, bool) {
+	return actor.FullIdType.GetSelfOrBase()
+}
+
+func (actor *FeaturedData) MarshalToMap() map[string]any {
+	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_FEATURED)
+}
+
+type FeaturedTagsData struct {
+	FullIdType
+}
+
+func (actor *FeaturedTagsData) GetSelfOrBase() (BaseApChain, bool) {
+	return actor.FullIdType.GetSelfOrBase()
+}
+
+func (actor *FeaturedTagsData) MarshalToMap() map[string]any {
+	return actor.FullIdType.MarshalToMapWithName(KEY_MASTO_FEATURED_TAGS)
+}
+
+type IndexableData struct {
+	Next  BaseApChain
+	Value ValueValue[bool]
+}
+
+func (namedata *IndexableData) GetSelfOrBase() (BaseApChain, bool) {
+	return namedata.Next, true
+}
+
+func (namedata *IndexableData) MarshalToMap() map[string]any {
+	return appendWithKey(
+		namedata.Next.MarshalToMap(),
+		KEY_MASTO_INDEXABLE,
+		[]map[string]any{namedata.Value.Marshal()},
+	)
+}
+
+type MemorialData struct {
+	Next  BaseApChain
+	Value ValueValue[bool]
+}
+
+func (namedata *MemorialData) GetSelfOrBase() (BaseApChain, bool) {
+	return namedata.Next, true
+}
+
+func (namedata *MemorialData) MarshalToMap() map[string]any {
+	return appendWithKey(
+		namedata.Next.MarshalToMap(),
+		KEY_MASTO_MEMORIAL,
+		[]map[string]any{namedata.Value.Marshal()},
+	)
+}
diff --git a/nsW3.go b/nsW3.go
index a8d2dd8..191a2a0 100644
--- a/nsW3.go
+++ b/nsW3.go
@@ -1 +1,14 @@
 package goap
+
+// inbox
+type InboxData struct {
+	FullIdType
+}
+
+func (actor *InboxData) GetSelfOrBase() (BaseApChain, bool) {
+	return actor.FullIdType.GetSelfOrBase()
+}
+
+func (actor *InboxData) MarshalToMap() map[string]any {
+	return actor.FullIdType.MarshalToMapWithName(KEY_W3_INBOX)
+}
diff --git a/nsW3Security.go b/nsW3Security.go
index a8d2dd8..42ade7f 100644
--- a/nsW3Security.go
+++ b/nsW3Security.go
@@ -1 +1,52 @@
 package goap
+
+// Owner
+type OwnerData struct {
+	FullIdType
+}
+
+func (actor *OwnerData) GetSelfOrBase() (BaseApChain, bool) {
+	return actor.FullIdType.GetSelfOrBase()
+}
+
+func (actor *OwnerData) MarshalToMap() map[string]any {
+	return actor.FullIdType.MarshalToMapWithName(KEY_W3_SECURITY_OWNER)
+}
+
+type PublicKeyData struct {
+	Next  BaseApChain
+	Id    string
+	Owner string
+	Key   string
+}
+
+func (publickeydata *PublicKeyData) GetSelfOrBase() (BaseApChain, bool) {
+	return publickeydata.Next, true
+}
+
+func (publickeydata *PublicKeyData) MarshalToMap() map[string]any {
+	m := publickeydata.Next.MarshalToMap()
+	m[KEY_W3_SECURITY_PUBLICKEY] = []map[string]any{{
+		KEY_ID:                       publickeydata.Id,
+		KEY_W3_SECURITY_OWNER:        []map[string]any{{KEY_ID: publickeydata.Owner}},
+		KEY_W3_SECURITY_PUBLICKEYPEM: []map[string]any{{KEY_VALUE: publickeydata.Key}},
+	}}
+	return m
+}
+
+type PublicKeyPemData struct {
+	Next  BaseApChain
+	Value ValueValue[bool]
+}
+
+func (namedata *PublicKeyPemData) GetSelfOrBase() (BaseApChain, bool) {
+	return namedata.Next, true
+}
+
+func (namedata *PublicKeyPemData) MarshalToMap() map[string]any {
+	return appendWithKey(
+		namedata.Next.MarshalToMap(),
+		KEY_W3_SECURITY_PUBLICKEYPEM,
+		[]map[string]any{namedata.Value.Marshal()},
+	)
+}