From 56232cebce2e22aef104ed754c212ebc4019b1c3 Mon Sep 17 00:00:00 2001
From: bakaq <bakaq@bakaq.net>
Date: Mon, 19 Aug 2024 17:30:56 -0300
Subject: [PATCH] Migrate library integration tests to new interface

---
 .../lib_integration_test_commands.txt         | 1116 ++++++++---------
 tests/scryer_lib/main.rs                      |   15 +-
 2 files changed, 537 insertions(+), 594 deletions(-)

diff --git a/tests/scryer_lib/lib_integration_test_commands.txt b/tests/scryer_lib/lib_integration_test_commands.txt
index 153964705..52dbc7b74 100644
--- a/tests/scryer_lib/lib_integration_test_commands.txt
+++ b/tests/scryer_lib/lib_integration_test_commands.txt
@@ -107,15 +107,14 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class(X, _).
 =====result
-[{"X":"Todo"}]
+[{"bindings":{"X":"Todo"}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -230,19 +229,18 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -250,7 +248,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -258,7 +256,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -266,31 +264,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -410,19 +408,18 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -430,7 +427,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -438,7 +435,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -446,35 +443,35 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -482,7 +479,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -490,7 +487,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -498,27 +495,27 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://ready"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://ready"}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "title", Value).
 =====result
@@ -526,7 +523,7 @@ false
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -648,19 +645,18 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"},{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}},{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"},{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}},{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -668,7 +664,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -676,7 +672,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -684,27 +680,27 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://ready"},{"C":"c","Value":"todo://ready"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://ready"}},{"bindings":{"C":{"atom":"c"},"Value":"todo://ready"}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -824,11 +820,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://done"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://done"}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "title", Value).
 =====result
@@ -957,19 +952,18 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "title", Value).
 =====result
-[{"C":"c","Value":"literal://json:%7B%22author%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22timestamp%22%3A%222024-02-01T12%3A28%3A47.641Z%22%2C%22data%22%3A%22test%20title%22%2C%22proof%22%3A%7B%22key%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%23z6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22signature%22%3A%2210841c13759dcf7f36f291d3231782cfcb6455cb977ad59fc99301569f454924b03400167835f5ad5dc39ff64e193648b88645b965525f0fb66aaa73572ba602%22%2C%22valid%22%3Atrue%2C%22invalid%22%3Afalse%7D%7D"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"literal://json:%7B%22author%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22timestamp%22%3A%222024-02-01T12%3A28%3A47.641Z%22%2C%22data%22%3A%22test%20title%22%2C%22proof%22%3A%7B%22key%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%23z6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22signature%22%3A%2210841c13759dcf7f36f291d3231782cfcb6455cb977ad59fc99301569f454924b03400167835f5ad5dc39ff64e193648b88645b965525f0fb66aaa73572ba602%22%2C%22valid%22%3Atrue%2C%22invalid%22%3Afalse%7D%7D"}}]
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":[""]}]
+[{"bindings":{"C":{"atom":"c"},"Value":[]}}]
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":[""]}]
+[{"bindings":{"C":{"atom":"c"},"Value":[]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1099,11 +1093,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":["literal://string:comment%201"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:comment%201"]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1238,11 +1231,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":["literal://string:comment%201","literal://string:comment%202"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:comment%201","literal://string:comment%202"]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1367,11 +1359,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":[""]}]
+[{"bindings":{"C":{"atom":"c"},"Value":[]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1501,11 +1492,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":["literal://string:new%20comment%201"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:new%20comment%201"]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1640,35 +1630,34 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:construct%20test", "comments", Value).
 =====result
-[{"C":"c","Value":["literal://string:new%20comment%201","literal://string:new%20comment%202"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:new%20comment%201","literal://string:new%20comment%202"]}}]
 =====query
 subject_class("Todo", C), instance(C, X).
 =====result
-[{"C":"c","X":"literal://string:get%20proxy%20test"},{"C":"c","X":"literal://string:construct%20test"}]
+[{"bindings":{"C":{"atom":"c"},"X":"literal://string:get%20proxy%20test"}},{"bindings":{"C":{"atom":"c"},"X":"literal://string:construct%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -1676,7 +1665,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -1684,7 +1673,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -1692,31 +1681,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://done"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://done"}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), collection(C, "comments"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class(Class, C), property(C, "name"), property(C, "x"), property_setter(C, "top", _).
 =====result
@@ -1728,31 +1717,31 @@ false
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), collection(C, "comments"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, X).
 =====result
-[{"C":"c","X":"literal://string:get%20proxy%20test"},{"C":"c","X":"literal://string:construct%20test"}]
+[{"bindings":{"C":{"atom":"c"},"X":"literal://string:get%20proxy%20test"}},{"bindings":{"C":{"atom":"c"},"X":"literal://string:construct%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -1760,7 +1749,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -1768,7 +1757,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -1776,35 +1765,35 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://done"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://done"}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -1944,27 +1933,26 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -1972,7 +1960,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -1980,7 +1968,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -1988,51 +1976,51 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2040,7 +2028,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2048,7 +2036,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2056,27 +2044,27 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:Decorated%20class%20construction%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://ready"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://ready"}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:Decorated%20class%20construction%20test", "title", Value).
 =====result
@@ -2084,7 +2072,7 @@ false
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Decorated%20class%20construction%20test", "comments", Value).
 =====result
-[{"C":"c","Value":[""]}]
+[{"bindings":{"C":{"atom":"c"},"Value":[]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -2224,15 +2212,14 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:Decorated%20class%20construction%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://review"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://review"}}]
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Decorated%20class%20construction%20test", "comments", Value).
 =====result
-[{"C":"c","Value":[""]}]
+[{"bindings":{"C":{"atom":"c"},"Value":[]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -2377,23 +2364,22 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Decorated%20class%20construction%20test", "comments", Value).
 =====result
-[{"C":"c","Value":["literal://string:new%20comment"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:new%20comment"]}}]
 =====query
 subject_class("Todo", C), instance(C, Instance).
 =====result
-[{"C":"c","Instance":"literal://string:get%20proxy%20test"},{"C":"c","Instance":"literal://string:construct%20test"},{"C":"c","Instance":"literal://string:Decorated%20class%20construction%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:get%20proxy%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:construct%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:Decorated%20class%20construction%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2401,7 +2387,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2409,7 +2395,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2417,31 +2403,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2449,7 +2435,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2457,7 +2443,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2465,31 +2451,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2497,7 +2483,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2505,7 +2491,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2513,35 +2499,35 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, Instance), property_getter(C, Instance, "state", "todo://ready").
 =====result
-[{"C":"c","Instance":"literal://string:get%20proxy%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:get%20proxy%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2549,7 +2535,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2557,7 +2543,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2565,39 +2551,39 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://ready"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://ready"}}]
 =====query
 subject_class("Todo", C), instance(C, Instance), property_getter(C, Instance, "state", "todo://done").
 =====result
-[{"C":"c","Instance":"literal://string:construct%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:construct%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2605,7 +2591,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2613,7 +2599,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2621,27 +2607,27 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:construct%20test", "state", Value).
 =====result
-[{"C":"c","Value":"todo://done"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"todo://done"}}]
 =====query
 subject_class("Todo", C), instance(C, Instance), triple("ad4m://self", _, Instance).
 =====result
@@ -2649,15 +2635,15 @@ false
 =====query
 subject_class("Todo", C), instance(C, Instance).
 =====result
-[{"C":"c","Instance":"literal://string:get%20proxy%20test"},{"C":"c","Instance":"literal://string:construct%20test"},{"C":"c","Instance":"literal://string:Decorated%20class%20construction%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:get%20proxy%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:construct%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:Decorated%20class%20construction%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2665,7 +2651,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2673,7 +2659,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2681,31 +2667,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2713,7 +2699,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2721,7 +2707,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2729,31 +2715,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2761,7 +2747,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2769,7 +2755,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2777,23 +2763,23 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -2940,19 +2926,18 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), instance(C, Instance), triple("ad4m://self", _, Instance).
 =====result
-[{"C":"c","Instance":"literal://string:get%20proxy%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:get%20proxy%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -2960,7 +2945,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -2968,7 +2953,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -2976,35 +2961,35 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, Instance).
 =====result
-[{"C":"c","Instance":"literal://string:get%20proxy%20test"},{"C":"c","Instance":"literal://string:construct%20test"},{"C":"c","Instance":"literal://string:Decorated%20class%20construction%20test"}]
+[{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:get%20proxy%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:construct%20test"}},{"bindings":{"C":{"atom":"c"},"Instance":"literal://string:Decorated%20class%20construction%20test"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:get%20proxy%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -3012,7 +2997,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -3020,7 +3005,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -3028,31 +3013,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:construct%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -3060,7 +3045,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -3068,7 +3053,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -3076,31 +3061,31 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Decorated%20class%20construction%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -3108,7 +3093,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -3116,7 +3101,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -3124,23 +3109,23 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "title", Value).
 =====result
@@ -3296,11 +3281,10 @@ collection_getter(c, Base, "likedMessages", List) :- setof(Target, (triple(Base,
 collection_adder(c, "likedMessagess", '[{action: "addLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_remover(c, "likedMessagess", '[{action: "removeLink", source: "this", predicate: "flux://entry_type", target: "value"}]').
 collection_setter(c, "likedMessagess", '[{action: "collectionSetter", source: "this", predicate: "flux://entry_type", target: "value"}]').
-
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:get%20proxy%20test", "title", Value).
 =====result
-[{"C":"c","Value":"literal://json:%7B%22author%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22timestamp%22%3A%222024-02-01T12%3A28%3A50.709Z%22%2C%22data%22%3A%22new%20title%22%2C%22proof%22%3A%7B%22key%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%23z6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22signature%22%3A%228b38bc97dfc170aba49f2b5c085051194887b1f2b12a9636f2c7442c61c1509006deeed9017701d5e3705b353e5dc5ef318497c16f2018bc3aa7e0882acff502%22%2C%22valid%22%3Atrue%2C%22invalid%22%3Afalse%7D%7D"}]
+[{"bindings":{"C":{"atom":"c"},"Value":"literal://json:%7B%22author%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22timestamp%22%3A%222024-02-01T12%3A28%3A50.709Z%22%2C%22data%22%3A%22new%20title%22%2C%22proof%22%3A%7B%22key%22%3A%22did%3Akey%3Az6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%23z6MkfCr9Wg3J5EdakDEJQM3VdSRn6nDTSwtEd1AC8V7E4Qpp%22%2C%22signature%22%3A%228b38bc97dfc170aba49f2b5c085051194887b1f2b12a9636f2c7442c61c1509006deeed9017701d5e3705b353e5dc5ef318497c16f2018bc3aa7e0882acff502%22%2C%22valid%22%3Atrue%2C%22invalid%22%3Afalse%7D%7D"}}]
 =====query
 subject_class(Class, C), property(C, "number").
 =====result
@@ -3471,16 +3455,14 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -3652,28 +3634,26 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Collection%20where%20test%20with%20prolog%20condition").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Collection%20where%20test%20with%20prolog%20condition").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -3681,7 +3661,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -3689,7 +3669,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -3697,23 +3677,23 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -3890,12 +3870,10 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test%20with%20prolog%20condition", "entries", Value).
 =====result
-[{"C":"c","Value":["literal://string:test%20message"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:test%20message"]}}]
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test%20with%20prolog%20condition", "likedMessages", Value).
 =====result
@@ -4078,20 +4056,18 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test%20with%20prolog%20condition", "likedMessages", Value).
 =====result
-[{"C":"c","Value":["literal://string:test%20message"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:test%20message"]}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -4275,28 +4251,26 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Custom%20getter%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Custom%20getter%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -4304,7 +4278,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -4312,7 +4286,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -4320,23 +4294,23 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:Custom%20getter%20test", "isLiked", Value).
 =====result
@@ -4526,12 +4500,10 @@ destructor(srksdbln, '[]').
 
 property(srksdbln, "number").
 property_getter(srksdbln, Base, "number", Value) :- triple(Base, "test://test_numer", Value).
-
-
 =====query
 subject_class("Todo", C), property_getter(C, "literal://string:Custom%20getter%20test", "isLiked", Value).
 =====result
-[{"C":"c","Value":true}]
+[{"bindings":{"C":{"atom":"c"},"Value":true}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -4741,8 +4713,6 @@ property_getter(mqvvfluy, Base, "type", Value) :- triple(Base, "ad4m://type", Va
 property(mqvvfluy, "body").
 property_getter(mqvvfluy, Base, "body", Value) :- triple(Base, "todo://state", Value).
 property_setter(mqvvfluy, "body", '[{action: "setSingleTarget", source: "this", predicate: "todo://state", target: "value"}]').
-
-
 =====query
 subject_class("Message", C), instance(C, Instance).
 =====result
@@ -4958,20 +4928,18 @@ property_getter(mqvvfluy, Base, "type", Value) :- triple(Base, "ad4m://type", Va
 property(mqvvfluy, "body").
 property_getter(mqvvfluy, Base, "body", Value) :- triple(Base, "todo://state", Value).
 property_setter(mqvvfluy, "body", '[{action: "setSingleTarget", source: "this", predicate: "todo://state", target: "value"}]').
-
-
 =====query
 subject_class("Message", C), instance(C, Instance).
 =====result
-[{"C":"mqvvfluy","Instance":"test://message"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Instance":"test://message"}}]
 =====query
 subject_class("Message", C), instance(C, "test://message").
 =====result
-[{"C":"mqvvfluy"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"}}}]
 =====query
 subject_class("Message", C), property(C, Property).
 =====result
-[{"C":"mqvvfluy","Property":"type"},{"C":"mqvvfluy","Property":"body"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"type"}},{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"body"}}]
 =====query
 subject_class("Message", C), property_resolve(C, "type").
 =====result
@@ -4983,7 +4951,7 @@ false
 =====query
 subject_class("Message", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"mqvvfluy","Property":"body","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"body","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}}]
 =====query
 subject_class("Message", C), property_resolve_language(C, "body", Language).
 =====result
@@ -5007,11 +4975,11 @@ false
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"c"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"c"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -5228,28 +5196,26 @@ property_getter(mqvvfluy, Base, "type", Value) :- triple(Base, "ad4m://type", Va
 property(mqvvfluy, "body").
 property_getter(mqvvfluy, Base, "body", Value) :- triple(Base, "todo://state", Value).
 property_setter(mqvvfluy, "body", '[{action: "setSingleTarget", source: "this", predicate: "todo://state", target: "value"}]').
-
-
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Collection%20where%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class(Class, C), property(C, "state"), property(C, "title"), property(C, "isLiked"), property_setter(C, "state", _), property_setter(C, "title", _), collection_adder(C, "commentss", _), collection_adder(C, "entriess", _), collection_adder(C, "messagess", _), collection_adder(C, "likedMessagess", _), collection_remover(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "messagess", _), collection_remover(C, "likedMessagess", _), collection_setter(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "messagess", _), collection_setter(C, "likedMessagess", _).
 =====result
-[{"C":"c","Class":"Todo"}]
+[{"bindings":{"C":{"atom":"c"},"Class":"Todo"}}]
 =====query
 subject_class("Todo", C), instance(C, "literal://string:Collection%20where%20test").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property(C, Property).
 =====result
-[{"C":"c","Property":"state"},{"C":"c","Property":"title"},{"C":"c","Property":"isLiked"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state"}},{"bindings":{"C":{"atom":"c"},"Property":"title"}},{"bindings":{"C":{"atom":"c"},"Property":"isLiked"}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "state").
 =====result
@@ -5257,7 +5223,7 @@ false
 =====query
 subject_class("Todo", C), property_resolve(C, "title").
 =====result
-[{"C":"c"}]
+[{"bindings":{"C":{"atom":"c"}}}]
 =====query
 subject_class("Todo", C), property_resolve(C, "isLiked").
 =====result
@@ -5265,7 +5231,7 @@ false
 =====query
 subject_class("Todo", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"c","Property":"state","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"},{"C":"c","Property":"title","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Property":"state","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Property":"title","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://has_title\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), property_resolve_language(C, "state", Language).
 =====result
@@ -5273,23 +5239,23 @@ false
 =====query
 subject_class("Todo", C), property_resolve_language(C, "title", Language).
 =====result
-[{"C":"c","Language":"literal"}]
+[{"bindings":{"C":{"atom":"c"},"Language":"literal"}}]
 =====query
 subject_class("Todo", C), collection(C, Collection).
 =====result
-[{"C":"c","Collection":"comments"},{"C":"c","Collection":"entries"},{"C":"c","Collection":"messages"},{"C":"c","Collection":"likedMessages"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"comments"}},{"bindings":{"C":{"atom":"c"},"Collection":"entries"}},{"bindings":{"C":{"atom":"c"},"Collection":"messages"}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessages"}}]
 =====query
 subject_class("Todo", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]","C":"c","Collection":"commentss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"messagess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]","C":"c","Collection":"likedMessagess"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"commentss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"messagess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},"C":{"atom":"c"},"Collection":"likedMessagess"}}]
 =====query
 subject_class("Todo", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"c","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====query
 subject_class("Todo", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"c","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"},{"C":"c","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"messagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"},{"C":"c","Collection":"likedMessagess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"c"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"todo://comment\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"messagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"c"},"Collection":"likedMessagess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"flux://entry_type\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -5508,12 +5474,10 @@ property_getter(mqvvfluy, Base, "type", Value) :- triple(Base, "ad4m://type", Va
 property(mqvvfluy, "body").
 property_getter(mqvvfluy, Base, "body", Value) :- triple(Base, "todo://state", Value).
 property_setter(mqvvfluy, "body", '[{action: "setSingleTarget", source: "this", predicate: "todo://state", target: "value"}]').
-
-
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test", "entries", Value).
 =====result
-[{"C":"c","Value":["literal://string:test%20message"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:test%20message"]}}]
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test", "messages", Value).
 =====result
@@ -5521,11 +5485,11 @@ false
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "body"), property_setter(C, "body", _).
 =====result
-[{"C":"mqvvfluy","Class":"Message"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Class":"Message"}}]
 =====query
 subject_class("Message", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://message\"}, {action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]","C":"mqvvfluy"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://message\"}, {action: \"addLink\", source: \"this\", predicate: \"todo://state\", target: \"todo://ready\"}]"},"C":{"atom":"mqvvfluy"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -5748,28 +5712,26 @@ property_getter(mqvvfluy, Base, "type", Value) :- triple(Base, "ad4m://type", Va
 property(mqvvfluy, "body").
 property_getter(mqvvfluy, Base, "body", Value) :- triple(Base, "todo://state", Value).
 property_setter(mqvvfluy, "body", '[{action: "setSingleTarget", source: "this", predicate: "todo://state", target: "value"}]').
-
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "body"), property_setter(C, "body", _).
 =====result
-[{"C":"mqvvfluy","Class":"Message"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Class":"Message"}}]
 =====query
 subject_class("Message", C), instance(C, "literal://string:test%20message").
 =====result
-[{"C":"mqvvfluy"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"}}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "body"), property_setter(C, "body", _).
 =====result
-[{"C":"mqvvfluy","Class":"Message"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Class":"Message"}}]
 =====query
 subject_class("Message", C), instance(C, "literal://string:test%20message").
 =====result
-[{"C":"mqvvfluy"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"}}}]
 =====query
 subject_class("Message", C), property(C, Property).
 =====result
-[{"C":"mqvvfluy","Property":"type"},{"C":"mqvvfluy","Property":"body"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"type"}},{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"body"}}]
 =====query
 subject_class("Message", C), property_resolve(C, "type").
 =====result
@@ -5781,7 +5743,7 @@ false
 =====query
 subject_class("Message", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"mqvvfluy","Property":"body","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"mqvvfluy"},"Property":"body","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"todo://state\", target: \"value\"}]"}}}]
 =====query
 subject_class("Message", C), property_resolve_language(C, "body", Language).
 =====result
@@ -5805,7 +5767,7 @@ false
 =====query
 subject_class("Todo", C), collection_getter(C, "literal://string:Collection%20where%20test", "messages", Value).
 =====result
-[{"C":"c","Value":["literal://string:test%20message"]}]
+[{"bindings":{"C":{"atom":"c"},"Value":["literal://string:test%20message"]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -6072,19 +6034,18 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]","C":"nzkpcwbu"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]"},"C":{"atom":"nzkpcwbu"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -6356,27 +6317,26 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -6392,7 +6352,7 @@ false
 =====query
 subject_class("Recipe", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"nzkpcwbu","Property":"name","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"},{"C":"nzkpcwbu","Property":"local","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -6404,19 +6364,19 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"ingredientss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]","C":"nzkpcwbu","Collection":"commentss"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"commentss"}}]
 =====query
 subject_class("Recipe", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -6690,15 +6650,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), property_setter(C, "name", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -6978,7 +6937,6 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), property_setter(C, "entries", Setter).
 =====result
@@ -6990,11 +6948,11 @@ false
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7002,7 +6960,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -7010,7 +6968,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -7022,11 +6980,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -7034,19 +6992,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7054,7 +7012,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -7062,7 +7020,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -7074,11 +7032,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -7086,15 +7044,15 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), property_setter(C, "name", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -7374,7 +7332,6 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), property_setter(C, "entries", Setter).
 =====result
@@ -7386,11 +7343,11 @@ false
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7398,7 +7355,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -7406,7 +7363,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test1"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test1"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -7418,11 +7375,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -7430,19 +7387,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7450,7 +7407,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -7458,7 +7415,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test1"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test1"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -7470,11 +7427,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -7482,7 +7439,7 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "className"), property(C, "generateSDNA").
 =====result
@@ -7490,19 +7447,19 @@ false
 =====query
 subject_class("Recipe", C), instance(C, X).
 =====result
-[{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20test"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7510,7 +7467,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -7518,7 +7475,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test1"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test1"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -7530,11 +7487,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -7542,19 +7499,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]","C":"nzkpcwbu"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]"},"C":{"atom":"nzkpcwbu"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -7835,27 +7792,26 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -7871,7 +7827,7 @@ false
 =====query
 subject_class("Recipe", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"nzkpcwbu","Property":"name","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"},{"C":"nzkpcwbu","Property":"local","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -7883,19 +7839,19 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"ingredientss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]","C":"nzkpcwbu","Collection":"commentss"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"commentss"}}]
 =====query
 subject_class("Recipe", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -8178,15 +8134,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), property_setter(C, "name", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -8475,7 +8430,6 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), property_setter(C, "entries", Setter).
 =====result
@@ -8483,7 +8437,7 @@ false
 =====query
 subject_class("Recipe", C), collection_setter(C, "commentss", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -8772,15 +8726,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -8788,7 +8741,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -8796,7 +8749,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -8808,11 +8761,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====result
@@ -8820,19 +8773,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -8840,7 +8793,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -8848,7 +8801,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -8860,11 +8813,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====result
@@ -8872,19 +8825,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]","C":"nzkpcwbu"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]"},"C":{"atom":"nzkpcwbu"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -9178,27 +9131,26 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -9214,7 +9166,7 @@ false
 =====query
 subject_class("Recipe", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"nzkpcwbu","Property":"name","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"},{"C":"nzkpcwbu","Property":"local","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -9226,19 +9178,19 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"ingredientss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]","C":"nzkpcwbu","Collection":"commentss"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"commentss"}}]
 =====query
 subject_class("Recipe", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -9534,15 +9486,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), property_setter(C, "name", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -9844,7 +9795,6 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), property_setter(C, "entries", Setter).
 =====result
@@ -9856,7 +9806,7 @@ false
 =====query
 subject_class("Recipe", C), property_setter(C, "local", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "local", Language).
 =====result
@@ -10160,15 +10110,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10176,7 +10125,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10184,7 +10133,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://locallink"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://locallink"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10192,15 +10141,15 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "local", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "ingredients", Value).
 =====result
@@ -10208,19 +10157,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10228,7 +10177,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10236,7 +10185,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://locallink"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://locallink"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10244,15 +10193,15 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "local", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "ingredients", Value).
 =====result
@@ -10260,7 +10209,7 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "className"), property(C, "generateSDNA").
 =====result
@@ -10268,27 +10217,27 @@ false
 =====query
 findall([Timestamp, Base], (subject_class("Recipe", C), instance(C, Base), link("ad4m://self", Predicate, Base, Timestamp, Author)), AllData), sort(AllData, SortedData), length(SortedData, DataLength).
 =====result
-[{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"DataLength":3,"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}]
+[{"bindings":{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"DataLength":3,"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}}]
 =====query
 findall([Timestamp, Base], (subject_class("Recipe", C), instance(C, Base), link("ad4m://self", Predicate, Base, Timestamp, Author)), AllData), sort(AllData, SortedData), reverse(SortedData, ReverseSortedData), paginate(ReverseSortedData, 1, 2, PageData).
 =====result
-[{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"PageData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"]],"ReverseSortedData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790532420,"literal://string:Active%20record%20implementation%20test"]],"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}]
+[{"bindings":{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"PageData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"]],"ReverseSortedData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790532420,"literal://string:Active%20record%20implementation%20test"]],"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10298,9 +10247,9 @@ subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10308,11 +10257,11 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://locallink"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://locallink"}}]
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10320,7 +10269,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "local", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "local", Value).
 =====result
@@ -10328,15 +10277,15 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "entries", Value).
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====query
@@ -10348,11 +10297,11 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "className"), property(C, "generateSDNA").
 =====result
@@ -10360,23 +10309,23 @@ false
 =====query
 findall([Timestamp, Base], (subject_class("Recipe", C), instance(C, Base), link("ad4m://self", Predicate, Base, Timestamp, Author)), AllData), sort(AllData, SortedData), length(SortedData, DataLength).
 =====result
-[{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"DataLength":3,"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}]
+[{"bindings":{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"DataLength":3,"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}}]
 =====query
 findall([Timestamp, Base], (subject_class("Recipe", C), instance(C, Base), link("ad4m://self", Predicate, Base, Timestamp, Author)), AllData), sort(AllData, SortedData), reverse(SortedData, ReverseSortedData), paginate(ReverseSortedData, 2, 1, PageData).
 =====result
-[{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"PageData":[[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"]],"ReverseSortedData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790532420,"literal://string:Active%20record%20implementation%20test"]],"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}]
+[{"bindings":{"AllData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]],"PageData":[[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"]],"ReverseSortedData":[[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790532420,"literal://string:Active%20record%20implementation%20test"]],"SortedData":[[1706790532420,"literal://string:Active%20record%20implementation%20test"],[1706790533626,"literal://string:Active%20record%20implementation%20collection%20test"],[1706790534369,"literal://string:Active%20record%20implementation%20test%20local%20link"]]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10384,7 +10333,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10392,7 +10341,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10404,11 +10353,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====result
@@ -10416,7 +10365,7 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "className"), property(C, "generateSDNA").
 =====result
@@ -10424,19 +10373,19 @@ false
 =====query
 subject_class("Recipe", C), instance(C, X).
 =====result
-[{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20test"},{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20collection%20test"},{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20test%20local%20link"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20test"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20collection%20test"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20test%20local%20link"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10444,7 +10393,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10452,7 +10401,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test1"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test1"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10464,11 +10413,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "ingredients", Value).
 =====result
@@ -10476,19 +10425,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10496,7 +10445,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10504,7 +10453,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10516,11 +10465,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====result
@@ -10528,19 +10477,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10548,7 +10497,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10556,7 +10505,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://locallink"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://locallink"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10564,15 +10513,15 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "local", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "ingredients", Value).
 =====result
@@ -10580,15 +10529,15 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), destructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"removeLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]","C":"nzkpcwbu"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]"},"C":{"atom":"nzkpcwbu"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -10886,7 +10835,6 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "className"), property(C, "generateSDNA").
 =====result
@@ -10894,19 +10842,19 @@ false
 =====query
 subject_class("Recipe", C), instance(C, X).
 =====result
-[{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20collection%20test"},{"C":"nzkpcwbu","X":"literal://string:Active%20record%20implementation%20test%20local%20link"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20collection%20test"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"X":"literal://string:Active%20record%20implementation%20test%20local%20link"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10914,7 +10862,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10922,7 +10870,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10934,11 +10882,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "ingredients", Value).
 =====result
@@ -10946,19 +10894,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20test%20local%20link").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -10966,7 +10914,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -10974,7 +10922,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://locallink"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://locallink"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -10982,15 +10930,15 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "local", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://test"}}]
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "ingredients", Value).
 =====result
@@ -10998,19 +10946,19 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20test%20local%20link", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":[""]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":[]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), constructor(C, Actions).
 =====result
-[{"Actions":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]","C":"nzkpcwbu"}]
+[{"bindings":{"Actions":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"ad4m://type\", target: \"ad4m://recipe\"}]"},"C":{"atom":"nzkpcwbu"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -11313,27 +11261,26 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -11349,7 +11296,7 @@ false
 =====query
 subject_class("Recipe", C), property_setter(C, Property, Setter).
 =====result
-[{"C":"nzkpcwbu","Property":"name","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"},{"C":"nzkpcwbu","Property":"local","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local","Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://local\", target: \"value\", local: true}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -11361,19 +11308,19 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_adder(C, Collection, Adder).
 =====result
-[{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"entriess"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]","C":"nzkpcwbu","Collection":"ingredientss"},{"Adder":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]","C":"nzkpcwbu","Collection":"commentss"}]
+[{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"entriess"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss"}},{"bindings":{"Adder":{"atom":"[{action: \"addLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"},"C":{"atom":"nzkpcwbu"},"Collection":"commentss"}}]
 =====query
 subject_class("Recipe", C), collection_remover(C, Collection, Remover).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Remover":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Remover":{"atom":"[{action: \"removeLink\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), collection_setter(C, Collection, Setter).
 =====result
-[{"C":"nzkpcwbu","Collection":"entriess","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"ingredientss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"},{"C":"nzkpcwbu","Collection":"commentss","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entriess","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredientss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"commentss","Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -11678,15 +11625,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), property_setter(C, "name", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"setSingleTarget\", source: \"this\", predicate: \"recipe://name\", target: \"value\"}]"}}}]
 =====query
 subject_class("Recipe", C), property_resolve_language(C, "name", Language).
 =====result
@@ -11997,11 +11943,10 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), collection_setter(C, "entriess", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://entries\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -12313,11 +12258,10 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), collection_setter(C, "commentss", Setter).
 =====result
-[{"C":"nzkpcwbu","Setter":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Setter":{"atom":"[{action: \"collectionSetter\", source: \"this\", predicate: \"recipe://comment\", target: \"value\"}]"}}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -12633,15 +12577,14 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -12649,7 +12592,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -12657,7 +12600,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -12669,11 +12612,11 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["literal://string:test%20recipes"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["literal://string:test%20recipes"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "ingredients", Value).
 =====result
@@ -12681,7 +12624,7 @@ false
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====consult
 :- discontiguous(triple/3).
 :- discontiguous(link/5).
@@ -12999,19 +12942,18 @@ collection_getter(nzkpcwbu, Base, "comments", List) :- findall(C, triple(Base, "
 collection_adder(nzkpcwbu, "commentss", '[{action: "addLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_remover(nzkpcwbu, "commentss", '[{action: "removeLink", source: "this", predicate: "recipe://comment", target: "value"}]').
 collection_setter(nzkpcwbu, "commentss", '[{action: "collectionSetter", source: "this", predicate: "recipe://comment", target: "value"}]').
-
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -13019,7 +12961,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -13027,7 +12969,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -13039,31 +12981,31 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["literal://string:test%20recipes"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["literal://string:test%20recipes"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "ingredients", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["literal://string:test%20recipes"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["literal://string:test%20recipes"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
 =====query
 subject_class(Class, C), property(C, "type"), property(C, "name"), property(C, "local"), property_setter(C, "name", _), property_setter(C, "local", _), collection_adder(C, "entriess", _), collection_adder(C, "ingredientss", _), collection_adder(C, "commentss", _), collection_remover(C, "entriess", _), collection_remover(C, "ingredientss", _), collection_remover(C, "commentss", _), collection_setter(C, "entriess", _), collection_setter(C, "ingredientss", _), collection_setter(C, "commentss", _).
 =====result
-[{"C":"nzkpcwbu","Class":"Recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Class":"Recipe"}}]
 =====query
 subject_class("Recipe", C), instance(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where").
 =====result
-[{"C":"nzkpcwbu"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"}}}]
 =====query
 subject_class("Recipe", C), property(C, Property).
 =====result
-[{"C":"nzkpcwbu","Property":"type"},{"C":"nzkpcwbu","Property":"name"},{"C":"nzkpcwbu","Property":"local"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"type"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"name"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Property":"local"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "type").
 =====result
@@ -13071,7 +13013,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "type", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"ad4m://recipe"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"ad4m://recipe"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "name").
 =====result
@@ -13079,7 +13021,7 @@ false
 =====query
 subject_class("Recipe", C), property_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "name", Value).
 =====result
-[{"C":"nzkpcwbu","Value":"recipe://collection_test"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":"recipe://collection_test"}}]
 =====query
 subject_class("Recipe", C), property_resolve(C, "local").
 =====result
@@ -13091,16 +13033,16 @@ false
 =====query
 subject_class("Recipe", C), collection(C, Collection).
 =====result
-[{"C":"nzkpcwbu","Collection":"entries"},{"C":"nzkpcwbu","Collection":"ingredients"},{"C":"nzkpcwbu","Collection":"comments"}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"entries"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"ingredients"}},{"bindings":{"C":{"atom":"nzkpcwbu"},"Collection":"comments"}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "entries", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["literal://string:test%20recipes"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["literal://string:test%20recipes"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "ingredients", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["literal://string:test%20recipes"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["literal://string:test%20recipes"]}}]
 =====query
 subject_class("Recipe", C), collection_getter(C, "literal://string:Active%20record%20implementation%20collection%20test%20with%20where", "comments", Value).
 =====result
-[{"C":"nzkpcwbu","Value":["recipe://test","recipe://test1"]}]
+[{"bindings":{"C":{"atom":"nzkpcwbu"},"Value":["recipe://test","recipe://test1"]}}]
diff --git a/tests/scryer_lib/main.rs b/tests/scryer_lib/main.rs
index 8a675e0fa..5bf83de1b 100644
--- a/tests/scryer_lib/main.rs
+++ b/tests/scryer_lib/main.rs
@@ -1,10 +1,9 @@
-use serde_json;
 use scryer_prolog::machine::Machine;
+use serde_json;
 
 #[test]
 #[cfg_attr(miri, ignore = "it takes too long to run")]
-#[ignore = "uses old flawed interface"]
-fn integration_test() {
+fn lib_integration_test() {
     let mut machine = Machine::new_lib();
 
     // File with test commands, i.e. program code to consult and queries to run
@@ -38,11 +37,13 @@ fn integration_test() {
         } else if let Some(result) = block.strip_prefix("result") {
             i += 1;
             if let Some(Ok(ref last_result)) = last_result {
-                let _ = result;
-                let _ = i;
-                let _ = last_result;
+                let last_result_str = serde_json::to_string(last_result).unwrap();
                 //println!("\n\n=====Result No. {i}=======\n{last_result}\n===============");
-                //assert_eq!(last_result.to_string(), result.to_string().trim(),)
+                println!("=====Result No. {i}=======");
+                println!("{last_result_str}");
+                println!("===============");
+                println!();
+                assert_eq!(last_result_str, result.to_string().trim());
             }
         }
     }