diff --git a/src/crud_internal.c b/src/crud_internal.c
index be91092..0a77490 100644
--- a/src/crud_internal.c
+++ b/src/crud_internal.c
@@ -36,6 +36,7 @@ static int parse_dest_elements_to_string(wrp_msg_t *reqMsg, char *(*obj)[]);
 static char* strdupptr( const char *s, const char *e );
 static int ConnDisconnectFromCloud(char *reason);
 static int validateDisconnectString(char *reason);
+static int getClientStatus(char *service, cJSON **jsonresponse);
 
 int writeToJSON(char *data)
 {
@@ -592,34 +593,6 @@ int retrieveFromMemory(char *keyName, cJSON **jsonresponse)
 			cJSON_AddItemToObject( *jsonresponse, CLOUD_STATUS , cJSON_CreateString(get_parodus_cfg()->cloud_status));
 		}
 	}
-	else if(strstr(keyName, "status") !=NULL)
-	{
-		char *service = NULL;
-		const char s[2] = "-";
-		service = strtok(keyName, s);
-		if(service !=NULL)
-		{
-			ParodusPrint("service is %s\n", service);
-			char *regstatus = NULL;
-
-			if(checkClientStatus(service))
-			{
-				regstatus = strdup("online");
-			}
-			else
-			{
-				regstatus = strdup("offline");
-			}
-			ParodusInfo("retrieveFromMemory: keyName:%s value:%s\n", keyName, regstatus);
-			cJSON_AddItemToObject( *jsonresponse, SERVICE_STATUS , cJSON_CreateString(regstatus));
-			free(regstatus);
-			regstatus = NULL;
-		}
-		else
-		{
-			ParodusError("Failed to get service name\n");
-		}
-	}
 	else if(strcmp(BOOT_TIME, keyName)==0)
 	{
 		ParodusInfo("retrieveFromMemory: keyName:%s value:%d\n",keyName,get_parodus_cfg()->boot_time);
@@ -670,10 +643,17 @@ int retrieveObject( wrp_msg_t *reqMsg, wrp_msg_t **response )
 		}
 
 		ParodusInfo( "Number of object level %d\n", objlevel );
-
-		if(objlevel == 3 && ((obj[3] !=NULL) && strstr(obj[3] ,"tags") == NULL))
+		if((objlevel == 3 && ((obj[3] !=NULL) && strstr(obj[3] ,"tags") == NULL)) || (objlevel == 4 && ((obj[3] !=NULL) && strstr(obj[3] ,"service-status") != NULL)))
 		{
-			inMemStatus = retrieveFromMemory(obj[3], &inMemResponse );
+			//To support dest "mac:14xxxxxxxxxx/parodus/service-status/service" to retrieve online/offline status of registered clients.
+			if(strstr(obj[3] ,"service-status") !=NULL)
+			{
+				inMemStatus = getClientStatus(obj[4], &inMemResponse );
+			}
+			else
+			{
+				inMemStatus = retrieveFromMemory(obj[3], &inMemResponse );
+			}
 
 			if(inMemStatus == 0)
 			{
@@ -1644,3 +1624,27 @@ static int validateDisconnectString(char *reason)
 	}
 	return rv;
 }
+
+static int getClientStatus(char *service, cJSON **jsonresponse)
+{
+	char regstatus[16] ={0};
+	*jsonresponse = cJSON_CreateObject();
+
+	if(service == NULL)
+	{
+		ParodusError("service is NULL\n");
+		return -1;
+	}
+
+	if(checkClientStatus(service))
+	{
+		strncpy(regstatus, "online", sizeof(regstatus)-1);
+	}
+	else
+	{
+		strncpy(regstatus, "offline", sizeof(regstatus)-1);
+	}
+	ParodusPrint("getClientStatus: service:%s value:%s\n", service, regstatus);
+	cJSON_AddItemToObject( *jsonresponse, SERVICE_STATUS , cJSON_CreateString(regstatus));
+	return 0;
+}