diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/FlowEntryMatch.java b/src/main/java/net/onrc/onos/ofcontroller/util/FlowEntryMatch.java
index fd41d09..a2ac748 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/FlowEntryMatch.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/FlowEntryMatch.java
@@ -16,7 +16,7 @@
     /**
      * A class for storing a value to match.
      */
-    static class Field<T> {
+    public static class Field<T> {
 	/**
 	 * Default constructor.
 	 */
diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/Switch.java b/src/main/java/net/onrc/onos/ofcontroller/util/Switch.java
new file mode 100644
index 0000000..e6fc45e
--- /dev/null
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/Switch.java
@@ -0,0 +1,91 @@
+package net.onrc.onos.ofcontroller.util;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+/**
+ * The class representing a Switch.
+ * NOTE: Currently this class is (almost) not used.
+ */
+public class Switch {
+    public enum SwitchState {
+	INACTIVE,
+	ACTIVE,
+    }
+
+    private String type;	// The type from the database. TODO: Not needed
+    private String state;	// The state of the switch
+    private String dpid;	// The DPID of the switch
+
+    /**
+     * Default constructor.
+     */
+    public Switch() {
+    }
+
+    /**
+     * Get the type.
+     *
+     * @return the type.
+     */
+    @JsonProperty("type")
+    public String type() { return type; }
+
+    /**
+     * Set the type.
+     *
+     * @param type the type to use.
+     */
+    @JsonProperty("type")
+    public void setType(String type) {
+	this.type = type;
+    }
+
+    /**
+     * Get the state.
+     *
+     * @return the state.
+     */
+    @JsonProperty("state")
+    public String state() { return state; }
+
+    /**
+     * Set the state.
+     *
+     * @param state the state to use.
+     */
+    @JsonProperty("state")
+    public void setState(String state) {
+	this.state = state;
+    }
+
+    /**
+     * Get the DPID.
+     *
+     * @return the DPID.
+     */
+    @JsonProperty("dpid")
+    public String dpid() { return dpid; }
+
+    /**
+     * Set the DPID.
+     *
+     * @param dpid the DPID to use.
+     */
+    @JsonProperty("dpid")
+    public void setDpid(String dpid) {
+	this.dpid = dpid;
+    }
+
+    /**
+     * Convert the Switch value to a string.
+     *
+     * The string has the following form:
+     *  type/state/dpid
+     *
+     * @return the Switch value as a string.
+     */
+    @Override
+    public String toString() {
+	return this.type + "/" + this.state + "/" + this.dpid;
+    }
+}