diff --git a/src/main/java/net/onrc/onos/core/topology/serializers/DeviceSerializer.java b/src/main/java/net/onrc/onos/core/topology/serializers/DeviceSerializer.java
index 09a1f57..038a941 100644
--- a/src/main/java/net/onrc/onos/core/topology/serializers/DeviceSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/serializers/DeviceSerializer.java
@@ -4,12 +4,12 @@
 
 import net.onrc.onos.core.topology.Device;
 import net.onrc.onos.core.topology.Port;
-import net.onrc.onos.core.topology.PortEvent.SwitchPort;
 
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.ser.std.SerializerBase;
+import org.openflow.util.HexString;
 
 public class DeviceSerializer extends SerializerBase<Device> {
 
@@ -22,15 +22,16 @@
         SerializerProvider serializerProvider) throws IOException,
         JsonGenerationException {
         jsonGenerator.writeStartObject();
-        jsonGenerator.writeNumberField("mac", dev.getMacAddress().toLong());
+        jsonGenerator.writeStringField("mac", dev.getMacAddress().toString());
         jsonGenerator.writeFieldName("attachmentPoints");
         jsonGenerator.writeStartArray();
         for (Port port : dev.getAttachmentPoints()) {
-            SwitchPort sp = new SwitchPort(port.getDpid(), port.getNumber());
-            jsonGenerator.writeObject(sp);
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeStringField("dpid", HexString.toHexString(port.getDpid()));
+            jsonGenerator.writeNumberField("port", port.getNumber());
+            jsonGenerator.writeEndObject();
         }
         jsonGenerator.writeEndArray();
         jsonGenerator.writeEndObject();
     }
-
 }