diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/ChannelStatus.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/ChannelStatus.java
index d3a7c2311c..a88f93702d 100644
--- a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/ChannelStatus.java
+++ b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/ChannelStatus.java
@@ -2,62 +2,116 @@
 
 public class ChannelStatus {
 
+    /**
+     * The ID or name of the channel. (e.g., 'employee')
+     */
 	String channelId;
 
+	/**
+	 * Is the channel enabled. Disabling the channel prevents all communication on the channel.
+	 */
 	boolean enabled;
 
+	/**
+	 * An outgoing batch is in error.
+	 */
 	boolean outgoingError;
 
+	/**
+	 * An incoming batch is in error.
+	 */
 	boolean incomingError;
 
+	/**
+	 * The number of batches waiting to be sent.
+	 */
 	private int batchToSendCount;
 
+	/**
+	 * The number of batches in the error state.
+	 */
 	private int batchInErrorCount;
 
+	/**
+	 * @return The ID or name of the channel. (e.g., 'employee')
+	 */
 	public String getChannelId() {
 		return channelId;
 	}
 
+	/**
+	 * @param channelId The ID or name of the channel. (e.g., 'employee')
+	 */
 	public void setChannelId(String channelId) {
 		this.channelId = channelId;
 	}
 
+	/**
+	 * @return Is the channel enabled. Disabling the channel prevents all communication on the channel.
+	 */
 	public boolean isEnabled() {
 		return enabled;
 	}
 
+	/**
+	 * @param enabled Is the channel enabled. Disabling the channel prevents all communication on the channel.
+	 */
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
 
+    /**
+     * @return An outgoing batch is in error.
+     */
 	public boolean isOutgoingError() {
 		return outgoingError;
 	}
 
+    /**
+     * @param enabled An outgoing batch is in error.
+     */
 	public void setOutgoingError(boolean outgoingError) {
 		this.outgoingError = outgoingError;
 	}
 
+    /**
+     * @return An incoming batch is in error.
+     */
 	public boolean isIncomingError() {
 		return incomingError;
 	}
 
+    /**
+     * @param enabled An incoming batch is in error.
+     */
 	public void setIncomingError(boolean incomingError) {
 		this.incomingError = incomingError;
 	}
 
+    /**
+     * @return The number of batches waiting to be sent.
+     */
 	public int getBatchToSendCount() {
 		return batchToSendCount;
 	}
 
+    /**
+     * @param enabled The number of batches waiting to be sent.
+     */
 	public void setBatchToSendCount(int batchToSendCount) {
 		this.batchToSendCount = batchToSendCount;
 	}
 
+    /**
+     * @return The number of batches in the error state.
+     */
 	public int getBatchInErrorCount() {
 		return batchInErrorCount;
 	}
 
+    /**
+     * @param enabled The number of batches in the error state.
+     */
 	public void setBatchInErrorCount(int batchInErrorCount) {
 		this.batchInErrorCount = batchInErrorCount;
 	}
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/NodeStatus.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/NodeStatus.java
index d8585e4590..82f6f520a0 100644
--- a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/NodeStatus.java
+++ b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/NodeStatus.java
@@ -4,152 +4,287 @@
 
 public class NodeStatus {
 
+    /**
+     * Is the node is registered with another node.
+     */
 	Boolean registered;
 
+	/**
+	 * Is the node a registration server.
+	 */
 	Boolean registrationServer;
 
+	/**
+	 * Is the node initially loaded.
+	 */
 	Boolean isInitialLoaded;
 
+	/**
+	 * The node's ID.
+	 */
 	private String nodeId;
 
+	/**
+	 * The node's group ID.
+	 */
 	private String nodeGroupId;
 
+	/**
+	 * The node's external ID.
+	 */
 	private String externalId;
 
+	/**
+	 * The URL other nodes use to communicate with this node.
+	 */
 	private String syncUrl;
 
+	/**
+	 * The type of database the node connects to. (e.g., 'PostgreSQL')
+	 */
 	private String databaseType;
 
+	/**
+	 * The version of the database the node connects to. (e.g., '9.2')
+	 */
 	private String databaseVersion;
 
+	/**
+	 * Is the node enabled for synchronization.
+	 */
 	private boolean syncEnabled = true;
 
+	/**
+	 * The node ID where this node was created.
+	 */
 	private String createdAtNodeId;
 
+	/**
+	 * The number of batches waiting to be sent.
+	 */
 	private int batchToSendCount;
 
+	/**
+	 * The number of batches in the error state.
+	 */
 	private int batchInErrorCount;
 
+	/**
+	 * The node's SymmetricDS installation type. (e.g., 'professional')
+	 */
 	private String deploymentType;
 	
+	/**
+	 * The version of SymmetricDS installed on the node. (e.g., '3.2.0-SNAPSHOT')
+	 */
 	private String symmetricVersion = Version.version();
 
+	/**
+	 * @return Boolean indicating if the node is registered with another node.
+	 */
 	public Boolean getRegistered() {
 		return registered;
 	}
 
+	/**
+	 * @param registered Boolean indicating if the node is registered with another node.
+	 */
 	public void setRegistered(Boolean registered) {
 		this.registered = registered;
 	}
 
+	/** 
+	 * @return Boolean indicating if the node is a registration server.
+	 */
 	public Boolean getRegistrationServer() {
 		return registrationServer;
 	}
 
+	/**
+	 * @param registrationServer Boolean indicating if the node is a registration server.
+	 */
 	public void setRegistrationServer(Boolean registrationServer) {
 		this.registrationServer = registrationServer;
 	}
 
+	/**
+	 * @return Boolean indicating if the node is initial loaded.
+	 */
 	public Boolean getIsInitialLoaded() {
 		return isInitialLoaded;
 	}
 
+	/**
+	 * @param isInitialLoaded Boolean indicating if the node is initial loaded.
+	 */
 	public void setIsInitialLoaded(Boolean isInitialLoaded) {
 		this.isInitialLoaded = isInitialLoaded;
 	}
 
+	/**
+	 * @return The node's ID.
+	 */
 	public String getNodeId() {
 		return nodeId;
 	}
 
+	/**
+	 * @param nodeId The node's ID.
+	 */
 	public void setNodeId(String nodeId) {
 		this.nodeId = nodeId;
 	}
 
+	/**
+	 * @return The node's group id.
+	 */
 	public String getNodeGroupId() {
 		return nodeGroupId;
 	}
 
+	/**
+	 * @param nodeGroupId The node's group id.
+	 */
 	public void setNodeGroupId(String nodeGroupId) {
 		this.nodeGroupId = nodeGroupId;
 	}
 
+	/**
+	 * @return The node's external id.
+	 */
 	public String getExternalId() {
 		return externalId;
 	}
 
+	/**
+	 * @param externalId The node's external id.
+	 */
 	public void setExternalId(String externalId) {
 		this.externalId = externalId;
 	}
 
+	/**
+	 * @return The sync URL other nodes would use to communicate with this node.
+	 */
 	public String getSyncUrl() {
 		return syncUrl;
 	}
 
+	/**
+	 * @param syncUrl The sync URL other nodes would use to communicate with this node.
+	 */
 	public void setSyncUrl(String syncUrl) {
 		this.syncUrl = syncUrl;
 	}
 
+	/**
+	 * @return The database type the node connects to.
+	 */
 	public String getDatabaseType() {
 		return databaseType;
 	}
 
+	/**
+	 * @param databaseType The database type the node connects to.
+	 */
 	public void setDatabaseType(String databaseType) {
 		this.databaseType = databaseType;
 	}
 
+	/**
+	 * @return The version of SymmetricDS running on the node.
+	 */
 	public String getSymmetricVersion() {
 		return symmetricVersion;
 	}
 
+	/**
+	 * @param symmetricVersion The version of SymmetricDS running on the node.
+	 */
 	public void setSymmetricVersion(String symmetricVersion) {
 		this.symmetricVersion = symmetricVersion;
 	}
 
+	/**
+	 * @return The version of the database the node is connected to.
+	 */
 	public String getDatabaseVersion() {
 		return databaseVersion;
 	}
 
+	/**
+	 * @param databaseVersion The version of the database the node is connected to.
+	 */
 	public void setDatabaseVersion(String databaseVersion) {
 		this.databaseVersion = databaseVersion;
 	}
 
+	/**
+	 * @return boolean indicating if synchronization is enabled on the node.
+	 */
 	public boolean isSyncEnabled() {
 		return syncEnabled;
 	}
 
+	/**
+	 * @param syncEnabled boolean indicating if synchronization is enabled on the node.
+	 */
 	public void setSyncEnabled(boolean syncEnabled) {
 		this.syncEnabled = syncEnabled;
 	}
 
+	/**
+	 * @return Node ID of the node that created this node.
+	 */
 	public String getCreatedAtNodeId() {
 		return createdAtNodeId;
 	}
 
+	/**
+	 * @param createdAtNodeId Node ID of the node that created this node.
+	 */
 	public void setCreatedAtNodeId(String createdAtNodeId) {
 		this.createdAtNodeId = createdAtNodeId;
 	}
 
+	/**
+	 * @return Number of batches waiting to be sent.
+	 */
 	public int getBatchToSendCount() {
 		return batchToSendCount;
 	}
 
+	/**
+	 * @param batchToSendCount Number of batches waiting to be sent.
+	 */
 	public void setBatchToSendCount(int batchToSendCount) {
 		this.batchToSendCount = batchToSendCount;
 	}
 
+	/**
+	 * @return Number of batches in the error state.
+	 */
 	public int getBatchInErrorCount() {
 		return batchInErrorCount;
 	}
 
+	/**
+	 * @param batchInErrorCount Number of batches in the error state.
+	 */
 	public void setBatchInErrorCount(int batchInErrorCount) {
 		this.batchInErrorCount = batchInErrorCount;
 	}
 
+	/**
+	 * @return The node's SymmetricDS installation type. (e.g., 'professional')
+	 */
 	public String getDeploymentType() {
 		return deploymentType;
 	}
 
+	/**
+	 * @param deploymentType The node's SymmetricDS installation type. (e.g., 'professional')
+	 */
 	public void setDeploymentType(String deploymentType) {
 		this.deploymentType = deploymentType;
 	}