diff --git a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
index 17d7b1490e3bbf84618ff0063b4ad1f01a3bc6a0..fe4b9676a253775ff4aabf74d932d38a888d9a17 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
@@ -4,13 +4,28 @@ import net.floodlightcontroller.core.IFloodlightProviderService;
 import org.restlet.resource.Get;
 import org.restlet.resource.ServerResource;
 
+
+
 public class SystemUptimeResource extends ServerResource {
+	
+	public class UptimeRest {
+		long systemUptimeMsec;
+
+		public long getSystemUptimeMsec() {
+			return systemUptimeMsec;
+		}
+	}
+	
 	@Get("json")
-	public long retrieve() {
+	public UptimeRest retrieve() {
 		IFloodlightProviderService floodlightProvider = 
 			(IFloodlightProviderService)getContext().getAttributes().
 			get(IFloodlightProviderService.class.getCanonicalName());
-		return (System.currentTimeMillis() -
-				floodlightProvider.getSystemStartTime());
+		
+		UptimeRest uptime = new UptimeRest();
+		uptime.systemUptimeMsec = 
+		   System.currentTimeMillis() - floodlightProvider.getSystemStartTime();
+		
+		return (uptime);
 	}
 }