diff --git a/db/schema.sql b/db/schema.sql
index d41f17587..be05a1688 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -2,25 +2,43 @@ CREATE TABLE schema_migrations (version uint64,dirty bool);
 CREATE UNIQUE INDEX version_unique ON schema_migrations (version);
 CREATE TABLE session (
     sessionid varchar(36) PRIMARY KEY,
-    name varchar(50) NOT NULL
+    name varchar(50) NOT NULL,
+    sessionidx int NOT NULL,
+    activescreenid varchar(36) NOT NULL,
+    notifynum int NOT NULL
 );
-CREATE UNIQUE INDEX session_name_unique ON session(name);
 CREATE TABLE window (
     sessionid varchar(36) NOT NULL,
     windowid varchar(36) NOT NULL,
-    name varchar(50) NOT NULL,
     curremote varchar(50) NOT NULL,
-    version int NOT NULL,
+    winopts json NOT NULL,
     PRIMARY KEY (sessionid, windowid)
 );
-CREATE UNIQUE INDEX window_name_unique ON window(sessionid, name);
-CREATE TABLE session_remote (
+CREATE TABLE screen (
+    sessionid varchar(36) NOT NULL,
+    screenid varchar(36) NOT NULL,
+    name varchar(50) NOT NULL,
+    activewindowid varchar(36) NOT NULL,
+    screenidx int NOT NULL,
+    screenopts json NOT NULL,
+    PRIMARY KEY (sessionid, screenid)
+);
+CREATE TABLE screen_window (
+    sessionid varchar(36) NOT NULL,
+    screenid varchar(36) NOT NULL,
+    windowid varchar(36) NOT NULL,
+    name varchar(50) NOT NULL,
+    layout json NOT NULL,
+    PRIMARY KEY (sessionid, screenid, windowid)
+);
+CREATE TABLE remote_instance (
+    riid varchar(36) PRIMARY KEY,
+    name varchar(50) NOT NULL,
     sessionid varchar(36) NOT NULL,
     windowid varchar(36) NOT NULL,
-    remotename varchar(50) NOT NULL,
     remoteid varchar(36) NOT NULL,
-    cwd varchar(300) NOT NULL,
-    PRIMARY KEY (sessionid, windowid, remotename)
+    sessionscope boolean NOT NULL,
+    state json NOT NULL
 );
 CREATE TABLE line (
     sessionid varchar(36) NOT NULL,
@@ -37,28 +55,30 @@ CREATE TABLE remote (
     remoteid varchar(36) PRIMARY KEY,
     remotetype varchar(10) NOT NULL,
     remotename varchar(50) NOT NULL,
-    connectopts varchar(300) NOT NULL,
-    ptyout BLOB NOT NULL
+    autoconnect boolean NOT NULL,
+    initpk json NOT NULL,
+    sshopts json NOT NULL,
+    lastconnectts bigint NOT NULL
 );
-CREATE TABLE session_cmd (
+CREATE TABLE cmd (
     sessionid varchar(36) NOT NULL,
     cmdid varchar(36) NOT NULL,
     remoteid varchar(36) NOT NULL,
+    cmdstr text NOT NULL,
+    remotestate json NOT NULL,
+    termopts json NOT NULL,
     status varchar(10) NOT NULL,
-    startts bigint NOT NULL,
-    pid int NOT NULL,
-    runnerpid int NOT NULL,
-    donets bigint NOT NULL,
-    exitcode int NOT NULL,
-    ptyout BLOB NOT NULL,
-    runout BLOB NOT NULL,
+    startpk json NOT NULL,
+    donepk json NOT NULL,
+    runout json NOT NULL,
+    usedrows int NOT NULL,
     PRIMARY KEY (sessionid, cmdid)
 );
 CREATE TABLE history (
     sessionid varchar(36) NOT NULL,
     windowid varchar(36) NOT NULL,
     userid varchar(36) NOT NULL,
-    ts int64 NOT NULL,
+    ts bigint NOT NULL,
     lineid varchar(36) NOT NULL,
     PRIMARY KEY (sessionid, windowid, lineid)
 );