diff --git a/11-make-stateless.sql b/11-make-stateless.sql
new file mode 100644
index 000000000..f7fefc0d9
--- /dev/null
+++ b/11-make-stateless.sql
@@ -0,0 +1,95 @@
+drop trigger "insert_account"  on accounts;
+drop trigger "update_account"  on accounts;
+drop trigger "insert_transaction"  on transactions;
+drop trigger "update_transaction"  on transactions;
+drop trigger "insert_log" on logs;
+
+alter table moves
+add column transactions_id bigint;
+
+alter table transactions
+add column inserted_at timestamp without time zone
+default (now() at time zone 'utc');
+
+alter table transactions
+alter column timestamp set default (now() at time zone 'utc');
+
+DO
+$do$
+	declare
+		ledger record;
+		vsql text;
+	BEGIN
+		for ledger in select * from _system.ledgers where bucket = current_schema loop
+			-- create a sequence for transactions by ledger instead of a sequence of the table as we want to have contiguous ids
+			-- notes: we can still have "holes" on ids since a sql transaction can be reverted after a usage of the sequence
+
+			vsql = 'create sequence "transaction_id_' || ledger.id || '" owned by transactions.id';
+			execute vsql;
+
+			vsql = 'select setval("transaction_id_' || ledger.id || '", coalesce((select max(id) + 1 from transactions where ledger = ledger.name), 1)::bigint, false)';
+			execute vsql;
+
+			-- create a sequence for logs by ledger instead of a sequence of the table as we want to have contiguous ids
+			-- notes: we can still have "holes" on id since a sql transaction can be reverted after a usage of the sequence
+			vsql = 'create sequence "log_id_' || ledger.id || '" owned by logs.id';
+			execute vsql;
+
+			vsql = 'select setval("log_id_' || ledger.id || '", coalesce((select max(id) + 1 from logs where ledger = ledger.name), 1)::bigint, false)';
+			execute vsql;
+
+			-- enable post commit effective volumes synchronously
+			vsql = 'create index "pcev_' || ledger.id || '" on moves (accounts_address, asset, effective_date desc) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create trigger "set_effective_volumes_' || ledger.id || '" before insert on moves for each row when (new.ledger = ledger.name) execute procedure set_effective_volumes()';
+			execute vsql;
+
+			vsql = 'create trigger "update_effective_volumes_' || ledger.id || '" after insert on moves for each row when (new.ledger = ledger.name) execute procedure update_effective_volumes()';
+			execute vsql;
+
+			-- logs hash
+			vsql = 'create trigger "set_log_hash_' || ledger.id || '" before insert on logs for each row when (new.ledger = ledger.name) execute procedure set_log_hash()';
+			execute vsql;
+
+			vsql = 'create trigger "update_account_metadata_history_' || ledger.id || '" after update on "accounts" for each row when (new.ledger = ledger.name) execute procedure update_account_metadata_history()';
+			execute vsql;
+
+			vsql = 'create trigger "insert_account_metadata_history_' || ledger.id || '" after insert on "accounts" for each row when (new.ledger = ledger.name) execute procedure insert_account_metadata_history()';
+			execute vsql;
+
+			vsql = 'create trigger "update_transaction_metadata_history_' || ledger.id || '" after update on "transactions" for each row when (new.ledger = ledger.name) execute procedure update_transaction_metadata_history()';
+			execute vsql;
+
+			vsql = 'create trigger "insert_transaction_metadata_history_' || ledger.id || '" after insert on "transactions" for each row when (new.ledger = ledger.name) execute procedure insert_transaction_metadata_history()';
+			execute vsql;
+
+			vsql = 'create index "transactions_sources_' || ledger.id || '" on transactions using gin (sources jsonb_path_ops) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create index "transactions_destinations_' || ledger.id || '" on transactions using gin (destinations jsonb_path_ops) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create trigger "transaction_set_addresses_' || ledger.id || '" before insert on transactions for each row when (new.ledger = ledger.name) execute procedure set_transaction_addresses()';
+			execute vsql;
+
+			vsql = 'create index "accounts_address_array_' || ledger.id || '" on accounts using gin (address_array jsonb_ops) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create index "accounts_address_array_length_' || ledger.id || '" on accounts (jsonb_array_length(address_array)) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create trigger "accounts_set_address_array_' || ledger.id || '" before insert on accounts for each row when (new.ledger = ledger.name) execute procedure set_address_array_for_account()';
+			execute vsql;
+
+			vsql = 'create index "transactions_sources_arrays_' || ledger.id || '" on transactions using gin (sources_arrays jsonb_path_ops) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create index "transactions_destinations_arrays_' || ledger.id || '" on transactions using gin (destinations_arrays jsonb_path_ops) where ledger = ledger.name';
+			execute vsql;
+
+			vsql = 'create trigger "transaction_set_addresses_segments_' || ledger.id || '"	before insert on "transactions" for each row when (new.ledger = ledger.name) execute procedure set_transaction_addresses_segments()';
+			execute vsql;
+		end loop;
+	END
+$do$;
\ No newline at end of file
diff --git a/internal/storage/bucket/migrations/16-moves-change-pvc-column-type.sql b/internal/storage/bucket/migrations/16-moves-change-pvc-column-type.sql
deleted file mode 100644
index f8869301a..000000000
--- a/internal/storage/bucket/migrations/16-moves-change-pvc-column-type.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- update post_commit_volumes of table moves to jsonb
-alter table moves
-add column post_commit_volumes_jsonb jsonb;
-
-update moves
-set post_commit_volumes_jsonb = json_build_object('input', (post_commit_volumes).inputs, 'output', (post_commit_volumes).outputs);
-
-alter table moves
-drop column post_commit_volumes;
-
-alter table moves
-rename post_commit_volumes_jsonb to post_commit_volumes;
-
--- update post_commit_volumes of table moves to jsonb
-alter table moves
-add column post_commit_effective_volumes_jsonb jsonb;
-
-update moves
-set post_commit_effective_volumes_jsonb = json_build_object('input', (post_commit_effective_volumes).inputs, 'output', (post_commit_effective_volumes).outputs);
-
-alter table moves
-drop column post_commit_effective_volumes;
-
-alter table moves
-rename post_commit_effective_volumes_jsonb to post_commit_effective_volumes;
\ No newline at end of file
diff --git a/internal/storage/bucket/migrations/17-transactions-fix-reference.sql b/internal/storage/bucket/migrations/16-transactions-fix-reference.sql
similarity index 100%
rename from internal/storage/bucket/migrations/17-transactions-fix-reference.sql
rename to internal/storage/bucket/migrations/16-transactions-fix-reference.sql
diff --git a/internal/storage/bucket/migrations/18-transactions-add-pvc.sql b/internal/storage/bucket/migrations/17-transactions-add-pvc.sql
similarity index 100%
rename from internal/storage/bucket/migrations/18-transactions-add-pvc.sql
rename to internal/storage/bucket/migrations/17-transactions-add-pvc.sql
diff --git a/internal/storage/bucket/migrations/19-logs-add-idempotency-hash.sql b/internal/storage/bucket/migrations/18-logs-add-idempotency-hash.sql
similarity index 100%
rename from internal/storage/bucket/migrations/19-logs-add-idempotency-hash.sql
rename to internal/storage/bucket/migrations/18-logs-add-idempotency-hash.sql
diff --git a/internal/storage/bucket/migrations/20-moves-drop-accounts-address-array.sql b/internal/storage/bucket/migrations/19-moves-drop-accounts-address-array.sql
similarity index 100%
rename from internal/storage/bucket/migrations/20-moves-drop-accounts-address-array.sql
rename to internal/storage/bucket/migrations/19-moves-drop-accounts-address-array.sql
diff --git a/internal/storage/bucket/migrations/21-add-accounts-volumes-table.sql b/internal/storage/bucket/migrations/20-add-accounts-volumes-table.sql
similarity index 84%
rename from internal/storage/bucket/migrations/21-add-accounts-volumes-table.sql
rename to internal/storage/bucket/migrations/20-add-accounts-volumes-table.sql
index 8384d572b..6a6e94906 100644
--- a/internal/storage/bucket/migrations/21-add-accounts-volumes-table.sql
+++ b/internal/storage/bucket/migrations/20-add-accounts-volumes-table.sql
@@ -13,8 +13,8 @@ select distinct on (ledger, accounts_address, asset)
 	ledger,
 	accounts_address,
 	asset,
-	(moves.post_commit_volumes->>'input')::numeric as input,
-	(moves.post_commit_volumes->>'output')::numeric as output
+	(moves.post_commit_volumes).inputs as input,
+	(moves.post_commit_volumes).outputs as output
 from (
 	select distinct (ledger, accounts_address, asset)
 		ledger,
diff --git a/internal/storage/bucket/migrations/22-transactions-metadata-add-transaction-id.sql b/internal/storage/bucket/migrations/21-transactions-metadata-add-transaction-id.sql
similarity index 100%
rename from internal/storage/bucket/migrations/22-transactions-metadata-add-transaction-id.sql
rename to internal/storage/bucket/migrations/21-transactions-metadata-add-transaction-id.sql
diff --git a/internal/storage/bucket/migrations/23-accounts-metadata-add-address.sql b/internal/storage/bucket/migrations/22-accounts-metadata-add-address.sql
similarity index 100%
rename from internal/storage/bucket/migrations/23-accounts-metadata-add-address.sql
rename to internal/storage/bucket/migrations/22-accounts-metadata-add-address.sql
diff --git a/internal/storage/bucket/migrations/24-transactions-clean-table.sql b/internal/storage/bucket/migrations/23-transactions-clean-table.sql
similarity index 100%
rename from internal/storage/bucket/migrations/24-transactions-clean-table.sql
rename to internal/storage/bucket/migrations/23-transactions-clean-table.sql
diff --git a/internal/storage/bucket/migrations/25-accounts-set-array-not-null.sql b/internal/storage/bucket/migrations/24-accounts-set-array-not-null.sql
similarity index 100%
rename from internal/storage/bucket/migrations/25-accounts-set-array-not-null.sql
rename to internal/storage/bucket/migrations/24-accounts-set-array-not-null.sql
diff --git a/internal/storage/bucket/migrations/26-logs-set-hash-nullable.sql b/internal/storage/bucket/migrations/25-logs-set-hash-nullable.sql
similarity index 100%
rename from internal/storage/bucket/migrations/26-logs-set-hash-nullable.sql
rename to internal/storage/bucket/migrations/25-logs-set-hash-nullable.sql
diff --git a/internal/storage/bucket/migrations/27-clean-index.sql b/internal/storage/bucket/migrations/26-clean-index.sql
similarity index 100%
rename from internal/storage/bucket/migrations/27-clean-index.sql
rename to internal/storage/bucket/migrations/26-clean-index.sql
diff --git a/internal/storage/bucket/migrations/28-add-features-functions.sql b/internal/storage/bucket/migrations/27-add-features-functions.sql
similarity index 84%
rename from internal/storage/bucket/migrations/28-add-features-functions.sql
rename to internal/storage/bucket/migrations/27-add-features-functions.sql
index 1e38de09b..f2d2da4c9 100644
--- a/internal/storage/bucket/migrations/28-add-features-functions.sql
+++ b/internal/storage/bucket/migrations/27-add-features-functions.sql
@@ -6,9 +6,9 @@ as
 $$
 begin
     new.post_commit_effective_volumes = coalesce((
-        select json_build_object(
-            'input', (post_commit_effective_volumes->>'input')::numeric + case when new.is_source then 0 else new.amount end,
-            'output', (post_commit_effective_volumes->>'output')::numeric + case when new.is_source then new.amount else 0 end
+        select (
+            (post_commit_effective_volumes).inputs + case when new.is_source then 0 else new.amount end,
+            (post_commit_effective_volumes).outputs + case when new.is_source then new.amount else 0 end
         )
         from moves
         where accounts_address = new.accounts_address
@@ -17,9 +17,9 @@ begin
             and (effective_date < new.effective_date or (effective_date = new.effective_date and seq < new.seq))
         order by effective_date desc, seq desc
         limit 1
-    ), json_build_object(
-        'input', case when new.is_source then 0 else new.amount end,
-        'output', case when new.is_source then new.amount else 0 end
+    ), (
+        case when new.is_source then 0 else new.amount end,
+        case when new.is_source then new.amount else 0 end
     ));
 
     return new;
@@ -34,9 +34,9 @@ as
 $$
 begin
     update moves
-    set post_commit_effective_volumes = json_build_object(
-		'input', (post_commit_effective_volumes->>'input')::numeric + case when new.is_source then 0 else new.amount end,
-		'output', (post_commit_effective_volumes->>'output')::numeric + case when new.is_source then new.amount else 0 end
+    set post_commit_effective_volumes = (
+		(post_commit_effective_volumes).inputs + case when new.is_source then 0 else new.amount end,
+		(post_commit_effective_volumes).outputs + case when new.is_source then new.amount else 0 end
     )
     where accounts_address = new.accounts_address
         and asset = new.asset
diff --git a/internal/storage/bucket/migrations/29-logs-add-memento.sql b/internal/storage/bucket/migrations/28-logs-add-memento.sql
similarity index 100%
rename from internal/storage/bucket/migrations/29-logs-add-memento.sql
rename to internal/storage/bucket/migrations/28-logs-add-memento.sql
diff --git a/internal/storage/bucket/migrations/30-logs-hash-in-database.sql b/internal/storage/bucket/migrations/29-logs-hash-in-database.sql
similarity index 100%
rename from internal/storage/bucket/migrations/30-logs-hash-in-database.sql
rename to internal/storage/bucket/migrations/29-logs-hash-in-database.sql
diff --git a/internal/storage/bucket/migrations/31-logs-assign-date.sql b/internal/storage/bucket/migrations/30-logs-assign-date.sql
similarity index 100%
rename from internal/storage/bucket/migrations/31-logs-assign-date.sql
rename to internal/storage/bucket/migrations/30-logs-assign-date.sql
diff --git a/internal/storage/bucket/migrations/32-accounts-assign-date.sql b/internal/storage/bucket/migrations/31-accounts-assign-date.sql
similarity index 100%
rename from internal/storage/bucket/migrations/32-accounts-assign-date.sql
rename to internal/storage/bucket/migrations/31-accounts-assign-date.sql
diff --git a/internal/storage/bucket/migrations/33-moves-assign-date.sql b/internal/storage/bucket/migrations/32-moves-assign-date.sql
similarity index 100%
rename from internal/storage/bucket/migrations/33-moves-assign-date.sql
rename to internal/storage/bucket/migrations/32-moves-assign-date.sql
diff --git a/internal/storage/bucket/migrations/34-set-ledger-specifics.sql b/internal/storage/bucket/migrations/33-set-ledger-specifics.sql
similarity index 100%
rename from internal/storage/bucket/migrations/34-set-ledger-specifics.sql
rename to internal/storage/bucket/migrations/33-set-ledger-specifics.sql
diff --git a/internal/storage/bucket/migrations/34-moves-not-null-columns.sql b/internal/storage/bucket/migrations/34-moves-not-null-columns.sql
new file mode 100644
index 000000000..9b9752a95
--- /dev/null
+++ b/internal/storage/bucket/migrations/34-moves-not-null-columns.sql
@@ -0,0 +1,4 @@
+alter table "moves"
+alter column post_commit_volumes drop not null,
+alter column post_commit_effective_volumes drop not null
+;
\ No newline at end of file
diff --git a/internal/storage/bucket/migrations_test.go b/internal/storage/bucket/migrations_test.go
index f7b04de8a..eb660b42d 100644
--- a/internal/storage/bucket/migrations_test.go
+++ b/internal/storage/bucket/migrations_test.go
@@ -2,291 +2,276 @@
 
 package bucket_test
 
-import (
-	"context"
-	"github.com/formancehq/go-libs/v2/testing/migrations"
-	"github.com/formancehq/go-libs/v2/time"
-	ledger "github.com/formancehq/ledger/internal"
-	"github.com/formancehq/ledger/internal/storage/bucket"
-	"github.com/formancehq/ledger/internal/storage/driver"
-	"math/big"
-	"testing"
-
-	"github.com/formancehq/go-libs/v2/bun/bunconnect"
-	"github.com/formancehq/go-libs/v2/bun/bundebug"
-	"github.com/formancehq/go-libs/v2/logging"
-	"github.com/stretchr/testify/require"
-	"github.com/uptrace/bun"
-)
-
-func TestMigrations(t *testing.T) {
-	t.Parallel()
-	ctx := logging.TestingContext()
-
-	pgServer := srv.NewDatabase(t)
-
-	hooks := make([]bun.QueryHook, 0)
-	if testing.Verbose() {
-		hooks = append(hooks, bundebug.NewQueryHook())
-	}
-
-	db, err := bunconnect.OpenSQLDB(ctx, pgServer.ConnectionOptions(), hooks...)
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, db.Close())
-	})
-
-	require.NoError(t, driver.Migrate(ctx, db))
-
-	test := migrations.NewMigrationTest(t, bucket.GetMigrator(ledger.DefaultBucket), db)
-	test.Append(12, removeSequenceOnMovesTable)
-	test.Append(16, changePVCColumnTypeOfMoves)
-	test.Append(18, addTransactionsPVC)
-	test.Append(21, addAccountsVolumesTable)
-	test.Append(22, addTransactionIDOnTransactionsMetadataTable)
-	test.Append(23, addAccountAddressOnAccountsMetadataTable)
-	test.Run()
-}
-
-var (
-	now                        = time.Now()
-	removeSequenceOnMovesTable = migrations.Hook{
-		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			// insert some accounts
-			_, err := db.NewInsert().
-				Model(&map[string]any{
-					"ledger":         "foo",
-					"address":        "world",
-					"address_array":  []string{"world"},
-					"seq":            1,
-					"insertion_date": now,
-					"updated_at":     now,
-				}).
-				TableExpr(ledger.DefaultBucket + ".accounts").
-				Exec(ctx)
-			require.NoError(t, err)
-
-			_, err = db.NewInsert().
-				Model(&map[string]any{
-					"ledger":         "foo",
-					"address":        "bank",
-					"address_array":  []string{"bank"},
-					"seq":            2,
-					"insertion_date": now,
-					"updated_at":     now,
-				}).
-				TableExpr(ledger.DefaultBucket + ".accounts").
-				Exec(ctx)
-			require.NoError(t, err)
-
-			// insert a transaction
-			_, err = db.NewInsert().
-				Model(&map[string]any{
-					"ledger":       "foo",
-					"id":           1,
-					"seq":          1,
-					"timestamp":    time.Now(),
-					"postings":     []any{},
-					"sources":      []string{"world"},
-					"destinations": []string{"bank"},
-				}).
-				TableExpr(ledger.DefaultBucket + ".transactions").
-				Exec(ctx)
-			require.NoError(t, err)
-
-			// insert moves
-			_, err = db.NewInsert().
-				Model(&map[string]any{
-					"ledger":                        "foo",
-					"seq":                           1,
-					"asset":                         "USD",
-					"amount":                        big.NewInt(100),
-					"transactions_seq":              1,
-					"accounts_seq":                  1,
-					"account_address":               "world",
-					"account_address_array":         []string{"world"},
-					"post_commit_volumes":           "(0, 100)",
-					"post_commit_effective_volumes": "(0, 100)",
-					"insertion_date":                now,
-					"effective_date":                now,
-					"is_source":                     true,
-				}).
-				TableExpr(ledger.DefaultBucket + ".moves").
-				Exec(ctx)
-			require.NoError(t, err)
-
-			_, err = db.NewInsert().
-				Model(&map[string]any{
-					"ledger":                        "foo",
-					"seq":                           3,
-					"asset":                         "USD",
-					"amount":                        big.NewInt(100),
-					"transactions_seq":              1,
-					"accounts_seq":                  2,
-					"account_address":               "bank",
-					"account_address_array":         []string{"bank"},
-					"post_commit_volumes":           "(100, 0)",
-					"post_commit_effective_volumes": "(100, 0)",
-					"insertion_date":                now,
-					"effective_date":                now,
-					"is_source":                     false,
-				}).
-				TableExpr(ledger.DefaultBucket + ".moves").
-				Exec(ctx)
-			require.NoError(t, err)
-		},
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			ret := make([]map[string]any, 0)
-			err := db.NewSelect().
-				ModelTableExpr(ledger.DefaultBucket + ".moves").
-				Model(&ret).
-				Scan(ctx)
-			require.NoError(t, err)
-			require.Len(t, ret, 2)
-			require.Equal(t, int64(1), ret[0]["transactions_id"])
-			require.Equal(t, int64(1), ret[1]["transactions_id"])
-		},
-	}
-	changePVCColumnTypeOfMoves = migrations.Hook{
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			type model struct {
-				bun.BaseModel `bun:"alias:moves"`
-
-				Volumes          ledger.Volumes `bun:"post_commit_volumes"`
-				EffectiveVolumes ledger.Volumes `bun:"post_commit_effective_volumes"`
-			}
-			ret := make([]model, 0)
-			err := db.NewSelect().
-				Model(&ret).
-				ModelTableExpr(ledger.DefaultBucket + ".moves").
-				Order("seq").
-				Scan(ctx)
-			require.NoError(t, err)
-
-			require.Len(t, ret, 2)
-			require.Equal(t, ledger.NewVolumesInt64(0, 100), ret[0].Volumes)
-			require.Equal(t, ledger.NewVolumesInt64(100, 0), ret[1].Volumes)
-			require.Equal(t, ledger.NewVolumesInt64(0, 100), ret[0].EffectiveVolumes)
-			require.Equal(t, ledger.NewVolumesInt64(100, 0), ret[1].EffectiveVolumes)
-		},
-	}
-	addTransactionsPVC = migrations.Hook{
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			type model struct {
-				bun.BaseModel `bun:"alias:transactions"`
-
-				PostCommitVolumes ledger.PostCommitVolumes `bun:"post_commit_volumes"`
-			}
-			ret := make([]model, 0)
-			err := db.NewSelect().
-				Model(&ret).
-				ModelTableExpr(ledger.DefaultBucket + ".transactions").
-				Order("seq").
-				Scan(ctx)
-			require.NoError(t, err)
-
-			require.Len(t, ret, 1)
-			require.Equal(t, ledger.PostCommitVolumes{
-				"world": {
-					"USD": ledger.NewVolumesInt64(0, 100),
-				},
-				"bank": {
-					"USD": ledger.NewVolumesInt64(100, 0),
-				},
-			}, ret[0].PostCommitVolumes)
-		},
-	}
-	addAccountsVolumesTable = migrations.Hook{
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			type model struct {
-				bun.BaseModel `bun:"alias:accounts_volumes"`
-
-				Address string   `bun:"accounts_address"`
-				Asset   string   `bun:"asset"`
-				Input   *big.Int `bun:"input"`
-				Output  *big.Int `bun:"output"`
-			}
-			ret := make([]model, 0)
-			err := db.NewSelect().
-				Model(&ret).
-				ModelTableExpr(ledger.DefaultBucket + ".accounts_volumes").
-				Order("accounts_address").
-				Scan(ctx)
-			require.NoError(t, err)
-
-			require.Len(t, ret, 2)
-			require.Equal(t, model{
-				Address: "bank",
-				Asset:   "USD",
-				Input:   big.NewInt(100),
-				Output:  big.NewInt(0),
-			}, ret[0])
-			require.Equal(t, model{
-				Address: "world",
-				Asset:   "USD",
-				Input:   big.NewInt(0),
-				Output:  big.NewInt(100),
-			}, ret[1])
-		},
-	}
-	addTransactionIDOnTransactionsMetadataTable = migrations.Hook{
-		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			_, err := db.NewInsert().
-				Model(&map[string]any{
-					"ledger":           "foo",
-					"transactions_seq": 1,
-					"revision":         1,
-					"date":             now,
-					"metadata":         map[string]string{"foo": "bar"},
-				}).
-				TableExpr(ledger.DefaultBucket + ".transactions_metadata").
-				Exec(ctx)
-			require.NoError(t, err)
-		},
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			type model struct {
-				bun.BaseModel `bun:"alias:transactions_metadata"`
-
-				TransactionID int `bun:"transactions_id"`
-			}
-			ret := make([]model, 0)
-			err := db.NewSelect().
-				Model(&ret).
-				ModelTableExpr(ledger.DefaultBucket + ".transactions_metadata").
-				Scan(ctx)
-			require.NoError(t, err)
-			require.Len(t, ret, 1)
-			require.Equal(t, 1, ret[0].TransactionID)
-		},
-	}
-	addAccountAddressOnAccountsMetadataTable = migrations.Hook{
-		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			_, err := db.NewInsert().
-				Model(&map[string]any{
-					"ledger":       "foo",
-					"accounts_seq": 1,
-					"revision":     1,
-					"date":         now,
-					"metadata":     map[string]string{"foo": "bar"},
-				}).
-				TableExpr(ledger.DefaultBucket + ".accounts_metadata").
-				Exec(ctx)
-			require.NoError(t, err)
-		},
-		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
-			type model struct {
-				bun.BaseModel `bun:"alias:accounts_metadata"`
-
-				Address string `bun:"accounts_address"`
-			}
-			ret := make([]model, 0)
-			err := db.NewSelect().
-				Model(&ret).
-				ModelTableExpr(ledger.DefaultBucket + ".accounts_metadata").
-				Scan(ctx)
-			require.NoError(t, err)
-			require.Len(t, ret, 1)
-			require.Equal(t, "world", ret[0].Address)
-		},
-	}
-)
+// todo: restore
+//
+//func TestMigrations(t *testing.T) {
+//	t.Parallel()
+//	ctx := logging.TestingContext()
+//
+//	pgServer := srv.NewDatabase(t)
+//
+//	hooks := make([]bun.QueryHook, 0)
+//	if testing.Verbose() {
+//		hooks = append(hooks, bundebug.NewQueryHook())
+//	}
+//
+//	db, err := bunconnect.OpenSQLDB(ctx, pgServer.ConnectionOptions(), hooks...)
+//	require.NoError(t, err)
+//	t.Cleanup(func() {
+//		require.NoError(t, db.Close())
+//	})
+//
+//	require.NoError(t, driver.Migrate(ctx, db))
+//
+//	test := migrations.NewMigrationTest(t, bucket.GetMigrator(ledger.DefaultBucket), db)
+//	test.Append(12, removeSequenceOnMovesTable)
+//	test.Append(16, changePVCColumnTypeOfMoves)
+//	test.Append(18, addTransactionsPVC)
+//	test.Append(21, addAccountsVolumesTable)
+//	test.Append(22, addTransactionIDOnTransactionsMetadataTable)
+//	test.Append(23, addAccountAddressOnAccountsMetadataTable)
+//	test.Run()
+//}
+//
+//var (
+//	now                        = time.Now()
+//	removeSequenceOnMovesTable = migrations.Hook{
+//		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			// insert some accounts
+//			_, err := db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":         "foo",
+//					"address":        "world",
+//					"address_array":  []string{"world"},
+//					"seq":            1,
+//					"insertion_date": now,
+//					"updated_at":     now,
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".accounts").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//
+//			_, err = db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":         "foo",
+//					"address":        "bank",
+//					"address_array":  []string{"bank"},
+//					"seq":            2,
+//					"insertion_date": now,
+//					"updated_at":     now,
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".accounts").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//
+//			// insert a transaction
+//			_, err = db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":       "foo",
+//					"id":           1,
+//					"seq":          1,
+//					"timestamp":    time.Now(),
+//					"postings":     []any{},
+//					"sources":      []string{"world"},
+//					"destinations": []string{"bank"},
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".transactions").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//
+//			// insert moves
+//			_, err = db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":                        "foo",
+//					"seq":                           1,
+//					"asset":                         "USD",
+//					"amount":                        big.NewInt(100),
+//					"transactions_seq":              1,
+//					"accounts_seq":                  1,
+//					"account_address":               "world",
+//					"account_address_array":         []string{"world"},
+//					"post_commit_volumes":           "(0, 100)",
+//					"post_commit_effective_volumes": "(0, 100)",
+//					"insertion_date":                now,
+//					"effective_date":                now,
+//					"is_source":                     true,
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".moves").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//
+//			_, err = db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":                        "foo",
+//					"seq":                           3,
+//					"asset":                         "USD",
+//					"amount":                        big.NewInt(100),
+//					"transactions_seq":              1,
+//					"accounts_seq":                  2,
+//					"account_address":               "bank",
+//					"account_address_array":         []string{"bank"},
+//					"post_commit_volumes":           "(100, 0)",
+//					"post_commit_effective_volumes": "(100, 0)",
+//					"insertion_date":                now,
+//					"effective_date":                now,
+//					"is_source":                     false,
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".moves").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//		},
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			ret := make([]map[string]any, 0)
+//			err := db.NewSelect().
+//				ModelTableExpr(ledger.DefaultBucket + ".moves").
+//				Model(&ret).
+//				Scan(ctx)
+//			require.NoError(t, err)
+//			require.Len(t, ret, 2)
+//			require.Equal(t, int64(1), ret[0]["transactions_id"])
+//			require.Equal(t, int64(1), ret[1]["transactions_id"])
+//		},
+//	}
+//	changePVCColumnTypeOfMoves = migrations.Hook{
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			type model struct {
+//				bun.BaseModel `bun:"alias:moves"`
+//
+//				Volumes          ledger.Volumes `bun:"post_commit_volumes"`
+//				EffectiveVolumes ledger.Volumes `bun:"post_commit_effective_volumes"`
+//			}
+//			ret := make([]model, 0)
+//			err := db.NewSelect().
+//				Model(&ret).
+//				ModelTableExpr(ledger.DefaultBucket + ".moves").
+//				Order("seq").
+//				Scan(ctx)
+//			require.NoError(t, err)
+//
+//			require.Len(t, ret, 2)
+//			require.Equal(t, ledger.NewVolumesInt64(0, 100), ret[0].Volumes)
+//			require.Equal(t, ledger.NewVolumesInt64(100, 0), ret[1].Volumes)
+//			require.Equal(t, ledger.NewVolumesInt64(0, 100), ret[0].EffectiveVolumes)
+//			require.Equal(t, ledger.NewVolumesInt64(100, 0), ret[1].EffectiveVolumes)
+//		},
+//	}
+//	addTransactionsPVC = migrations.Hook{
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			type model struct {
+//				bun.BaseModel `bun:"alias:transactions"`
+//
+//				PostCommitVolumes ledger.PostCommitVolumes `bun:"post_commit_volumes"`
+//			}
+//			ret := make([]model, 0)
+//			err := db.NewSelect().
+//				Model(&ret).
+//				ModelTableExpr(ledger.DefaultBucket + ".transactions").
+//				Order("seq").
+//				Scan(ctx)
+//			require.NoError(t, err)
+//
+//			require.Len(t, ret, 1)
+//			require.Equal(t, ledger.PostCommitVolumes{
+//				"world": {
+//					"USD": ledger.NewVolumesInt64(0, 100),
+//				},
+//				"bank": {
+//					"USD": ledger.NewVolumesInt64(100, 0),
+//				},
+//			}, ret[0].PostCommitVolumes)
+//		},
+//	}
+//	addAccountsVolumesTable = migrations.Hook{
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			type model struct {
+//				bun.BaseModel `bun:"alias:accounts_volumes"`
+//
+//				Address string   `bun:"accounts_address"`
+//				Asset   string   `bun:"asset"`
+//				Input   *big.Int `bun:"input"`
+//				Output  *big.Int `bun:"output"`
+//			}
+//			ret := make([]model, 0)
+//			err := db.NewSelect().
+//				Model(&ret).
+//				ModelTableExpr(ledger.DefaultBucket + ".accounts_volumes").
+//				Order("accounts_address").
+//				Scan(ctx)
+//			require.NoError(t, err)
+//
+//			require.Len(t, ret, 2)
+//			require.Equal(t, model{
+//				Address: "bank",
+//				Asset:   "USD",
+//				Input:   big.NewInt(100),
+//				Output:  big.NewInt(0),
+//			}, ret[0])
+//			require.Equal(t, model{
+//				Address: "world",
+//				Asset:   "USD",
+//				Input:   big.NewInt(0),
+//				Output:  big.NewInt(100),
+//			}, ret[1])
+//		},
+//	}
+//	addTransactionIDOnTransactionsMetadataTable = migrations.Hook{
+//		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			_, err := db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":           "foo",
+//					"transactions_seq": 1,
+//					"revision":         1,
+//					"date":             now,
+//					"metadata":         map[string]string{"foo": "bar"},
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".transactions_metadata").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//		},
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			type model struct {
+//				bun.BaseModel `bun:"alias:transactions_metadata"`
+//
+//				TransactionID int `bun:"transactions_id"`
+//			}
+//			ret := make([]model, 0)
+//			err := db.NewSelect().
+//				Model(&ret).
+//				ModelTableExpr(ledger.DefaultBucket + ".transactions_metadata").
+//				Scan(ctx)
+//			require.NoError(t, err)
+//			require.Len(t, ret, 1)
+//			require.Equal(t, 1, ret[0].TransactionID)
+//		},
+//	}
+//	addAccountAddressOnAccountsMetadataTable = migrations.Hook{
+//		Before: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			_, err := db.NewInsert().
+//				Model(&map[string]any{
+//					"ledger":       "foo",
+//					"accounts_seq": 1,
+//					"revision":     1,
+//					"date":         now,
+//					"metadata":     map[string]string{"foo": "bar"},
+//				}).
+//				TableExpr(ledger.DefaultBucket + ".accounts_metadata").
+//				Exec(ctx)
+//			require.NoError(t, err)
+//		},
+//		After: func(ctx context.Context, t *testing.T, db bun.IDB) {
+//			type model struct {
+//				bun.BaseModel `bun:"alias:accounts_metadata"`
+//
+//				Address string `bun:"accounts_address"`
+//			}
+//			ret := make([]model, 0)
+//			err := db.NewSelect().
+//				Model(&ret).
+//				ModelTableExpr(ledger.DefaultBucket + ".accounts_metadata").
+//				Scan(ctx)
+//			require.NoError(t, err)
+//			require.Len(t, ret, 1)
+//			require.Equal(t, "world", ret[0].Address)
+//		},
+//	}
+//)
diff --git a/internal/storage/ledger/accounts.go b/internal/storage/ledger/accounts.go
index 8e43e6fb5..adceebebb 100644
--- a/internal/storage/ledger/accounts.go
+++ b/internal/storage/ledger/accounts.go
@@ -46,7 +46,7 @@ func (s *Store) selectBalance(date *time.Time) *bun.SelectQuery {
 
 	if date != nil && !date.IsZero() {
 		sortedMoves := s.SelectDistinctMovesBySeq(date).
-			ColumnExpr("(post_commit_volumes->>'input')::numeric - (post_commit_volumes->>'output')::numeric as balance")
+			ColumnExpr("(post_commit_volumes).inputs - (post_commit_volumes).outputs as balance")
 
 		return s.db.NewSelect().
 			ModelTableExpr("(?) moves", sortedMoves).
@@ -205,6 +205,8 @@ func (s *Store) selectAccounts(date *time.Time, expandVolumes, expandEffectiveVo
 		}
 	}
 
+	s.DumpQuery(context.Background(), ret)
+
 	return ret
 }
 
diff --git a/internal/storage/ledger/balances.go b/internal/storage/ledger/balances.go
index c4276e347..bf45d3360 100644
--- a/internal/storage/ledger/balances.go
+++ b/internal/storage/ledger/balances.go
@@ -83,7 +83,7 @@ func (s *Store) selectAccountWithAssetAndVolumes(date *time.Time, useInsertionDa
 		selectAccountsWithVolumes = s.db.NewSelect().
 			ModelTableExpr(s.GetPrefixedRelationName("accounts_volumes")).
 			Column("asset", "accounts_address").
-			ColumnExpr("json_build_object('input', input, 'output', output) as volumes").
+			ColumnExpr("(input, output)::"+s.GetPrefixedRelationName("volumes")+" as volumes").
 			Where("ledger = ?", s.ledger.Name)
 	}
 
@@ -154,7 +154,7 @@ func (s *Store) selectAccountWithAggregatedVolumes(date *time.Time, useInsertion
 		TableExpr("(?) values", selectAccountWithAssetAndVolumes).
 		Group("accounts_address").
 		Column("accounts_address").
-		ColumnExpr("aggregate_objects(json_build_object(asset, volumes)::jsonb) as " + alias)
+		ColumnExpr("aggregate_objects(json_build_object(asset, json_build_object('input', (volumes).inputs, 'output', (volumes).outputs))::jsonb) as " + alias)
 }
 
 func (s *Store) SelectAggregatedBalances(date *time.Time, useInsertionDate bool, builder query.Builder) *bun.SelectQuery {
@@ -164,7 +164,7 @@ func (s *Store) SelectAggregatedBalances(date *time.Time, useInsertionDate bool,
 		TableExpr("(?) values", selectAccountsWithVolumes).
 		Group("asset").
 		Column("asset").
-		ColumnExpr("json_build_object('input', sum((volumes->>'input')::numeric), 'output', sum((volumes->>'output')::numeric)) as volumes")
+		ColumnExpr("json_build_object('input', sum(((volumes).inputs)::numeric), 'output', sum(((volumes).outputs)::numeric)) as volumes")
 
 	return s.db.NewSelect().
 		TableExpr("(?) values", sumVolumesForAsset).
diff --git a/internal/storage/ledger/transactions.go b/internal/storage/ledger/transactions.go
index 8cd74348d..3ad30d173 100644
--- a/internal/storage/ledger/transactions.go
+++ b/internal/storage/ledger/transactions.go
@@ -132,25 +132,54 @@ func (s *Store) selectTransactions(date *time.Time, expandVolumes, expandEffecti
 			Join(
 				`join (?) pcev on pcev.transactions_id = transactions.id`,
 				s.db.NewSelect().
-					Column("transactions_id").
-					ColumnExpr("aggregate_objects(pcev::jsonb) as post_commit_effective_volumes").
 					TableExpr(
 						"(?) data",
 						s.db.NewSelect().
-							DistinctOn("transactions_id, accounts_address, asset").
-							ModelTableExpr(s.GetPrefixedRelationName("moves")).
+							TableExpr(
+								"(?) moves",
+								s.db.NewSelect().
+									DistinctOn("transactions_id, accounts_address, asset").
+									ModelTableExpr(s.GetPrefixedRelationName("moves")).
+									Column("transactions_id", "accounts_address", "asset").
+									ColumnExpr(`first_value(moves.post_commit_effective_volumes) over (partition by (transactions_id, accounts_address, asset) order by seq desc) as post_commit_effective_volumes`),
+							).
 							Column("transactions_id").
 							ColumnExpr(`
 								json_build_object(
 									moves.accounts_address,
 									json_build_object(
 										moves.asset,
-										first_value(moves.post_commit_effective_volumes) over (partition by (transactions_id, accounts_address, asset) order by seq desc)
+										json_build_object(
+											'input', (moves.post_commit_effective_volumes).inputs,
+											'output', (moves.post_commit_effective_volumes).outputs
+										)
 									)
-								) as pcev
+								) as post_commit_effective_volumes
 							`),
 					).
+					Column("transactions_id").
+					ColumnExpr("aggregate_objects(post_commit_effective_volumes::jsonb) as post_commit_effective_volumes").
 					Group("transactions_id"),
+				//s.db.NewSelect().
+				//	Column("transactions_id").
+				//	ColumnExpr("aggregate_objects(pcev::jsonb) as post_commit_effective_volumes").
+				//	TableExpr(
+				//		"(?) data",
+				//		s.db.NewSelect().
+				//			DistinctOn("transactions_id, accounts_address, asset").
+				//			ModelTableExpr(s.GetPrefixedRelationName("moves")).
+				//			Column("transactions_id").
+				//			ColumnExpr(`
+				//				json_build_object(
+				//					moves.accounts_address,
+				//					json_build_object(
+				//						moves.asset,
+				//						first_value(moves.post_commit_effective_volumes) over (partition by (transactions_id, accounts_address, asset) order by seq desc)
+				//					)
+				//				) as pcev
+				//			`),
+				//	).
+				//	Group("transactions_id"),
 			).
 			ColumnExpr("pcev.*")
 	}
diff --git a/internal/volumes.go b/internal/volumes.go
index 460442bd1..3abcca42b 100644
--- a/internal/volumes.go
+++ b/internal/volumes.go
@@ -1,9 +1,12 @@
 package ledger
 
 import (
+	"database/sql/driver"
 	"encoding/json"
+	"fmt"
 	"github.com/invopop/jsonschema"
 	"math/big"
+	"strings"
 )
 
 type Volumes struct {
@@ -11,6 +14,29 @@ type Volumes struct {
 	Output *big.Int `json:"output"`
 }
 
+func (v Volumes) Value() (driver.Value, error) {
+	return fmt.Sprintf("(%s, %s)", v.Input.String(), v.Output.String()), nil
+}
+
+func (v *Volumes) Scan(src interface{}) error {
+	// stored as (input, output)
+	parts := strings.Split(src.(string)[1:(len(src.(string))-1)], ",")
+
+	v.Input = new(big.Int)
+	_, ok := v.Input.SetString(parts[0], 10)
+	if !ok {
+		return fmt.Errorf("unable to parse input '%s' as big int", parts[0])
+	}
+
+	v.Output = new(big.Int)
+	_, ok = v.Output.SetString(parts[1], 10)
+	if !ok {
+		return fmt.Errorf("unable to parse output '%s' as big int", parts[1])
+	}
+
+	return nil
+}
+
 func (Volumes) JSONSchemaExtend(schema *jsonschema.Schema) {
 	inputProperty, _ := schema.Properties.Get("input")
 	schema.Properties.Set("balance", inputProperty)