diff --git a/plugins/rmass/actions/rmassavatartosynapse.py b/plugins/rmass/actions/rmassavatartosynapse.py
index a204543..8cd7529 100644
--- a/plugins/rmass/actions/rmassavatartosynapse.py
+++ b/plugins/rmass/actions/rmassavatartosynapse.py
@@ -6,6 +6,15 @@ alias = "uploadavatar"
 
 showstatus = True
 
+resolve = {
+    "get": {
+        #"sender": ["messageheaders", "userCard", "id"],
+        "avatar": ["uploadimage"],
+        #"username": ["messageheaders", "userCard", "username"],
+        "avatar_hash": ["useravatar_hash"],
+    },
+}
+
 isrequest = True
 
 method = "POST"
@@ -27,4 +36,13 @@ requestdata = "useravatar"
 
 outputs = {
     "uploadimage": "content_uri",
-}
\ No newline at end of file
+}
+
+filters = [
+    {
+        "filterkey": "avatar_hash",
+        "operator": "==",
+        "filtervalue": {"outputs": "db_avatar_hash"},
+        "print": f"User avatar up to date. Skipping {name}...",
+    },
+]
diff --git a/plugins/rmass/actions/synapseassignavatar.py b/plugins/rmass/actions/synapseassignavatar.py
index f8ebb84..448e74e 100644
--- a/plugins/rmass/actions/synapseassignavatar.py
+++ b/plugins/rmass/actions/synapseassignavatar.py
@@ -48,28 +48,28 @@ headers = {
     "Content-Type": "application/json",
 }
 
-readrow = {
-    "table": "user_profiles",
-    "columns": [
-        {"rmass_user_id": "INTEGER PRIMARY KEY"},
-        {"rmass_username": "TEXT NOT NULL UNIQUE"},
-        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
-        {"rmass_avatar_hash": "TEXT"},
-    ],
-    "searchcolumn": "rmass_avatar_hash",
-    "rowsearchvalue": [
-        {"resolved": "avatar_hash"},
-        {"resolved": "sender"},
-    ],
-    "columnnumber": 3,
-}
+#readrow = {
+#    "table": "user_profiles",
+#    "columns": [
+#        {"rmass_user_id": "INTEGER PRIMARY KEY"},
+#        {"rmass_username": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_avatar_hash": "TEXT"},
+#    ],
+#    "searchcolumn": "rmass_avatar_hash",
+#    "rowsearchvalue": [
+#        {"resolved": "avatar_hash"},
+#        #{"resolved": "sender"},
+#    ],
+#    "columnnumber": 3,
+#}
 
 filters = [
     {
         "filterkey": "avatar_hash",
         "operator": "==",
-        "filtervalue": {"outputs": "databasetarget"},
-        "print": "User avatar up to date. Continuing...",
+        "filtervalue": {"outputs": "db_avatar_hash"},
+        "print": f"User avatar up to date. Skipping {name}...",
     },
 ]
 
diff --git a/plugins/rmass/actions/synapseassignusername.py b/plugins/rmass/actions/synapseassignusername.py
index 6e7b182..5891b9a 100644
--- a/plugins/rmass/actions/synapseassignusername.py
+++ b/plugins/rmass/actions/synapseassignusername.py
@@ -52,26 +52,26 @@ headers = {
     "Content-Type": "application/json",
 }
 
-readrow = {
-    "table": "user_profiles",
-    "columns": [
-        {"rmass_user_id": "INTEGER PRIMARY KEY"},
-        {"rmass_username": "TEXT NOT NULL UNIQUE"},
-        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
-        {"rmass_avatar_hash": "TEXT"},
-    ],
-    "searchcolumn": "rmass_username",
-    "rowsearchvalue": [
-        {"resolved": "username"},
-    ],
-    "columnnumber": 1,
-}
+#readrow = {
+#    "table": "user_profiles",
+#    "columns": [
+#        {"rmass_user_id": "INTEGER PRIMARY KEY"},
+#        {"rmass_username": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_avatar_hash": "TEXT"},
+#    ],
+#    "searchcolumn": "rmass_username",
+#    "rowsearchvalue": [
+#        {"resolved": "username"},
+#    ],
+#    "columnnumber": 1,
+#}
 
 filters = [
     {
         "filterkey": "username",
         "operator": "==",
-        "filtervalue": {"outputs": "databasetarget"},
+        "filtervalue": {"outputs": "db_username"},
         "print": "Username up to date. Continuing...",
     },
 ]
\ No newline at end of file
diff --git a/plugins/rmass/actions/synapsecreatedmroom.py b/plugins/rmass/actions/synapsecreatedmroom.py
index 7a65c85..b20567f 100644
--- a/plugins/rmass/actions/synapsecreatedmroom.py
+++ b/plugins/rmass/actions/synapsecreatedmroom.py
@@ -111,26 +111,26 @@ saverow = {
     ],
 }
 
-readrow = {
-    "table": "user_profiles",
-    "columns": [
-        {"rmass_user_id": "INTEGER PRIMARY KEY"},
-        {"rmass_username": "TEXT NOT NULL UNIQUE"},
-        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
-        {"rmass_avatar_hash": "TEXT"},
-    ],
-    "searchcolumn": "rmass_dm_room",
-    "rowsearchvalue": [
-        {"resolved": "matrixdm"},
-    ],
-    "columnnumber": 2,
-}
+#readrow = {
+#    "table": "user_profiles",
+#    "columns": [
+#        {"rmass_user_id": "INTEGER PRIMARY KEY"},
+#        {"rmass_username": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_dm_room": "TEXT NOT NULL UNIQUE"},
+#        {"rmass_avatar_hash": "TEXT"},
+#    ],
+#    "searchcolumn": "rmass_dm_room",
+#    "rowsearchvalue": [
+#        {"resolved": "matrixdm"},
+#    ],
+#    "columnnumber": 2,
+#}
 
 filters = [
     {
         "filterkey": "matrixdm",
         "operator": "==",
-        "filtervalue": {"outputs": "databasetarget"},
+        "filtervalue": {"outputs": "db_dm_room"},
         "print": "DM Room already created. Continuing...",
     },
 ]
diff --git a/plugins/rmass/actions/synapsepushmessages.py b/plugins/rmass/actions/synapsepushmessages.py
index 312535b..924090b 100644
--- a/plugins/rmass/actions/synapsepushmessages.py
+++ b/plugins/rmass/actions/synapsepushmessages.py
@@ -7,7 +7,7 @@ kind = "action"
 showstatus = True
 
 recursive = {
-    "source": "getmessage",
+    "source": "getmessage_select",
     "reverse": True,
     "label": "messageitem",
 }
@@ -115,13 +115,16 @@ readrow = {
         {"resolved": "message_id"},
     ],
     "columnnumber": 0,
+    "export": {
+        0: "db_message_id",
+    }
 }
 
 filters = [
     {
         "filterkey": "message_id",
         "operator": "==",
-        "filtervalue": {"outputs": "databasetarget"},
+        "filtervalue": {"outputs": "db_message_id"},
         "print": "Message already forwarded. Continuing...",
     },
 ]
diff --git a/plugins/rmass/actions/synapseregister.py b/plugins/rmass/actions/synapseregister.py
index fbb82d9..388c771 100644
--- a/plugins/rmass/actions/synapseregister.py
+++ b/plugins/rmass/actions/synapseregister.py
@@ -61,13 +61,19 @@ readrow = {
         {"resolved": "sender"},
     ],
     "columnnumber": 0,
+    "export": {
+        0: "db_sender_id",
+        1: "db_username",
+        2: "db_dm_room",
+        3: "db_avatar_hash",
+    }
 }
 
 filters = [
     {
         "filterkey": "sender",
         "operator": "==",
-        "filtervalue": {"outputs": "databasetarget"},
+        "filtervalue": {"outputs": "db_sender_id"},
         "print": "User already registered. Continuing...",
     },
 ]
\ No newline at end of file
diff --git a/plugins/rmass/operations/synapsemessagepush.py b/plugins/rmass/operations/synapsemessagepush.py
index 527a3a7..12b8004 100644
--- a/plugins/rmass/operations/synapsemessagepush.py
+++ b/plugins/rmass/operations/synapsemessagepush.py
@@ -1,4 +1,4 @@
-from plugins.rmass.actions import pullmessagelist, refresh_tokens, getmessage, checkavailable, synapseregister, synapseassignusername, getrmassuseravatar, rmassavatartosynapse, synapseassignavatar, synapsecreatespace, synapsegetspaceid, synapsecreatedmroom, synapsegetroomid, synapseassignspace, synapsepushmessages
+from plugins.rmass.actions import pullmessagelist, refresh_tokens, getmessage, synapseregister, synapseassignusername, getrmassuseravatar, rmassavatartosynapse, synapseassignavatar, synapsecreatespace, synapsegetspaceid, synapsecreatedmroom, synapsegetroomid, synapseassignspace, synapsepushmessages
 
 name = "Get Message List"
 
@@ -12,7 +12,7 @@ actions = [
 ]
 
 recursiveset = {
-    "source": "pullmessages",
+    "source": "pullmessages_select",
     "outputlabel": "messageheaders",
     "actions": [
         synapseregister, 
@@ -25,7 +25,6 @@ recursiveset = {
         #synapsegetspaceid, 
         synapsecreatedmroom, 
         synapsegetroomid,
-        #getmessage, 
         #synapseassignspace, 
         synapsepushmessages,
     ],