6 files changed, 27 insertions, 27 deletions
diff --git a/modules/operserv/os_dns.cpp b/modules/operserv/os_dns.cpp
index 18e53b25a..88f39b185 100644
--- a/modules/operserv/os_dns.cpp
+++ b/modules/operserv/os_dns.cpp
@@ -39,10 +39,10 @@ struct DNSZone final
 
 	void Serialize(Serialize::Data &data) const override
 	{
-		data["name"] << name;
+		data.Store("name", name);
 		unsigned count = 0;
 		for (const auto &server : servers)
-			data["server" + Anope::ToString(count++)] << server;
+			data.Store("server" + Anope::ToString(count++), server);
 	}
 
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data)
@@ -144,14 +144,14 @@ public:
 
 	void Serialize(Serialize::Data &data) const override
 	{
-		data["server_name"] << server_name;
+		data.Store("server_name", server_name);
 		for (unsigned i = 0; i < ips.size(); ++i)
-			data["ip" + Anope::ToString(i)] << ips[i];
-		data["limit"] << limit;
-		data["pooled"] << pooled;
+			data.Store("ip" + Anope::ToString(i), ips[i]);
+		data.Store("limit", limit);
+		data.Store("pooled", pooled);
 		unsigned count = 0;
 		for (const auto &zone : zones)
-			data["zone" + Anope::ToString(count++)] << zone;
+			data.Store("zone" + Anope::ToString(count++), zone);
 	}
 
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data)
diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp
index a5a8b79ea..032cf0da7 100644
--- a/modules/operserv/os_forbid.cpp
+++ b/modules/operserv/os_forbid.cpp
@@ -25,12 +25,12 @@ struct ForbidDataImpl final
 
 void ForbidDataImpl::Serialize(Serialize::Data &data) const
 {
-	data["mask"] << this->mask;
-	data["creator"] << this->creator;
-	data["reason"] << this->reason;
-	data["created"] << this->created;
-	data["expires"] << this->expires;
-	data["type"] << this->type;
+	data.Store("mask", this->mask);
+	data.Store("creator", this->creator);
+	data.Store("reason", this->reason);
+	data.Store("created", this->created);
+	data.Store("expires", this->expires);
+	data.Store("type", this->type);
 }
 
 Serializable *ForbidDataImpl::Unserialize(Serializable *obj, Serialize::Data &data)
diff --git a/modules/operserv/os_ignore.cpp b/modules/operserv/os_ignore.cpp
index e4cff0d44..e7db65a62 100644
--- a/modules/operserv/os_ignore.cpp
+++ b/modules/operserv/os_ignore.cpp
@@ -30,10 +30,10 @@ IgnoreDataImpl::~IgnoreDataImpl()
 
 void IgnoreDataImpl::Serialize(Serialize::Data &data) const
 {
-	data["mask"] << this->mask;
-	data["creator"] << this->creator;
-	data["reason"] << this->reason;
-	data["time"] << this->time;
+	data.Store("mask", this->mask);
+	data.Store("creator", this->creator);
+	data.Store("reason", this->reason);
+	data.Store("time", this->time);
 }
 
 Serializable *IgnoreDataImpl::Unserialize(Serializable *obj, Serialize::Data &data)
diff --git a/modules/operserv/os_info.cpp b/modules/operserv/os_info.cpp
index 6ff1089ff..8b4472e74 100644
--- a/modules/operserv/os_info.cpp
+++ b/modules/operserv/os_info.cpp
@@ -28,10 +28,10 @@ struct OperInfoImpl final
 
 	void Serialize(Serialize::Data &data) const override
 	{
-		data["target"] << target;
-		data["info"] << info;
-		data["adder"] << adder;
-		data["created"] << created;
+		data.Store("target", target);
+		data.Store("info", info);
+		data.Store("adder", adder);
+		data.Store("created", created);
 	}
 
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
diff --git a/modules/operserv/os_news.cpp b/modules/operserv/os_news.cpp
index 2cf011c0e..a862e177f 100644
--- a/modules/operserv/os_news.cpp
+++ b/modules/operserv/os_news.cpp
@@ -69,10 +69,10 @@ struct MyNewsItem final
 {
 	void Serialize(Serialize::Data &data) const override
 	{
-		data["type"] << this->type;
-		data["text"] << this->text;
-		data["who"] << this->who;
-		data["time"] << this->time;
+		data.Store("type", this->type);
+		data.Store("text", this->text);
+		data.Store("who", this->who);
+		data.Store("time", this->time);
 	}
 
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data)
diff --git a/modules/operserv/os_stats.cpp b/modules/operserv/os_stats.cpp
index 780151916..72d1a2cd7 100644
--- a/modules/operserv/os_stats.cpp
+++ b/modules/operserv/os_stats.cpp
@@ -24,8 +24,8 @@ struct Stats final
 
 	void Serialize(Serialize::Data &data) const override
 	{
-		data["maxusercnt"] << MaxUserCount;
-		data["maxusertime"] << MaxUserTime;
+		data.Store("maxusercnt", MaxUserCount);
+		data.Store("maxusertime", MaxUserTime);
 	}
 
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data)