diff --git a/JSONListModel/JSONListModel.qml b/JSONListModel/JSONListModel.qml
index 62b466d..d4efebd 100644
--- a/JSONListModel/JSONListModel.qml
+++ b/JSONListModel/JSONListModel.qml
@@ -4,16 +4,21 @@
  * Licensed under the MIT licence (http://opensource.org/licenses/mit-license.php)
  */
 
-import QtQuick 1.1
+import QtQuick 2.0
 import "jsonpath.js" as JSONPath
 
 Item {
     property string source: ""
     property string json: ""
     property string query: ""
-
+    property string propId: "" // If this property is defined (unique identifier of each object) we'll update only the changes without destroying everything
+    
     property ListModel model : ListModel { id: jsonModel }
     property alias count: jsonModel.count
+    
+    signal jsonModelChanged;
+    
+    property string jsonAnt: ""
 
     onSourceChanged: {
         var xhr = new XMLHttpRequest;
@@ -29,16 +34,79 @@ Item {
     onQueryChanged: updateJSONModel()
 
     function updateJSONModel() {
-        jsonModel.clear();
+        var objectArray;
+        var jo;
+        if (json === "")
+        {
+            jsonModel.clear();
+        }
+        else if (propId === "" || jsonAnt === "")
+        {
+            jsonModel.clear();
+            objectArray = parseJSONString(json, query);
+            for (var key in objectArray ) {
+                jo = objectArray[key];
+                jsonModel.append(jo);
+            }
+        }
+        else
+        {
+            var i, j, id, found;
+            objectArray = parseJSONString(json, query);
+            var objectArrayAnt = parseJSONString(jsonAnt, query);
 
-        if ( json === "" )
-            return;
+            // Detect new and modified elements
+            
+            for (i = 0; i < objectArray.length; ++i ) {
+                id = objectArray[i][propId];
+                found = false;
+                for (j = 0; j < objectArrayAnt.length; ++j) {
+                    if (id === objectArrayAnt[j][propId])
+                    {
+                        found = true;
+                        break;
+                    }
+                }
 
-        var objectArray = parseJSONString(json, query);
-        for ( var key in objectArray ) {
-            var jo = objectArray[key];
-            jsonModel.append( jo );
+                if (!found)
+                {
+                    jsonModel.append(objectArray[i]);
+                }
+                else
+                {
+                    if (JSON.stringify(objectArray[i]) !== JSON.stringify(objectArrayAnt[j]))
+                    {
+                        // Don't do the following because set() merges properties instead of replacing
+                        // Instead we remove it and insert it
+                        // jsonModel.set(j, objectArray[i]);
+                        
+                        jsonModel.remove(j);
+                        jsonModel.insert(j, objectArray[i]);
+                    }
+                }
+            }
+
+            // Detect the removed elements
+            
+            for (i = objectArrayAnt.length - 1; i >= 0; --i ) {
+                id = objectArrayAnt[i][propId];
+                found = false;
+                for (j = objectArray.length - 1; j >= 0; --j ) {
+                    if (id === objectArray[j][propId])
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found)
+                {
+                    jsonModel.remove(i);
+                }
+            }
         }
+
+        jsonModelChanged();
+        jsonAnt = json;
     }
 
     function parseJSONString(jsonString, jsonPathQuery) {