diff --git a/acrate-nodeinfo/src/lib.rs b/acrate-nodeinfo/src/lib.rs
index 0123a3d..65ef028 100644
--- a/acrate-nodeinfo/src/lib.rs
+++ b/acrate-nodeinfo/src/lib.rs
@@ -36,16 +36,16 @@ pub struct NodeInfo1 {
 	pub software: NodeInfo1Software,
 
 	/// The protocols supported on this server.
-	pub protocols: NodeInfo1Protocols,
+	pub protocols: Option<NodeInfo1Protocols>,
 
 	/// The third party sites this server can connect to via their application API.
-	pub services: NodeInfo1Services,
+	pub services: Option<NodeInfo1Services>,
 	
 	/// Whether this server allows open self-registration.
-	pub open_registrations: bool,
+	pub open_registrations: Option<bool>,
 
 	/// Usage statistics for this server.
-	pub usage: NodeInfo1Usage,
+	pub usage: Option<NodeInfo1Usage>,
 
 	/// Free form key value pairs for software specific values. 
 	/// 
@@ -71,16 +71,16 @@ pub struct NodeInfo2 {
 	pub instance: Option<NodeInfo2Instance>,
 
 	/// Metadata about server software in use.
-	pub software: NodeInfo1Software,
+	pub software: Option<NodeInfo1Software>,
 
 	/// The protocols supported on this server.
-	pub protocols: Vec<String>,
+	pub protocols: Option<Vec<String>>,
 
 	/// The third party sites this server can connect to via their application API.
 	pub services: Option<NodeInfo1Services>,
 
 	/// Whether this server allows open self-registration.
-	pub open_registrations: bool,
+	pub open_registrations: Option<bool>,
 
 	/// Usage statistics for this server.
 	pub usage: Option<NodeInfo1Usage>,
@@ -161,7 +161,7 @@ pub struct NodeInfo2Instance {
 	pub name: String,
 
 	/// If supported by the software, the administrator-configured long form description of this instance.
-	pub description: String,
+	pub description: Option<String>,
 }
 
 impl NodeInfo {