diff --git a/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java b/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
index a73b0b4..11dbcb1 100644
--- a/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/TopoSwitchesResource.java
@@ -2,6 +2,7 @@
 
 import java.util.Iterator;
 
+import net.floodlightcontroller.core.ISwitchStorage.ISwitchObject;
 import net.floodlightcontroller.core.internal.TopoSwitchServiceImpl;
 
 import org.restlet.resource.Get;
@@ -10,18 +11,18 @@
 public class TopoSwitchesResource extends ServerResource {
 	
 	@Get("json")
-	public Iterator<String> retrieve() {
+	public Iterator<ISwitchObject> retrieve() {
 		TopoSwitchServiceImpl impl = new TopoSwitchServiceImpl();
 		
 		String filter = (String) getRequestAttributes().get("filter");
 		
 		if (filter.equals("active")) {
-			return (Iterator<String>) impl.GetActiveSwitches().iterator();
+			return (Iterator<ISwitchObject>) impl.GetActiveSwitches().iterator();
 		}
 		if (filter.equals("inactive")) {
-			return (Iterator<String>) impl.GetInactiveSwitches().iterator();
+			return (Iterator<ISwitchObject>) impl.GetInactiveSwitches().iterator();
 		}
-		return (Iterator<String>) impl.GetAllSwitches().iterator();				
+		return (Iterator<ISwitchObject>) impl.GetAllSwitches().iterator();				
 	}
 
 }