diff --git a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgIndex.kt b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgIndex.kt
index f83c4c365..0ac287908 100644
--- a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgIndex.kt
+++ b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgIndex.kt
@@ -241,7 +241,7 @@ ${if (addFillFactor) "WITH (fillfactor="+if (table.isVolatile) "65)" else "100)"
             self.createFn = Fx2 { conn, table ->
                 conn.execute(
                     self.sql(
-                        """gin (naksha_tags($c_flags,$c_tags), $c_id, $c_txn, $c_uid, $c_tuple_number, $c_flags)""",
+                        """gin (naksha_tags($c_tags,$c_flags), $c_id, $c_txn, $c_uid, $c_tuple_number, $c_flags)""",
                         table, unique = false, addFillFactor = false
                     )
                 ).close()
diff --git a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgUtil.kt b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgUtil.kt
index e0447c54f..341fd3f4f 100644
--- a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgUtil.kt
+++ b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgUtil.kt
@@ -4,10 +4,7 @@ package naksha.psql
 
 import naksha.base.*
 import naksha.geo.SpGeometry
-import naksha.jbon.IDictManager
-import naksha.jbon.JbDictionary
-import naksha.jbon.JbEncoder
-import naksha.jbon.JbFeatureDecoder
+import naksha.jbon.*
 import naksha.model.*
 import naksha.model.FeatureEncoding.FeatureEncoding_C.JBON
 import naksha.model.FeatureEncoding.FeatureEncoding_C.JBON_GZIP
@@ -262,7 +259,8 @@ class PgUtil private constructor() {
                 byteArray = encoded.encodeToByteArray()
             } else if (encoding == TagsEncoding.JBON || encoding == TagsEncoding.JBON_GZIP) {
                 val encoder = JbEncoder(dict)
-                byteArray = encoder.buildFeatureFromMap(tags)
+                encoder.encodeMap(tags)
+                byteArray = encoder.buildFeature(null, FEATURE_VARIANT_TAGS)
             }
             if (flags.tagsGzip() && byteArray != null) byteArray = Platform.gzipDeflate(byteArray)
             return byteArray
diff --git a/here-naksha-lib-psql/src/jvmMain/resources/naksha.sql b/here-naksha-lib-psql/src/jvmMain/resources/naksha.sql
index 29c3c58c4..155dab65f 100644
--- a/here-naksha-lib-psql/src/jvmMain/resources/naksha.sql
+++ b/here-naksha-lib-psql/src/jvmMain/resources/naksha.sql
@@ -21,6 +21,57 @@
 -- PARALLEL SAFE indicates that the function is safe to run in parallel mode without restriction.
 SET SESSION search_path TO ${schemaIdent}, topology, hint_plan, public;
 
+CREATE OR REPLACE FUNCTION buf2bytes (in buffers int, in decimals int default 2, out bytes text)
+LANGUAGE 'sql'
+IMMUTABLE
+PARALLEL SAFE
+SET search_path FROM CURRENT
+AS $$
+  with settings as (
+    select current_setting('block_size')::numeric as bs
+  ), data as (
+    select
+      buffers::numeric * bs / 1024 as kib,
+      floor(log(1024, buffers::numeric * bs / 1024)) + 1 as log,
+      bs
+    from settings
+  ), prep as (
+    select
+      case
+        when log <= 8 then round((kib / 2 ^ (10 * (log - 1)))::numeric, decimals)
+        else buffers * bs
+      end as value,
+      case log -- see https://en.wikipedia.org/wiki/Byte#Multiple-byte_units
+        when 1 then 'KiB'
+        when 2 then 'MiB'
+        when 3 then 'GiB'
+        when 4 then 'TiB'
+        when 5 then 'PiB'
+        when 6 then 'EiB'
+        when 7 then 'ZiB'
+        when 8 then 'YiB'
+        else 'B'
+      end as unit
+    from data
+  )
+  select format('%s %s', value, unit)
+  from prep;
+$$;
+
+CREATE OR REPLACE FUNCTION bytea_concat(a bytea, b bytea) RETURNS bytea
+LANGUAGE 'plpgsql'
+IMMUTABLE
+PARALLEL SAFE
+AS $$ BEGIN
+  RETURN a || b;
+END $$;
+
+CREATE AGGREGATE bytea_agg(bytea) (
+    SFUNC = bytea_concat,
+    STYPE = bytea,
+    INITCOND = ''
+);
+
 -- Returns the packed Naksha extension version: 16 bit major, 16 bit minor, 16 bit revision, 8 bit pre-release tag, 8 bit pre-release version.
 CREATE OR REPLACE FUNCTION naksha_version() RETURNS int8
 LANGUAGE 'plpgsql'
@@ -56,460 +107,33 @@ AS $$ BEGIN
   RETURN ${defaultSchemaLiteral};
 END $$;
 
-CREATE OR REPLACE FUNCTION naksha_start_session(app_name text, stream_id text, app_id text, author text)
-RETURNS void
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  if (typeof require !== "function") {
-    plv8.find_function("es_modules_init")();
-    if (typeof require !== "function") {
-      plv8.elog(ERROR, "Failed to initialize module system");
-    }
-  }
-  let naksha = require("naksha");
-  //naksha.JsPlv8Env.Companion.initialize();
-  let jb = require("jbon");
-  // always create new session as previous one could be for different storage or schema
-  //session = new naksha.NakshaSession(new naksha.JsPlv8Sql(), '${schema}', '${storage_id}', app_name, stream_id, app_id, author);
-  //jb.JbSession.Companion.threadLocal.set(session);
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_clear_session() RETURNS void
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let session = jb.JbSession.Companion.threadLocal.get();
-  if (session != null) {
-    session.clear();
-  }
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_txn() RETURNS int8
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  return session.txn().value;
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_trigger_before() RETURNS trigger
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  let mapi = require("jbon").Jb.map;
-  let t = new naksha.PgTrigger(
-    TG_OP, TG_NAME, TG_WHEN, TG_LEVEL, TG_RELID, TG_TABLE_NAME, TG_TABLE_SCHEMA,
-    mapi.isMap(NEW) ? mapi.asMap(NEW) : null,
-    mapi.isMap(OLD) ? mapi.asMap(OLD) : null
-  );
-  session.triggerBefore(t);
-  if (TG_OP == "INSERT" || TG_OP == "UPDATE") {
-    return NEW
-  }
-  return OLD;
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_trigger_after() RETURNS trigger
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  let mapi = require("jbon").Jb.map;
-  let t = new naksha.PgTrigger(
-    TG_OP, TG_NAME, TG_WHEN, TG_LEVEL, TG_RELID, TG_TABLE_NAME, TG_TABLE_SCHEMA,
-    mapi.isMap(NEW) ? mapi.asMap(NEW) : null,
-    mapi.isMap(OLD) ? mapi.asMap(OLD) : null
-  );
-  session.triggerAfter(t);
-  if (TG_OP == "INSERT" || TG_OP == "UPDATE") {
-    return NEW
-  }
-  return OLD;
-$$;
-
--- TODO: If needed, create a naksha_write_unordered_features!
--- This function expects that operations are ordered by id to avoid deadlocks
--- CREATED, UPDATED -> return null for tags, feature, flags and geo
--- DELETED, PURGED, ERROR -> return all data
-CREATE OR REPLACE FUNCTION naksha_write_features(
-  collection_id text,
-  ops bytea[], -- XyzOp (op, id, uuid)
-  features bytea[], -- JbFeature (without XZY namespace)
-  geometries_type int2[],
-  geometries_bytes bytea[], -- WKB, EWKB, TWKB
-  tags bytea[] -- XyzTags
-) RETURNS TABLE (op text, id text, xyz bytea, tags bytea, feature bytea, flags int4, geo bytea, err_no text, err_msg text)
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  session.writeFeatures(collection_id, ops, features, geometries_type, geometries_bytes, tags, true);
-$$;
-
--- CREATED, UPDATED -> return null for tags, feature, flags and geo
--- DELETED, PURGED, ERROR -> return all data
-CREATE OR REPLACE FUNCTION naksha_write_collections(
-  ops bytea[], -- XyzOp (op, id, uuid)
-  features bytea[], -- JbFeature (without XZY namespace)
-  geometries_type int2[],
-  geometries_bytes bytea[], -- WKB, EWKB, TWKB
-  tags bytea[] -- XyzTags
-) RETURNS TABLE (op text, id text, xyz bytea, tags bytea, feature bytea, flags int4, geo bytea, err_no text, err_msg text)
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  session.writeCollections(ops, features, geometries_type, geometries_bytes, tags);
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_set_stack_trace(enable bool) RETURNS void
-LANGUAGE 'plv8'
-VOLATILE
-PARALLEL UNSAFE
-SET search_path FROM CURRENT
-AS $$
-  require("naksha").Static.PRINT_STACK_TRACES = enable;
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_err_no() RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  return session.errNo;
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_err_msg() RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  return session.errMsg;
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_partition_number(id text, partition_count int4) RETURNS int4
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  return require("naksha").Static.getInstance().partitionNumber(id, partition_count);
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_partition_id(id text, partition_count int4) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  return require("naksha").Static.partitionNameForId(id, partition_count);
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_hst_partition_id(id text, txn_next int8) RETURNS int4
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let jbon = require("jbon");
-  let session = naksha.NakshaSession.Companion.get();
-  return naksha.Static.hstPartitionNameForId(id, new jbon.NakshaTxn(txn_next));
-$$;
-
-CREATE OR REPLACE FUNCTION naksha_geometry_in_type(geo_type int4, geo_bytes bytea) RETURNS geometry
+CREATE OR REPLACE FUNCTION naksha_partition_number(id text) RETURNS integer
 LANGUAGE 'plpgsql'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
+IMMUTABLE PARALLEL SAFE STRICT
 AS $$
 BEGIN
-  IF geo_type = 1 THEN
-    RETURN ST_GeomFromWKB(geo_bytes);
-  ELSIF geo_type = 2 THEN
-    RETURN ST_GeomFromEWKB(geo_bytes);
-  ELSIF geo_type = 3 THEN
-    RETURN ST_GeomFromTWKB(geo_bytes);
-  ELSE
-    RETURN null;
-  END IF;
-END;
-$$;
+  RETURN get_byte(digest(id,'md5'),0);
+END $$;
 
-CREATE OR REPLACE FUNCTION naksha_geometry(flags int, geo_bytes bytea) RETURNS geometry
+CREATE OR REPLACE FUNCTION naksha_partition_number(tuple_number bytea) RETURNS integer
 LANGUAGE 'plpgsql'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
+IMMUTABLE PARALLEL SAFE STRICT
 AS $$
 BEGIN
-  return naksha_geometry_in_type(naksha_geo_type(flags),geo_bytes);
-END;
-$$;
-
-CREATE OR REPLACE FUNCTION jsonb_to_op(op jsonb) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let builder = jb.XyzBuilder.Companion.create();
-  let opCode = jb.XyzOp.Companion.getOpCode(op["op"]);
-  return builder.buildXyzOp(opCode, op["id"], op["uuid"]);
-$$;
-
-CREATE OR REPLACE FUNCTION json_to_op(op_json text) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let builder = jb.XyzBuilder.Companion.create();
-  let op = jb.Jb.env.parse(op_json);
-  let opCode = jb.XyzOp.Companion.getOpCode(op["op"]);
-  return builder.buildXyzOp(opCode, op["id"], op["uuid"]);
-$$;
-
-CREATE OR REPLACE FUNCTION op_to_jsonb(op bytea) RETURNS jsonb
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzOp = new jb.XyzOp();
-  xyzOp.mapBytes(op);
-  return xyzOp.toIMap();
-$$;
-
-CREATE OR REPLACE FUNCTION op_to_json(op bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzOp = new jb.XyzOp();
-  xyzOp.mapBytes(op);
-  return jb.Jb.env.stringify(xyzOp.toIMap());
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_created_at(xyz bytea) RETURNS int8
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.createdAt();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_updated_at(xyz bytea) RETURNS int8
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.updatedAt();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_txn(xyz bytea) RETURNS int8
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.txn().value;
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_version(xyz bytea) RETURNS int4
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.version();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_extent(xyz bytea) RETURNS int8
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.extent();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_author(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.author();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_author_ts(xyz bytea) RETURNS int8
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.authorTs();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_app_id(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.appId();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_uuid(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.uuid();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_puuid(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.puuid();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_action(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.actionAsString();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_grid(xyz bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  return xyzNs.grid();
-$$;
-
-CREATE OR REPLACE FUNCTION xyz_to_jsonb(xyz bytea, tags bytea) RETURNS jsonb
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let jb = require("jbon");
-  let session = naksha.NakshaSession.Companion.get();
-  let xyzNs = new jb.XyzNs();
-  xyzNs.mapBytes(xyz);
-  let xyzTags = new jb.XyzTags();
-  xyzTags.mapBytes(tags);
-  return xyzNs.toIMap(session.storageId, xyzTags.isMapped() ? xyzTags.tagsArray() : null);
-$$;
+  RETURN get_byte(tuple_number,7);
+END $$;
 
--- query like:
--- where tags_to_jsonb(tags) @? '$.x?(@ starts with "Hello")'
--- where tags_to_jsonb(tags) @? '$.y?(@ >= 500)'
--- where tags_to_jsonb(tags) d @? '$.crid?(@ starts with "234")'
--- where tags_to_jsonb(tags) d @? '$.grid?(@ starts with "234")'
--- See:
--- https://www.postgresql.org/docs/16/functions-json.html#FUNCTIONS-SQLJSON-PATH
--- https://support.smartbear.com/alertsite/docs/monitors/api/endpoint/jsonpath.html
--- https://goessner.net/articles/JsonPath/
-CREATE OR REPLACE FUNCTION tags_to_jsonb(tags bytea) RETURNS jsonb
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
+CREATE OR REPLACE FUNCTION naksha_partition_number(store_number bigint) RETURNS integer
+LANGUAGE 'plpgsql'
+IMMUTABLE PARALLEL SAFE STRICT
 AS $$
-  if (tags == null) return {};
-  let jb = require("jbon");
-  let xyzTags = new jb.XyzTags();
-  xyzTags.mapBytes(tags);
-  return xyzTags.tagsMap();
-$$;
+BEGIN
+  RETURN store_number & 255;
+END $$;
 
 CREATE OR REPLACE FUNCTION naksha_jbon_feature_to_json(jbon bytea) RETURNS json
 LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
+IMMUTABLE PARALLEL SAFE STRICT
 SET search_path FROM CURRENT
 AS $$
   if (typeof require !== "function") {
@@ -527,136 +151,60 @@ $$;
 
 CREATE OR REPLACE FUNCTION naksha_jbon_feature_to_jsonb(jbon bytea) RETURNS jsonb
 LANGUAGE 'plpgsql'
-IMMUTABLE
-PARALLEL SAFE
+IMMUTABLE PARALLEL SAFE STRICT
 AS $$ BEGIN
   RETURN naksha_jbon_feature_to_json(jbon)::jsonb;
 END $$;
 
-CREATE OR REPLACE FUNCTION naksha_tags(flags int, tags bytea) RETURNS jsonb
+CREATE OR REPLACE FUNCTION naksha_jbon_map_to_json(jbon bytea) RETURNS json
 LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  // TODO: Implement me!
-  return {};
-$$;
-
-CREATE OR REPLACE FUNCTION jsonb_to_tags(tags_json jsonb) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
+IMMUTABLE PARALLEL SAFE STRICT
 SET search_path FROM CURRENT
 AS $$
-  // TODO: Fix me!!!
-  let jb = require("jbon");
-  let builder = jb.XyzBuilder.Companion.create();
-  let keys = Object.keys(tags_json);
-  let i = 0;
-  builder.startTags();
-  while (i < keys.length) {
-    builder.writeTag()
+  if (typeof require !== "function") {
+    plv8.find_function("es_modules_init")();
+    if (typeof require !== "function") {
+      plv8.elog(ERROR, "Failed to initialize module system");
+    }
   }
-  let opCode = jb.XyzOp.Companion.getOpCode(op["op"]);
-  return builder.buildXyzOp(opCode, op["id"], op["uuid"]);
-$$;
-
-CREATE OR REPLACE FUNCTION feature_id(feature bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  return session.getFeatureId(feature);
-$$;
-
-CREATE OR REPLACE FUNCTION feature_type(feature bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  return session.getFeatureType(feature);
-$$;
-
-CREATE OR REPLACE FUNCTION jsonb_to_feature(feature jsonb) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  return require("jbon").JbBuilder.Companion.create(1000).buildFeatureFromMap(feature);
-$$;
-
-CREATE OR REPLACE FUNCTION json_to_feature(feature text) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  return require("jbon").JbBuilder.Companion.create(1000).buildFeatureFromMap(JSON.parse(feature));
-$$;
-
-CREATE OR REPLACE FUNCTION feature_to_jsonb(feature bytea) RETURNS jsonb
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let reader = new jb.JbMapFeature();
-  reader.mapBytes(feature);
-  let map = reader.root().toIMap();
-  map["id"] = reader.id();
-  return map;
+  const { Platform } = require("naksha_base");
+  const { JbFeatureDecoder } = require("naksha_jbon");
+  let decoder = new JbFeatureDecoder();
+  decoder.mapBytes(jbon);
+  return Platform.toJSON(decoder.toMap());
 $$;
 
-CREATE OR REPLACE FUNCTION feature_to_json(feature bytea) RETURNS text
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  let jb = require("jbon");
-  let reader = new jb.JbMapFeature();
-  reader.mapBytes(feature);
-  let map = reader.root().toIMap();
-  map["id"] = reader.id();
-  return JSON.stringify(map);
-$$;
+CREATE OR REPLACE FUNCTION naksha_jbon_map_to_jsonb(jbon bytea) RETURNS jsonb
+LANGUAGE 'plpgsql'
+IMMUTABLE PARALLEL SAFE STRICT
+AS $$ BEGIN
+  RETURN naksha_jbon_map_to_json(jbon)::jsonb;
+END $$;
 
-CREATE OR REPLACE FUNCTION row_to_ns(created_at int8, updated_at int8, txn int8, action int2, version int4, author_ts int8,
- uid int4, app_id text, author text, geo_grid int4, puid int4, ptxn int8, collection_id text) RETURNS bytea
-LANGUAGE 'plv8'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
+CREATE OR REPLACE FUNCTION naksha_tags(tags bytea, flags int4) RETURNS jsonb
+LANGUAGE 'plpgsql'
+IMMUTABLE PARALLEL SAFE STRICT
 AS $$
-  let naksha = require("naksha");
-  let session = naksha.NakshaSession.Companion.get();
-  let mapi = require("jbon").Jb.map;
-  let map = mapi.newMap();
-  map["created_at"] = created_at;
-  map["updated_at"] = updated_at;
-  map["txn"] = txn;
-  map["action"] = action;
-  map["version"] = version;
-  map["author_ts"] = author_ts;
-  map["uid"] = uid;
-  map["puid"] = puid;
-  map["ptxn"] = ptxn;
-  map["app_id"] = app_id;
-  map["author"] = author;
-  map["geo_grid"] = geo_grid;
-  return session.xyzNsFromRow(collection_id, map)
-$$;
+DECLARE
+  encoding int4;
+  gzip boolean;
+BEGIN
+  encoding = (flags >> 8) & 15;
+  gzip = (encoding & 1) = 1;
+  if (gzip) then
+    tags = gunzip(tags);
+    encoding = encoding & 14;
+  end if;
+  if (encoding = 0) then -- JBON
+    return naksha_jbon_map_to_jsonb(tags);
+  elsif (encoding = 2) then -- JSON
+    return tags::text::jsonb;
+  end if;
+  -- Unknown encoding
+  return null;
+END $$;
 
-CREATE OR REPLACE FUNCTION naksha_feature(feature bytea, flags int4) RETURNS json
+CREATE OR REPLACE FUNCTION naksha_feature(feature bytea, flags int4) RETURNS jsonb
 LANGUAGE 'plpgsql'
 IMMUTABLE PARALLEL SAFE STRICT
 AS $$
@@ -671,9 +219,9 @@ BEGIN
     encoding = encoding & 14;
   end if;
   if (encoding = 0) then -- JBON
-    return naksha_jbon_feature_to_json(feature);
+    return naksha_jbon_feature_to_jsonb(feature);
   elsif (encoding = 2) then -- JSON
-    return feature::text::json;
+    return feature::text::jsonb;
   end if;
   -- Unknown encoding
   return null;
@@ -714,57 +262,6 @@ IMMUTABLE PARALLEL SAFE STRICT
 SET search_path FROM CURRENT
 AS $$
 BEGIN
-  RETURN ST_GeomFromTWKB(geo);
+  RETURN ST_GeomFromTWKB(ref_point);
 END;
 $$;
-
-CREATE OR REPLACE FUNCTION buf2bytes (in buffers int, in decimals int default 2, out bytes text)
-LANGUAGE 'sql'
-IMMUTABLE
-PARALLEL SAFE
-SET search_path FROM CURRENT
-AS $$
-  with settings as (
-    select current_setting('block_size')::numeric as bs
-  ), data as (
-    select
-      buffers::numeric * bs / 1024 as kib,
-      floor(log(1024, buffers::numeric * bs / 1024)) + 1 as log,
-      bs
-    from settings
-  ), prep as (
-    select
-      case
-        when log <= 8 then round((kib / 2 ^ (10 * (log - 1)))::numeric, decimals)
-        else buffers * bs
-      end as value,
-      case log -- see https://en.wikipedia.org/wiki/Byte#Multiple-byte_units
-        when 1 then 'KiB'
-        when 2 then 'MiB'
-        when 3 then 'GiB'
-        when 4 then 'TiB'
-        when 5 then 'PiB'
-        when 6 then 'EiB'
-        when 7 then 'ZiB'
-        when 8 then 'YiB'
-        else 'B'
-      end as unit
-    from data
-  )
-  select format('%s %s', value, unit)
-  from prep;
-$$;
-
-CREATE OR REPLACE FUNCTION bytea_concat(a bytea, b bytea) RETURNS bytea
-LANGUAGE 'plpgsql'
-IMMUTABLE
-PARALLEL SAFE
-AS $$ BEGIN
-  RETURN a || b;
-END $$;
-
-CREATE AGGREGATE bytea_agg(bytea) (
-    SFUNC = bytea_concat,
-    STYPE = bytea,
-    INITCOND = ''
-);