diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 9eccfa2c69a1..cfe553f7e3f9 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Please ensure that this is in sync with graalVersion in build.sbt
-  javaVersion: 21.0.1
+  javaVersion: 21.0.2
   # Please ensure that this is in sync with project/build.properties
   sbtVersion: 1.9.7
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 916f0f9c5264..e4ef23ad7c18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -616,6 +616,8 @@
 - [Added `Table.to_xml`.][8979]
 - [Implemented Write support for `S3_File`.][8921]
 - [Separate `Group_By` from `columns` into new argument on `aggregate`.][9027]
+- [Allow `copy_to` and `move_to` to work between local and S3 files.][9054]
+- [Adjusted expression handling and new `Simple_Expression` type.][9128]
 
 [debug-shortcuts]:
   https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
@@ -888,6 +890,8 @@
 [8979]: https://github.com/enso-org/enso/pull/8979
 [8921]: https://github.com/enso-org/enso/pull/8921
 [9027]: https://github.com/enso-org/enso/pull/9027
+[9054]: https://github.com/enso-org/enso/pull/9054
+[9128]: https://github.com/enso-org/enso/pull/9128
 
 #### Enso Compiler
 
diff --git a/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js b/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
index 7d023ea68a84..ff6f860d2721 100644
--- a/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
+++ b/app/gui/view/graph-editor/src/builtin/visualization/java_script/sql.js
@@ -80,10 +80,8 @@ loadScript('https://cdnjs.cloudflare.com/ajax/libs/sql-formatter/4.0.2/sql-forma
  * interpolated query parameters.
  */
 class SqlVisualization extends Visualization {
-    // TODO Change the type below once #837 is done:
-    // 'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
     static inputType =
-        'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
+        'Standard.Database.Data.DB_Table.DB_Table | Standard.Database.Data.DB_Column.DB_Column'
     static label = 'SQL Query'
 
     constructor(api) {
diff --git a/app/gui2/e2e/collapsingAndEntering.spec.ts b/app/gui2/e2e/collapsingAndEntering.spec.ts
index bb831c617f62..052cd3e1d5a0 100644
--- a/app/gui2/e2e/collapsingAndEntering.spec.ts
+++ b/app/gui2/e2e/collapsingAndEntering.spec.ts
@@ -11,36 +11,38 @@ test('Entering nodes', async ({ page }) => {
   await actions.goToGraph(page)
   await mockCollapsedFunctionInfo(page, 'final', 'func1')
   await expectInsideMain(page)
-  await expect(locate.navBreadcrumb(page)).toHaveText(['main'])
+  await expect(locate.navBreadcrumb(page)).toHaveText(['Mock Project'])
 
   await locate.graphNodeByBinding(page, 'final').dblclick()
   await mockCollapsedFunctionInfo(page, 'f2', 'func2')
   await expectInsideFunc1(page)
-  await expect(locate.navBreadcrumb(page)).toHaveText(['main', 'func1'])
+  await expect(locate.navBreadcrumb(page)).toHaveText(['Mock Project', 'func1'])
 
   await locate.graphNodeByBinding(page, 'f2').dblclick()
   await expectInsideFunc2(page)
-  await expect(locate.navBreadcrumb(page)).toHaveText(['main', 'func1', 'func2'])
+  await expect(locate.navBreadcrumb(page)).toHaveText(['Mock Project', 'func1', 'func2'])
 })
 
 test('Leaving entered nodes', async ({ page }) => {
   await actions.goToGraph(page)
   await enterToFunc2(page)
 
-  await locate.graphEditor(page).dblclick()
+  await page.mouse.dblclick(100, 100)
   await expectInsideFunc1(page)
 
-  await locate.graphEditor(page).dblclick()
+  await page.mouse.dblclick(100, 100)
   await expectInsideMain(page)
 })
 
 test('Using breadcrumbs to navigate', async ({ page }) => {
   await actions.goToGraph(page)
   await enterToFunc2(page)
-  await locate.graphEditor(page).dblclick()
-  await locate.graphEditor(page).dblclick()
+  await page.mouse.dblclick(100, 100)
+  await expectInsideFunc1(page)
+  await page.mouse.dblclick(100, 100)
+  await expectInsideMain(page)
   // Breadcrumbs still have all the crumbs, but the last two are dimmed.
-  await expect(locate.navBreadcrumb(page)).toHaveText(['main', 'func1', 'func2'])
+  await expect(locate.navBreadcrumb(page)).toHaveText(['Mock Project', 'func1', 'func2'])
   await expect(locate.navBreadcrumb(page, (f) => f.class('inactive'))).toHaveText([
     'func1',
     'func2',
@@ -49,7 +51,7 @@ test('Using breadcrumbs to navigate', async ({ page }) => {
   await locate.navBreadcrumb(page).filter({ hasText: 'func2' }).click()
   await expectInsideFunc2(page)
 
-  await locate.navBreadcrumb(page).filter({ hasText: 'main' }).click()
+  await locate.navBreadcrumb(page).filter({ hasText: 'Mock Project' }).click()
   await expectInsideMain(page)
 
   await locate.navBreadcrumb(page).filter({ hasText: 'func1' }).click()
@@ -61,9 +63,19 @@ test('Collapsing nodes', async ({ page }) => {
   const initialNodesCount = await locate.graphNode(page).count()
   await mockCollapsedFunctionInfo(page, 'final', 'func1')
 
-  await locate.graphNodeByBinding(page, 'ten').click({ modifiers: ['Shift'] })
-  await locate.graphNodeByBinding(page, 'sum').click({ modifiers: ['Shift'] })
-  await locate.graphNodeByBinding(page, 'prod').click({ modifiers: ['Shift'] })
+  // Widgets may "steal" clicks, so we always click at icon.
+  await locate
+    .graphNodeByBinding(page, 'ten')
+    .locator('.icon')
+    .click({ modifiers: ['Shift'] })
+  await locate
+    .graphNodeByBinding(page, 'sum')
+    .locator('.icon')
+    .click({ modifiers: ['Shift'] })
+  await locate
+    .graphNodeByBinding(page, 'prod')
+    .locator('.icon')
+    .click({ modifiers: ['Shift'] })
 
   await page.keyboard.press(COLLAPSE_SHORTCUT)
   await expect(locate.graphNode(page)).toHaveCount(initialNodesCount - 2)
@@ -77,7 +89,10 @@ test('Collapsing nodes', async ({ page }) => {
   await customExpect.toExist(locate.graphNodeByBinding(page, 'sum'))
   await customExpect.toExist(locate.graphNodeByBinding(page, 'prod'))
 
-  locate.graphNodeByBinding(page, 'ten').click({ modifiers: ['Shift'] })
+  locate
+    .graphNodeByBinding(page, 'ten')
+    .locator('.icon')
+    .click({ modifiers: ['Shift'] })
   // Wait till node is selected.
   await expect(locate.graphNodeByBinding(page, 'ten').and(page.locator('.selected'))).toHaveCount(1)
   await page.keyboard.press(COLLAPSE_SHORTCUT)
@@ -118,6 +133,8 @@ async function expectInsideFunc2(page: Page) {
 async function enterToFunc2(page: Page) {
   await mockCollapsedFunctionInfo(page, 'final', 'func1')
   await locate.graphNodeByBinding(page, 'final').dblclick()
+  await expectInsideFunc1(page)
   await mockCollapsedFunctionInfo(page, 'f2', 'func2')
   await locate.graphNodeByBinding(page, 'f2').dblclick()
+  await expectInsideFunc2(page)
 }
diff --git a/app/gui2/e2e/componentBrowser.spec.ts b/app/gui2/e2e/componentBrowser.spec.ts
index ccebe783e672..ae7093605599 100644
--- a/app/gui2/e2e/componentBrowser.spec.ts
+++ b/app/gui2/e2e/componentBrowser.spec.ts
@@ -148,3 +148,36 @@ test('Filtering list', async ({ page }) => {
   const highlighted = locate.componentBrowserEntry(page).locator('.component-label-segment.match')
   await expect(highlighted).toHaveText(['re', '_te'])
 })
+
+test('Editing existing nodes', async ({ page }) => {
+  await actions.goToGraph(page)
+  const node = locate.graphNodeByBinding(page, 'data')
+  const ADDED_PATH = '"/home/enso/Input.txt"'
+
+  // Start node editing
+  await locate.graphNodeIcon(node).click({ modifiers: ['Control'] })
+  await expect(locate.componentBrowser(page)).toBeVisible()
+  const input = locate.componentBrowserInput(page).locator('input')
+  await expect(input).toHaveValue('Data.read')
+
+  // Add argument and accept
+  await page.keyboard.press('End')
+  await input.pressSequentially(` ${ADDED_PATH}`)
+  await expect(input).toHaveValue(`Data.read ${ADDED_PATH}`)
+  await page.keyboard.press('Enter')
+  await expect(locate.componentBrowser(page)).not.toBeVisible()
+  await expect(node.locator('.WidgetToken')).toHaveText(['Data', '.', 'read'])
+  await expect(node.locator('.WidgetText input')).toHaveValue(ADDED_PATH)
+
+  // Edit again, using "edit" button
+  await locate.graphNodeIcon(node).click()
+  await node.getByTestId('edit-button').click()
+  await expect(locate.componentBrowser(page)).toBeVisible()
+  await expect(input).toHaveValue(`Data.read ${ADDED_PATH}`)
+  for (let i = 0; i < ADDED_PATH.length; ++i) await page.keyboard.press('Backspace')
+  await expect(input).toHaveValue('Data.read ')
+  await page.keyboard.press('Enter')
+  await expect(locate.componentBrowser(page)).not.toBeVisible()
+  await expect(node.locator('.WidgetToken')).toHaveText(['Data', '.', 'read'])
+  await expect(node.locator('.WidgetText')).not.toBeVisible()
+})
diff --git a/app/gui2/e2e/edgeInteractions.spec.ts b/app/gui2/e2e/edgeInteractions.spec.ts
index f67f877c8fc0..9340d46d1487 100644
--- a/app/gui2/e2e/edgeInteractions.spec.ts
+++ b/app/gui2/e2e/edgeInteractions.spec.ts
@@ -1,4 +1,4 @@
-import { expect, Page, test } from '@playwright/test'
+import { expect, test, type Page } from '@playwright/test'
 import * as actions from './actions'
 import { edgesToNodeWithBinding, graphNodeByBinding } from './locate'
 
@@ -22,7 +22,7 @@ test('Disconnect an edge from a port', async ({ page }) => {
   await initGraph(page)
   await expect(await edgesToNodeWithBinding(page, 'sum')).toHaveCount(2 * EDGE_PARTS)
 
-  const targetEdge = page.locator('path:nth-child(4)')
+  const targetEdge = page.locator('svg.behindNodes g:nth-child(2) path.edge.visible')
 
   // Hover over edge to the right of node with binding `ten`.
   await targetEdge.click({
@@ -41,7 +41,7 @@ test('Connect an node to a port via dragging the edge', async ({ page }) => {
   await initGraph(page)
 
   await expect(await edgesToNodeWithBinding(page, 'sum')).toHaveCount(2 * EDGE_PARTS)
-  const targetEdge = page.locator('path:nth-child(4)')
+  const targetEdge = page.locator('svg.behindNodes g:nth-child(2) path.edge.visible')
   // Hover over edge to the left of node with binding `ten`.
   await targetEdge.click({
     position: { x: 450, y: 5.0 },
diff --git a/app/gui2/e2e/edgeRendering.spec.ts b/app/gui2/e2e/edgeRendering.spec.ts
index f8563b76a280..44e03d92aa1e 100644
--- a/app/gui2/e2e/edgeRendering.spec.ts
+++ b/app/gui2/e2e/edgeRendering.spec.ts
@@ -63,9 +63,9 @@ test('Hover behaviour of edges', async ({ page }) => {
   await expect(hoveredEdgeElements).toHaveCount(SPLIT_EDGE_PARTS)
 
   // Expect the top edge part to be dimmed
-  const topEdge = page.locator('path:nth-child(3)')
+  const topEdge = page.locator('svg.behindNodes g:nth-child(2) path:nth-child(1)')
   await expect(topEdge).toHaveClass('edge visible dimmed')
   // Expect the bottom edge part not to be dimmed
-  const bottomEdge = page.locator('path:nth-child(5)')
+  const bottomEdge = page.locator('svg.behindNodes g:nth-child(2) path:nth-child(3)')
   await expect(bottomEdge).toHaveClass('edge visible')
 })
diff --git a/app/gui2/e2e/locate.ts b/app/gui2/e2e/locate.ts
index 190c0303e8c6..1dee7549ab66 100644
--- a/app/gui2/e2e/locate.ts
+++ b/app/gui2/e2e/locate.ts
@@ -113,6 +113,23 @@ export function exitFullscreenButton(page: Locator | Page) {
 
 export const toggleFullscreenButton = or(enterFullscreenButton, exitFullscreenButton)
 
+// === Nodes ===
+
+declare const nodeLocatorBrand: unique symbol
+type Node = Locator & { [nodeLocatorBrand]: never }
+
+export function graphNode(page: Page | Locator): Node {
+  return page.locator('.GraphNode') as Node
+}
+export function graphNodeByBinding(page: Locator | Page, binding: string): Node {
+  return graphNode(page).filter({
+    has: page.locator('.binding').and(page.getByText(binding)),
+  }) as Node
+}
+export function graphNodeIcon(node: Node) {
+  return node.locator('.icon')
+}
+
 // === Data locators ===
 
 type SanitizeClassName<T extends string> = T extends `${infer A}.${infer B}`
@@ -128,10 +145,6 @@ function componentLocator<T extends string>(className: SanitizeClassName<T>) {
 }
 
 export const graphEditor = componentLocator('GraphEditor')
-export const graphNode = componentLocator('GraphNode')
-export function graphNodeByBinding(page: Locator | Page, binding: string) {
-  return graphNode(page).filter({ has: page.locator('.binding').and(page.getByText(binding)) })
-}
 // @ts-expect-error
 export const anyVisualization = componentLocator('GraphVisualization > *')
 export const circularMenu = componentLocator('CircularMenu')
diff --git a/app/gui2/mock/index.ts b/app/gui2/mock/index.ts
index ea6492549e19..87f2acf092e4 100644
--- a/app/gui2/mock/index.ts
+++ b/app/gui2/mock/index.ts
@@ -67,7 +67,7 @@ export function projectStore() {
   const mod = projectStore.projectModel.createNewModule('Main.enso')
   mod.doc.ydoc.emit('load', [])
   const syncModule = new Ast.MutableModule(mod.doc.ydoc)
-  mod.transact(() => {
+  syncModule.transact(() => {
     const root = Ast.parseBlock('main =\n', syncModule)
     syncModule.replaceRoot(root)
   })
diff --git a/app/gui2/scripts/generateIconMetadata.js b/app/gui2/scripts/generateIconMetadata.js
index 06e5f056e679..ab755ef1c2cb 100644
--- a/app/gui2/scripts/generateIconMetadata.js
+++ b/app/gui2/scripts/generateIconMetadata.js
@@ -11,8 +11,8 @@ console.info('Writing icon name type to "./src/util/iconName.ts"...')
 await fs.writeFile(
   './src/util/iconName.ts',
   `\
-// Generated by \`scripts/generateIcons.js\`.
-// Please run \`npm run generate\` to regenerate this file whenever \`icons.svg\` is changed.
+// Generated by \`scripts/generateIconMetadata.js\`.
+// Please run \`npm run generate-metadata\` to regenerate this file whenever \`icons.svg\` is changed.
 import iconNames from '@/util/iconList.json'
 
 export type Icon =
diff --git a/app/gui2/shared/ast/debug.ts b/app/gui2/shared/ast/debug.ts
new file mode 100644
index 000000000000..a63d26207e22
--- /dev/null
+++ b/app/gui2/shared/ast/debug.ts
@@ -0,0 +1,22 @@
+import { Ast } from './tree'
+
+/// Returns a GraphViz graph illustrating parent/child relationships in the given subtree.
+export function graphParentPointers(ast: Ast) {
+  const sanitize = (id: string) => id.replace('ast:', '').replace(/[^A-Za-z0-9]/g, '')
+  const parentToChild = new Array<{ parent: string; child: string }>()
+  const childToParent = new Array<{ child: string; parent: string }>()
+  ast.visitRecursiveAst((ast) => {
+    for (const child of ast.children()) {
+      if (child instanceof Ast)
+        parentToChild.push({ child: sanitize(child.id), parent: sanitize(ast.id) })
+    }
+    const parent = ast.parentId
+    if (parent) childToParent.push({ child: sanitize(ast.id), parent: sanitize(parent) })
+  })
+  let result = 'digraph parentPointers {\n'
+  for (const { parent, child } of parentToChild) result += `${parent} -> ${child};\n`
+  for (const { child, parent } of childToParent)
+    result += `${child} -> ${parent} [weight=0; color=red; style=dotted];\n`
+  result += '}\n'
+  return result
+}
diff --git a/app/gui2/shared/ast/ffi.ts b/app/gui2/shared/ast/ffi.ts
index 0f8aaaf99002..67bb6358dab1 100644
--- a/app/gui2/shared/ast/ffi.ts
+++ b/app/gui2/shared/ast/ffi.ts
@@ -1,6 +1,16 @@
+import { createXXHash128 } from 'hash-wasm'
 import init, { is_ident_or_operator, parse, parse_doc_to_json } from '../../rust-ffi/pkg/rust_ffi'
+import { assertDefined } from '../util/assert'
 import { isNode } from '../util/detect'
 
+let xxHasher128: Awaited<ReturnType<typeof createXXHash128>> | undefined
+export function xxHash128(input: string) {
+  assertDefined(xxHasher128, 'Module should have been loaded with `initializeFFI`.')
+  xxHasher128.init()
+  xxHasher128.update(input)
+  return xxHasher128.digest()
+}
+
 export async function initializeFFI(path?: string | undefined) {
   if (isNode) {
     const fs = await import('node:fs/promises')
@@ -9,6 +19,7 @@ export async function initializeFFI(path?: string | undefined) {
   } else {
     await init()
   }
+  xxHasher128 = await createXXHash128()
 }
 
 // TODO[ao]: We cannot to that, because the ffi is used by cjs modules.
diff --git a/app/gui2/shared/ast/index.ts b/app/gui2/shared/ast/index.ts
index 5833a292a872..3b14f82e08d4 100644
--- a/app/gui2/shared/ast/index.ts
+++ b/app/gui2/shared/ast/index.ts
@@ -40,7 +40,7 @@ export function parentId(ast: Ast): AstId | undefined {
 export function subtrees(module: Module, ids: Iterable<AstId>) {
   const subtrees = new Set<AstId>()
   for (const id of ids) {
-    let ast = module.get(id)
+    let ast = module.tryGet(id)
     while (ast != null && !subtrees.has(ast.id)) {
       subtrees.add(ast.id)
       ast = ast.parent()
@@ -50,10 +50,10 @@ export function subtrees(module: Module, ids: Iterable<AstId>) {
 }
 
 /** Returns the IDs of the ASTs that are not descendants of any others in the given set. */
-export function subtreeRoots(module: Module, ids: Set<AstId>) {
-  const roots = new Array<AstId>()
+export function subtreeRoots(module: Module, ids: Set<AstId>): Set<AstId> {
+  const roots = new Set<AstId>()
   for (const id of ids) {
-    const astInModule = module.get(id)
+    const astInModule = module.tryGet(id)
     if (!astInModule) continue
     let ast = astInModule.parent()
     let hasParentInSet
@@ -64,7 +64,7 @@ export function subtreeRoots(module: Module, ids: Set<AstId>) {
       }
       ast = ast.parent()
     }
-    if (!hasParentInSet) roots.push(id)
+    if (!hasParentInSet) roots.add(id)
   }
   return roots
 }
diff --git a/app/gui2/shared/ast/mutableModule.ts b/app/gui2/shared/ast/mutableModule.ts
index 447c666b4594..8b1126e7a824 100644
--- a/app/gui2/shared/ast/mutableModule.ts
+++ b/app/gui2/shared/ast/mutableModule.ts
@@ -1,16 +1,25 @@
 import * as random from 'lib0/random'
 import * as Y from 'yjs'
-import type { AstId, Owned, SyncTokenId } from '.'
-import { Token, asOwned, isTokenId, newExternalId } from '.'
-import { assert } from '../util/assert'
-import type { ExternalId } from '../yjsModel'
+import {
+  Token,
+  asOwned,
+  isTokenId,
+  newExternalId,
+  subtreeRoots,
+  type AstId,
+  type Owned,
+  type SyncTokenId,
+} from '.'
+import { assert, assertDefined } from '../util/assert'
+import type { SourceRangeEdit } from '../util/data/text'
+import { defaultLocalOrigin, tryAsOrigin, type ExternalId, type Origin } from '../yjsModel'
 import type { AstFields, FixedMap, Mutable } from './tree'
 import {
   Ast,
-  Invalid,
   MutableAst,
   MutableInvalid,
   Wildcard,
+  composeFieldData,
   invalidFields,
   materializeMutable,
   setAll,
@@ -19,13 +28,13 @@ import {
 export interface Module {
   edit(): MutableModule
   root(): Ast | undefined
-  get(id: AstId): Ast | undefined
-  get(id: AstId | undefined): Ast | undefined
+  tryGet(id: AstId | undefined): Ast | undefined
 
   /////////////////////////////////
 
-  checkedGet(id: AstId): Ast
-  checkedGet(id: AstId | undefined): Ast | undefined
+  /** Return the specified AST. Throws an exception if no AST with the provided ID was found. */
+  get(id: AstId): Ast
+  get(id: AstId | undefined): Ast | undefined
   getToken(token: SyncTokenId): Token
   getToken(token: SyncTokenId | undefined): Token | undefined
   getAny(node: AstId | SyncTokenId): Ast | Token
@@ -33,10 +42,12 @@ export interface Module {
 }
 
 export interface ModuleUpdate {
-  nodesAdded: AstId[]
-  nodesDeleted: AstId[]
-  fieldsUpdated: { id: AstId; fields: (readonly [string, unknown])[] }[]
+  nodesAdded: Set<AstId>
+  nodesDeleted: Set<AstId>
+  nodesUpdated: Set<AstId>
+  updateRoots: Set<AstId>
   metadataUpdated: { id: AstId; changes: Map<string, unknown> }[]
+  origin: Origin | undefined
 }
 
 type YNode = FixedMap<AstFields>
@@ -45,7 +56,7 @@ type YNodes = Y.Map<YNode>
 export class MutableModule implements Module {
   private readonly nodes: YNodes
 
-  get ydoc() {
+  private get ydoc() {
     const ydoc = this.nodes.doc
     assert(ydoc != null)
     return ydoc
@@ -53,7 +64,7 @@ export class MutableModule implements Module {
 
   /** Return this module's copy of `ast`, if this module was created by cloning `ast`'s module. */
   getVersion<T extends Ast>(ast: T): Mutable<T> {
-    const instance = this.checkedGet(ast.id)
+    const instance = this.get(ast.id)
     return instance as Mutable<T>
   }
 
@@ -63,6 +74,14 @@ export class MutableModule implements Module {
     return new MutableModule(doc)
   }
 
+  applyEdit(edit: MutableModule, origin: Origin = defaultLocalOrigin) {
+    Y.applyUpdateV2(this.ydoc, Y.encodeStateAsUpdateV2(edit.ydoc), origin)
+  }
+
+  transact<T>(f: () => T, origin: Origin = defaultLocalOrigin): T {
+    return this.ydoc.transact(f, origin)
+  }
+
   root(): MutableAst | undefined {
     return this.rootPointer()?.expression
   }
@@ -93,6 +112,22 @@ export class MutableModule implements Module {
     this.gc()
   }
 
+  syncToCode(code: string) {
+    const root = this.root()
+    if (root) {
+      root.syncToCode(code)
+    } else {
+      this.replaceRoot(Ast.parse(code, this))
+    }
+  }
+
+  /** Update the module according to changes to its corresponding source code. */
+  applyTextEdits(textEdits: SourceRangeEdit[], metadataSource?: Module) {
+    const root = this.root()
+    assertDefined(root)
+    root.applyTextEdits(textEdits, metadataSource)
+  }
+
   private gc() {
     const live = new Set<AstId>()
     const active = new Array<Ast>()
@@ -129,7 +164,9 @@ export class MutableModule implements Module {
   }
 
   observe(observer: (update: ModuleUpdate) => void) {
-    const handle = (events: Y.YEvent<any>[]) => observer(this.observeEvents(events))
+    const handle = (events: Y.YEvent<any>[], transaction: Y.Transaction) => {
+      observer(this.observeEvents(events, tryAsOrigin(transaction.origin)))
+    }
     // Attach the observer first, so that if an update hook causes changes in reaction to the initial state update, we
     // won't miss them.
     this.nodes.observeDeep(handle)
@@ -142,15 +179,15 @@ export class MutableModule implements Module {
   }
 
   getStateAsUpdate(): ModuleUpdate {
-    const updateBuilder = new UpdateBuilder(this.nodes)
+    const updateBuilder = new UpdateBuilder(this, this.nodes, undefined)
     for (const id of this.nodes.keys()) updateBuilder.addNode(id as AstId)
-    return updateBuilder
+    return updateBuilder.finish()
   }
 
-  applyUpdate(update: Uint8Array, origin?: string): ModuleUpdate | undefined {
+  applyUpdate(update: Uint8Array, origin: Origin): ModuleUpdate | undefined {
     let summary: ModuleUpdate | undefined
     const observer = (events: Y.YEvent<any>[]) => {
-      summary = this.observeEvents(events)
+      summary = this.observeEvents(events, origin)
     }
     this.nodes.observeDeep(observer)
     Y.applyUpdate(this.ydoc, update, origin)
@@ -158,8 +195,8 @@ export class MutableModule implements Module {
     return summary
   }
 
-  private observeEvents(events: Y.YEvent<any>[]): ModuleUpdate {
-    const updateBuilder = new UpdateBuilder(this.nodes)
+  private observeEvents(events: Y.YEvent<any>[], origin: Origin | undefined): ModuleUpdate {
+    const updateBuilder = new UpdateBuilder(this, this.nodes, origin)
     for (const event of events) {
       if (event.target === this.nodes) {
         // Updates to the node map.
@@ -201,25 +238,23 @@ export class MutableModule implements Module {
         updateBuilder.updateMetadata(id, changes)
       }
     }
-    return updateBuilder
+    return updateBuilder.finish()
   }
 
   clear() {
     this.nodes.clear()
   }
 
-  checkedGet(id: AstId): Mutable
-  checkedGet(id: AstId | undefined): Mutable | undefined
-  checkedGet(id: AstId | undefined): Mutable | undefined {
+  get(id: AstId): Mutable
+  get(id: AstId | undefined): Mutable | undefined
+  get(id: AstId | undefined): Mutable | undefined {
     if (!id) return undefined
-    const ast = this.get(id)
+    const ast = this.tryGet(id)
     assert(ast !== undefined, 'id in module')
     return ast
   }
 
-  get(id: AstId): Mutable | undefined
-  get(id: AstId | undefined): Mutable | undefined
-  get(id: AstId | undefined): Mutable | undefined {
+  tryGet(id: AstId | undefined): Mutable | undefined {
     if (!id) return undefined
     const nodeData = this.nodes.get(id)
     if (!nodeData) return undefined
@@ -228,19 +263,19 @@ export class MutableModule implements Module {
   }
 
   replace(id: AstId, value: Owned): Owned | undefined {
-    return this.get(id)?.replace(value)
+    return this.tryGet(id)?.replace(value)
   }
 
   replaceValue(id: AstId, value: Owned): Owned | undefined {
-    return this.get(id)?.replaceValue(value)
+    return this.tryGet(id)?.replaceValue(value)
   }
 
   take(id: AstId): Owned {
-    return this.replace(id, Wildcard.new(this)) || asOwned(this.checkedGet(id))
+    return this.replace(id, Wildcard.new(this)) || asOwned(this.get(id))
   }
 
   updateValue<T extends MutableAst>(id: AstId, f: (x: Owned) => Owned<T>): T | undefined {
-    return this.get(id)?.updateValue(f)
+    return this.tryGet(id)?.updateValue(f)
   }
 
   /////////////////////////////////////////////
@@ -250,7 +285,7 @@ export class MutableModule implements Module {
   }
 
   private rootPointer(): MutableRootPointer | undefined {
-    const rootPointer = this.get(ROOT_ID)
+    const rootPointer = this.tryGet(ROOT_ID)
     if (rootPointer) return rootPointer as MutableRootPointer
   }
 
@@ -269,8 +304,9 @@ export class MutableModule implements Module {
       parent: undefined,
       metadata: metadataFields,
     })
-    this.nodes.set(id, fields)
-    return fields
+    const fieldObject = composeFieldData(fields, {})
+    this.nodes.set(id, fieldObject)
+    return fieldObject
   }
 
   /** @internal */
@@ -283,7 +319,7 @@ export class MutableModule implements Module {
   }
 
   getAny(node: AstId | SyncTokenId): MutableAst | Token {
-    return isTokenId(node) ? this.getToken(node) : this.checkedGet(node)
+    return isTokenId(node) ? this.getToken(node) : this.get(node)
   }
 
   /** @internal Copy a node into the module, if it is bound to a different module. */
@@ -306,8 +342,6 @@ export class MutableModule implements Module {
 }
 
 type MutableRootPointer = MutableInvalid & { get expression(): MutableAst | undefined }
-/** @internal */
-export interface RootPointer extends Invalid {}
 
 function newAstId(type: string): AstId {
   return `ast:${type}#${random.uint53()}` as AstId
@@ -318,20 +352,24 @@ export function isAstId(value: string): value is AstId {
 }
 export const ROOT_ID = `Root` as AstId
 
-class UpdateBuilder implements ModuleUpdate {
-  readonly nodesAdded: AstId[] = []
-  readonly nodesDeleted: AstId[] = []
-  readonly fieldsUpdated: { id: AstId; fields: (readonly [string, unknown])[] }[] = []
+class UpdateBuilder {
+  readonly nodesAdded = new Set<AstId>()
+  readonly nodesDeleted = new Set<AstId>()
+  readonly nodesUpdated = new Set<AstId>()
   readonly metadataUpdated: { id: AstId; changes: Map<string, unknown> }[] = []
+  readonly origin: Origin | undefined
 
+  private readonly module: Module
   private readonly nodes: YNodes
 
-  constructor(nodes: YNodes) {
+  constructor(module: Module, nodes: YNodes, origin: Origin | undefined) {
+    this.module = module
     this.nodes = nodes
+    this.origin = origin
   }
 
   addNode(id: AstId) {
-    this.nodesAdded.push(id)
+    this.nodesAdded.add(id)
     this.updateAllFields(id)
   }
 
@@ -340,7 +378,7 @@ class UpdateBuilder implements ModuleUpdate {
   }
 
   updateFields(id: AstId, changes: Iterable<readonly [string, unknown]>) {
-    const fields = new Array<readonly [string, unknown]>()
+    let fieldsChanged = false
     let metadataChanges = undefined
     for (const entry of changes) {
       const [key, value] = entry
@@ -349,10 +387,10 @@ class UpdateBuilder implements ModuleUpdate {
         metadataChanges = new Map<string, unknown>(value.entries())
       } else {
         assert(!(value instanceof Y.AbstractType))
-        fields.push(entry)
+        fieldsChanged = true
       }
     }
-    if (fields.length !== 0) this.fieldsUpdated.push({ id, fields })
+    if (fieldsChanged) this.nodesUpdated.add(id)
     if (metadataChanges) this.metadataUpdated.push({ id, changes: metadataChanges })
   }
 
@@ -363,6 +401,11 @@ class UpdateBuilder implements ModuleUpdate {
   }
 
   deleteNode(id: AstId) {
-    this.nodesDeleted.push(id)
+    this.nodesDeleted.add(id)
+  }
+
+  finish(): ModuleUpdate {
+    const updateRoots = subtreeRoots(this.module, new Set(this.nodesUpdated.keys()))
+    return { ...this, updateRoots }
   }
 }
diff --git a/app/gui2/shared/ast/parse.ts b/app/gui2/shared/ast/parse.ts
index 0f4715e7933c..ce118e87d6a3 100644
--- a/app/gui2/shared/ast/parse.ts
+++ b/app/gui2/shared/ast/parse.ts
@@ -1,18 +1,37 @@
 import * as map from 'lib0/map'
+import type { AstId, Module, NodeChild, Owned } from '.'
 import {
   Token,
   asOwned,
   isTokenId,
+  newExternalId,
   parentId,
+  rewriteRefs,
   subtreeRoots,
-  type AstId,
-  type NodeChild,
-  type Owned,
+  syncFields,
+  syncNodeMetadata,
 } from '.'
 import { assert, assertDefined, assertEqual } from '../util/assert'
-import type { SourceRange, SourceRangeKey } from '../yjsModel'
-import { IdMap, isUuid, sourceRangeFromKey, sourceRangeKey } from '../yjsModel'
-import { parse_tree } from './ffi'
+import { tryGetSoleValue, zip } from '../util/data/iterable'
+import type { SourceRangeEdit, SpanTree } from '../util/data/text'
+import {
+  applyTextEdits,
+  applyTextEditsToSpans,
+  enclosingSpans,
+  textChangeToEdits,
+  trimEnd,
+} from '../util/data/text'
+import {
+  IdMap,
+  isUuid,
+  rangeLength,
+  sourceRangeFromKey,
+  sourceRangeKey,
+  type SourceRange,
+  type SourceRangeKey,
+} from '../yjsModel'
+import { graphParentPointers } from './debug'
+import { parse_tree, xxHash128 } from './ffi'
 import * as RawAst from './generated/ast'
 import { MutableModule } from './mutableModule'
 import type { LazyObject } from './parserSupport'
@@ -28,6 +47,8 @@ import {
   Ident,
   Import,
   Invalid,
+  MutableAssignment,
+  MutableAst,
   MutableBodyBlock,
   MutableIdent,
   NegationApp,
@@ -39,11 +60,16 @@ import {
   Wildcard,
 } from './tree'
 
-export function parseEnso(code: string): RawAst.Tree {
+/** Return the raw parser output for the given code. */
+export function parseEnso(code: string): RawAst.Tree.BodyBlock {
   const blob = parse_tree(code)
-  return RawAst.Tree.read(new DataView(blob.buffer), blob.byteLength - 4)
+  const tree = RawAst.Tree.read(new DataView(blob.buffer), blob.byteLength - 4)
+  // The root of the parser output is always a body block.
+  assert(tree.type === RawAst.Tree.Type.BodyBlock)
+  return tree
 }
 
+/** Print the AST and re-parse it, copying `externalId`s (but not other metadata) from the original. */
 export function normalize(rootIn: Ast): Ast {
   const printed = print(rootIn)
   const idMap = spanMapToIdMap(printed.info)
@@ -55,27 +81,54 @@ export function normalize(rootIn: Ast): Ast {
   return parsed
 }
 
+/** Produce `Ast` types from `RawAst` parser output. */
+export function abstract(
+  module: MutableModule,
+  tree: RawAst.Tree.BodyBlock,
+  code: string,
+  substitutor?: (key: NodeKey) => Owned | undefined,
+): { root: Owned<MutableBodyBlock>; spans: SpanMap; toRaw: Map<AstId, RawAst.Tree> }
 export function abstract(
   module: MutableModule,
   tree: RawAst.Tree,
   code: string,
+  substitutor?: (key: NodeKey) => Owned | undefined,
+): { root: Owned; spans: SpanMap; toRaw: Map<AstId, RawAst.Tree> }
+export function abstract(
+  module: MutableModule,
+  tree: RawAst.Tree,
+  code: string,
+  substitutor?: (key: NodeKey) => Owned | undefined,
 ): { root: Owned; spans: SpanMap; toRaw: Map<AstId, RawAst.Tree> } {
-  const abstractor = new Abstractor(module, code)
+  const abstractor = new Abstractor(module, code, substitutor)
   const root = abstractor.abstractTree(tree).node
   const spans = { tokens: abstractor.tokens, nodes: abstractor.nodes }
-  return { root, spans, toRaw: abstractor.toRaw }
+  return { root: root as Owned<MutableBodyBlock>, spans, toRaw: abstractor.toRaw }
 }
 
+/** Produces `Ast` types from `RawAst` parser output. */
 class Abstractor {
   private readonly module: MutableModule
   private readonly code: string
+  private readonly substitutor: ((key: NodeKey) => Owned | undefined) | undefined
   readonly nodes: NodeSpanMap
   readonly tokens: TokenSpanMap
   readonly toRaw: Map<AstId, RawAst.Tree>
 
-  constructor(module: MutableModule, code: string) {
+  /**
+   *  @param module - Where to allocate the new nodes.
+   *  @param code - Source code that will be used to resolve references in any passed `RawAst` objects.
+   *  @param substitutor - A function that can inject subtrees for some spans, instead of the abstractor producing them.
+   *    This can be used for incremental abstraction.
+   */
+  constructor(
+    module: MutableModule,
+    code: string,
+    substitutor?: (key: NodeKey) => Owned | undefined,
+  ) {
     this.module = module
     this.code = code
+    this.substitutor = substitutor
     this.nodes = new Map()
     this.tokens = new Map()
     this.toRaw = new Map()
@@ -88,6 +141,8 @@ class Abstractor {
     const codeStart = whitespaceEnd
     const codeEnd = codeStart + tree.childrenLengthInCodeParsed
     const spanKey = nodeKey(codeStart, codeEnd - codeStart)
+    const substitute = this.substitutor?.(spanKey)
+    if (substitute) return { node: substitute, whitespace }
     let node: Owned
     switch (tree.type) {
       case RawAst.Tree.Type.BodyBlock: {
@@ -153,10 +208,11 @@ class Abstractor {
           ? [this.abstractToken(tree.opr.value)]
           : Array.from(tree.opr.error.payload.operators, this.abstractToken.bind(this))
         const rhs = tree.rhs ? this.abstractTree(tree.rhs) : undefined
-        if (opr.length === 1 && opr[0]?.node.code() === '.' && rhs?.node instanceof MutableIdent) {
+        const soleOpr = tryGetSoleValue(opr)
+        if (soleOpr?.node.code() === '.' && rhs?.node instanceof MutableIdent) {
           // Propagate type.
           const rhs_ = { ...rhs, node: rhs.node }
-          node = PropertyAccess.concrete(this.module, lhs, opr[0], rhs_)
+          node = PropertyAccess.concrete(this.module, lhs, soleOpr, rhs_)
         } else {
           node = OprApp.concrete(this.module, lhs, opr, rhs)
         }
@@ -259,7 +315,7 @@ class Abstractor {
     return { whitespace, node }
   }
 
-  private abstractChildren(tree: LazyObject) {
+  private abstractChildren(tree: LazyObject): NodeChild<Owned | Token>[] {
     const children: NodeChild<Owned | Token>[] = []
     const visitor = (child: LazyObject) => {
       if (RawAst.Tree.isInstance(child)) {
@@ -276,29 +332,38 @@ class Abstractor {
 }
 
 declare const nodeKeyBrand: unique symbol
+/** A source-range key for an `Ast`. */
 export type NodeKey = SourceRangeKey & { [nodeKeyBrand]: never }
 declare const tokenKeyBrand: unique symbol
+/** A source-range key for a `Token`. */
 export type TokenKey = SourceRangeKey & { [tokenKeyBrand]: never }
+/** Create a source-range key for an `Ast`. */
 export function nodeKey(start: number, length: number): NodeKey {
   return sourceRangeKey([start, start + length]) as NodeKey
 }
+/** Create a source-range key for a `Token`. */
 export function tokenKey(start: number, length: number): TokenKey {
   return sourceRangeKey([start, start + length]) as TokenKey
 }
 
+/** Maps from source ranges to `Ast`s. */
 export type NodeSpanMap = Map<NodeKey, Ast[]>
+/** Maps from source ranges to `Token`s. */
 export type TokenSpanMap = Map<TokenKey, Token>
 
+/** Maps from source ranges to `Ast`s and `Token`s. */
 export interface SpanMap {
   nodes: NodeSpanMap
   tokens: TokenSpanMap
 }
 
+/** Code with an associated mapping to `Ast` types. */
 interface PrintedSource {
   info: SpanMap
   code: string
 }
 
+/** Generate an `IdMap` from a `SpanMap`. */
 export function spanMapToIdMap(spans: SpanMap): IdMap {
   const idMap = new IdMap()
   for (const [key, token] of spans.tokens.entries()) {
@@ -314,6 +379,7 @@ export function spanMapToIdMap(spans: SpanMap): IdMap {
   return idMap
 }
 
+/** Given a `SpanMap`, return a function that can look up source ranges by AST ID. */
 export function spanMapToSpanGetter(spans: SpanMap): (id: AstId) => SourceRange | undefined {
   const reverseMap = new Map<AstId, SourceRange>()
   for (const [key, asts] of spans.nodes) {
@@ -344,7 +410,7 @@ export function printAst(
 ): string {
   let code = ''
   for (const child of ast.concreteChildren(verbatim)) {
-    if (!isTokenId(child.node) && ast.module.checkedGet(child.node) === undefined) continue
+    if (!isTokenId(child.node) && ast.module.get(child.node) === undefined) continue
     if (child.whitespace != null) {
       code += child.whitespace
     } else if (code.length != 0) {
@@ -357,13 +423,16 @@ export function printAst(
       info.tokens.set(span, token)
       code += token.code()
     } else {
-      const childNode = ast.module.checkedGet(child.node)
-      assert(childNode != null)
+      const childNode = ast.module.get(child.node)
       code += childNode.printSubtree(info, offset + code.length, parentIndent, verbatim)
       // Extra structural validation.
       assertEqual(childNode.id, child.node)
       if (parentId(childNode) !== ast.id) {
-        console.error(`Inconsistent parent pointer (expected ${ast.id})`, childNode)
+        console.error(
+          `Inconsistent parent pointer (expected ${ast.id})`,
+          childNode,
+          graphParentPointers(ast.module.root()!),
+        )
       }
       assertEqual(parentId(childNode), ast.id)
     }
@@ -404,7 +473,7 @@ export function printBlock(
       }
       const validIndent = (line.expression.whitespace?.length ?? 0) > (parentIndent?.length ?? 0)
       code += validIndent ? line.expression.whitespace : blockIndent
-      const lineNode = block.module.checkedGet(line.expression.node)
+      const lineNode = block.module.get(line.expression.node)
       assertEqual(lineNode.id, line.expression.node)
       assertEqual(parentId(lineNode), block.id)
       code += lineNode.printSubtree(info, offset + code.length, blockIndent, verbatim)
@@ -416,7 +485,7 @@ export function printBlock(
 }
 
 /** Parse the input as a block. */
-export function parseBlock(code: string, inModule?: MutableModule) {
+export function parseBlock(code: string, inModule?: MutableModule): Owned<MutableBodyBlock> {
   return parseBlockWithSpans(code, inModule).root
 }
 
@@ -424,58 +493,55 @@ export function parseBlock(code: string, inModule?: MutableModule) {
 export function parse(code: string, module?: MutableModule): Owned {
   const module_ = module ?? MutableModule.Transient()
   const ast = parseBlock(code, module_)
-  const [expr] = ast.statements()
-  if (!expr) return ast
-  const parent = parentId(expr)
+  const soleStatement = tryGetSoleValue(ast.statements())
+  if (!soleStatement) return ast
+  const parent = parentId(soleStatement)
   if (parent) module_.delete(parent)
-  expr.fields.set('parent', undefined)
-  return asOwned(expr)
+  soleStatement.fields.set('parent', undefined)
+  return asOwned(soleStatement)
 }
 
+/** Parse a block, and return it along with a mapping from source locations to parsed objects. */
 export function parseBlockWithSpans(
   code: string,
   inModule?: MutableModule,
 ): { root: Owned<MutableBodyBlock>; spans: SpanMap } {
   const tree = parseEnso(code)
   const module = inModule ?? MutableModule.Transient()
-  return fromRaw(tree, code, module)
-}
-
-function fromRaw(
-  tree: RawAst.Tree,
-  code: string,
-  inModule?: MutableModule,
-): {
-  root: Owned<MutableBodyBlock>
-  spans: SpanMap
-  toRaw: Map<AstId, RawAst.Tree>
-} {
-  const module = inModule ?? MutableModule.Transient()
-  const ast = abstract(module, tree, code)
-  const spans = ast.spans
-  // The root of the tree produced by the parser is always a `BodyBlock`.
-  const root = ast.root as Owned<MutableBodyBlock>
-  return { root, spans, toRaw: ast.toRaw }
+  return abstract(module, tree, code)
 }
 
+/** Parse the input, and apply the given `IdMap`. Return the parsed tree, the updated `IdMap`, the span map, and a
+ *  mapping to the `RawAst` representation.
+ */
 export function parseExtended(code: string, idMap?: IdMap | undefined, inModule?: MutableModule) {
   const rawRoot = parseEnso(code)
   const module = inModule ?? MutableModule.Transient()
-  const { root, spans, toRaw, idMapUpdates } = module.ydoc.transact(() => {
-    const { root, spans, toRaw } = fromRaw(rawRoot, code, module)
+  const { root, spans, toRaw } = module.transact(() => {
+    const { root, spans, toRaw } = abstract(module, rawRoot, code)
     root.module.replaceRoot(root)
-    const idMapUpdates = idMap ? setExternalIds(root.module, spans, idMap) : 0
-    return { root, spans, toRaw, idMapUpdates }
-  }, 'local')
+    if (idMap) setExternalIds(root.module, spans, idMap)
+    return { root, spans, toRaw }
+  })
   const getSpan = spanMapToSpanGetter(spans)
   const idMapOut = spanMapToIdMap(spans)
-  return { root, idMap: idMapOut, getSpan, toRaw, idMapUpdates }
+  return { root, idMap: idMapOut, getSpan, toRaw }
 }
 
-export function setExternalIds(edit: MutableModule, spans: SpanMap, ids: IdMap) {
+/** Return the number of `Ast`s in the tree, including the provided root. */
+export function astCount(ast: Ast): number {
+  let count = 0
+  ast.visitRecursiveAst((_subtree) => {
+    count += 1
+  })
+  return count
+}
+
+/** Apply an `IdMap` to a module, using the given `SpanMap`.
+ *  @returns The number of IDs that were assigned from the map.
+ */
+export function setExternalIds(edit: MutableModule, spans: SpanMap, ids: IdMap): number {
   let astsMatched = 0
-  let asts = 0
-  edit.root()?.visitRecursiveAst((_ast) => (asts += 1))
   for (const [key, externalId] of ids.entries()) {
     const asts = spans.nodes.get(key as NodeKey)
     if (asts) {
@@ -486,9 +552,12 @@ export function setExternalIds(edit: MutableModule, spans: SpanMap, ids: IdMap)
       }
     }
   }
-  return edit.root() ? asts - astsMatched : 0
+  return astsMatched
 }
 
+/** Try to find all the spans in `expected` in `encountered`. If any are missing, use the provided `code` to determine
+ *  whether the lost spans are single-line or multi-line.
+ */
 function checkSpans(expected: NodeSpanMap, encountered: NodeSpanMap, code: string) {
   const lost = new Array<readonly [NodeKey, Ast]>()
   for (const [key, asts] of expected) {
@@ -573,7 +642,7 @@ function resync(
   const parentsOfBadSubtrees = new Set<AstId>()
   const badAstIds = new Set(Array.from(badAsts, (ast) => ast.id))
   for (const id of subtreeRoots(edit, badAstIds)) {
-    const parent = edit.checkedGet(id)?.parentId
+    const parent = edit.get(id)?.parentId
     if (parent) parentsOfBadSubtrees.add(parent)
   }
 
@@ -587,11 +656,11 @@ function resync(
   assertEqual(spanOfBadParent.length, parentsOfBadSubtrees.size)
 
   for (const [id, span] of spanOfBadParent) {
-    const parent = edit.checkedGet(id)
+    const parent = edit.get(id)
     const goodAst = goodSpans.get(span)?.[0]
     // The parent of the root of a bad subtree must be a good AST.
     assertDefined(goodAst)
-    parent.replaceValue(edit.copy(goodAst))
+    parent.syncToCode(goodAst.code())
   }
 
   console.warn(
@@ -599,3 +668,236 @@ function resync(
     parentsOfBadSubtrees,
   )
 }
+
+/** @internal Recursion helper for {@link syntaxHash}. */
+function hashSubtreeSyntax(ast: Ast, hashesOut: Map<SyntaxHash, Ast[]>): SyntaxHash {
+  let content = ''
+  content += ast.typeName + ':'
+  for (const child of ast.concreteChildren()) {
+    content += child.whitespace ?? '?'
+    if (isTokenId(child.node)) {
+      content += 'Token:' + hashString(ast.module.getToken(child.node).code())
+    } else {
+      content += hashSubtreeSyntax(ast.module.get(child.node), hashesOut)
+    }
+  }
+  const astHash = hashString(content)
+  map.setIfUndefined(hashesOut, astHash, (): Ast[] => []).unshift(ast)
+  return astHash
+}
+
+declare const brandHash: unique symbol
+/** See {@link syntaxHash}. */
+type SyntaxHash = string & { [brandHash]: never }
+/** Applies the syntax-data hashing function to the input, and brands the result as a `SyntaxHash`. */
+function hashString(input: string): SyntaxHash {
+  return xxHash128(input) as SyntaxHash
+}
+
+/** Calculates `SyntaxHash`es for the given node and all its children.
+ *
+ *  Each `SyntaxHash` summarizes the syntactic content of an AST. If two ASTs have the same code and were parsed the
+ *  same way (i.e. one was not parsed in a context that resulted in a different interpretation), they will have the same
+ *  hash. Note that the hash is invariant to metadata, including `externalId` assignments.
+ */
+function syntaxHash(root: Ast) {
+  const hashes = new Map<SyntaxHash, Ast[]>()
+  const rootHash = hashSubtreeSyntax(root, hashes)
+  return { root: rootHash, hashes }
+}
+
+/** If the input is a block containing a single expression, return the expression; otherwise return the input. */
+function rawBlockToInline(tree: RawAst.Tree.Tree) {
+  if (tree.type !== RawAst.Tree.Type.BodyBlock) return tree
+  return tryGetSoleValue(tree.statements)?.expression ?? tree
+}
+
+/** Update `ast` to match the given source code, while modifying it as little as possible. */
+export function syncToCode(ast: MutableAst, code: string, metadataSource?: Module) {
+  const codeBefore = ast.code()
+  const textEdits = textChangeToEdits(codeBefore, code)
+  applyTextEditsToAst(ast, textEdits, metadataSource ?? ast.module)
+}
+
+/** Find nodes in the input `ast` that should be treated as equivalents of nodes in `parsedRoot`. */
+function calculateCorrespondence(
+  ast: Ast,
+  astSpans: NodeSpanMap,
+  parsedRoot: Ast,
+  parsedSpans: NodeSpanMap,
+  textEdits: SourceRangeEdit[],
+  codeAfter: string,
+): Map<AstId, Ast> {
+  const newSpans = new Map<AstId, SourceRange>()
+  for (const [key, asts] of parsedSpans) {
+    for (const ast of asts) newSpans.set(ast.id, sourceRangeFromKey(key))
+  }
+
+  // Retained-code matching: For each new tree, check for some old tree of the same type such that the new tree is the
+  // smallest node to contain all characters of the old tree's code that were not deleted in the edit.
+  //
+  // If the new node's span exactly matches the retained code, add the match to `toSync`. If the new node's span
+  // contains additional code, add the match to `candidates`.
+  const toSync = new Map<AstId, Ast>()
+  const candidates = new Map<AstId, Ast>()
+  const allSpansBefore = Array.from(astSpans.keys(), sourceRangeFromKey)
+  const spansBeforeAndAfter = applyTextEditsToSpans(textEdits, allSpansBefore).map(
+    ([before, after]) => [before, trimEnd(after, codeAfter)] satisfies [any, any],
+  )
+  const partAfterToAstBefore = new Map<SourceRangeKey, Ast>()
+  for (const [spanBefore, partAfter] of spansBeforeAndAfter) {
+    const astBefore = astSpans.get(sourceRangeKey(spanBefore) as NodeKey)?.[0]!
+    partAfterToAstBefore.set(sourceRangeKey(partAfter), astBefore)
+  }
+  const matchingPartsAfter = spansBeforeAndAfter.map(([_before, after]) => after)
+  const parsedSpanTree = new AstWithSpans(parsedRoot, (id) => newSpans.get(id)!)
+  const astsMatchingPartsAfter = enclosingSpans(parsedSpanTree, matchingPartsAfter)
+  for (const [astAfter, partsAfter] of astsMatchingPartsAfter) {
+    for (const partAfter of partsAfter) {
+      const astBefore = partAfterToAstBefore.get(sourceRangeKey(partAfter))!
+      if (astBefore.typeName() === astAfter.typeName()) {
+        ;(rangeLength(newSpans.get(astAfter.id)!) === rangeLength(partAfter)
+          ? toSync
+          : candidates
+        ).set(astBefore.id, astAfter)
+        break
+      }
+    }
+  }
+
+  // Index the matched nodes.
+  const oldIdsMatched = new Set<AstId>()
+  const newIdsMatched = new Set<AstId>()
+  for (const [oldId, newAst] of toSync) {
+    oldIdsMatched.add(oldId)
+    newIdsMatched.add(newAst.id)
+  }
+
+  // Movement matching: For each new tree that hasn't been matched, match it with any identical unmatched old tree.
+  const newHashes = syntaxHash(parsedRoot).hashes
+  const oldHashes = syntaxHash(ast).hashes
+  for (const [hash, newAsts] of newHashes) {
+    const unmatchedNewAsts = newAsts.filter((ast) => !newIdsMatched.has(ast.id))
+    const unmatchedOldAsts = oldHashes.get(hash)?.filter((ast) => !oldIdsMatched.has(ast.id)) ?? []
+    for (const [unmatchedNew, unmatchedOld] of zip(unmatchedNewAsts, unmatchedOldAsts)) {
+      toSync.set(unmatchedOld.id, unmatchedNew)
+      // Update the matched-IDs indices.
+      oldIdsMatched.add(unmatchedOld.id)
+      newIdsMatched.add(unmatchedNew.id)
+    }
+  }
+
+  // Apply any non-optimal span matches from `candidates`, if the nodes involved were not matched during
+  // movement-matching.
+  for (const [beforeId, after] of candidates) {
+    if (oldIdsMatched.has(beforeId) || newIdsMatched.has(after.id)) continue
+    toSync.set(beforeId, after)
+  }
+
+  return toSync
+}
+
+/** Update `ast` according to changes to its corresponding source code. */
+export function applyTextEditsToAst(
+  ast: MutableAst,
+  textEdits: SourceRangeEdit[],
+  metadataSource: Module,
+) {
+  const printed = print(ast)
+  const code = applyTextEdits(printed.code, textEdits)
+  const rawParsedBlock = parseEnso(code)
+  const rawParsed =
+    ast instanceof MutableBodyBlock ? rawParsedBlock : rawBlockToInline(rawParsedBlock)
+  const parsed = abstract(ast.module, rawParsed, code)
+  const toSync = calculateCorrespondence(
+    ast,
+    printed.info.nodes,
+    parsed.root,
+    parsed.spans.nodes,
+    textEdits,
+    code,
+  )
+  syncTree(ast, parsed.root, toSync, ast.module, metadataSource)
+}
+
+/** Replace `target` with `newContent`, reusing nodes according to the correspondence in `toSync`. */
+function syncTree(
+  target: Ast,
+  newContent: Owned,
+  toSync: Map<AstId, Ast>,
+  edit: MutableModule,
+  metadataSource: Module,
+) {
+  const newIdToEquivalent = new Map<AstId, AstId>()
+  for (const [beforeId, after] of toSync) newIdToEquivalent.set(after.id, beforeId)
+  const childReplacerFor = (parentId: AstId) => (id: AstId) => {
+    const original = newIdToEquivalent.get(id)
+    if (original) {
+      const replacement = edit.get(original)
+      if (replacement.parentId !== parentId) replacement.fields.set('parent', parentId)
+      return original
+    } else {
+      const child = edit.get(id)
+      if (child.parentId !== parentId) child.fields.set('parent', parentId)
+    }
+  }
+  const parentId = target.fields.get('parent')
+  assertDefined(parentId)
+  const parent = edit.get(parentId)
+  const targetSyncEquivalent = toSync.get(target.id)
+  const syncRoot = targetSyncEquivalent?.id === newContent.id ? targetSyncEquivalent : undefined
+  if (!syncRoot) {
+    parent.replaceChild(target.id, newContent)
+    newContent.fields.set('metadata', target.fields.get('metadata').clone())
+    target.fields.get('metadata').set('externalId', newExternalId())
+  }
+  const newRoot = syncRoot ? target : newContent
+  newRoot.visitRecursiveAst((ast) => {
+    const syncFieldsFrom = toSync.get(ast.id)
+    const editAst = edit.getVersion(ast)
+    if (syncFieldsFrom) {
+      const originalAssignmentExpression =
+        ast instanceof Assignment
+          ? metadataSource.get(ast.fields.get('expression').node)
+          : undefined
+      syncFields(edit.getVersion(ast), syncFieldsFrom, childReplacerFor(ast.id))
+      if (editAst instanceof MutableAssignment && originalAssignmentExpression) {
+        if (editAst.expression.externalId !== originalAssignmentExpression.externalId)
+          editAst.expression.setExternalId(originalAssignmentExpression.externalId)
+        syncNodeMetadata(
+          editAst.expression.mutableNodeMetadata(),
+          originalAssignmentExpression.nodeMetadata,
+        )
+      }
+    } else {
+      rewriteRefs(editAst, childReplacerFor(ast.id))
+    }
+    return true
+  })
+  return newRoot
+}
+
+/** Provides a `SpanTree` view of an `Ast`, given span information. */
+class AstWithSpans implements SpanTree<Ast> {
+  private readonly ast: Ast
+  private readonly getSpan: (astId: AstId) => SourceRange
+
+  constructor(ast: Ast, getSpan: (astId: AstId) => SourceRange) {
+    this.ast = ast
+    this.getSpan = getSpan
+  }
+
+  id(): Ast {
+    return this.ast
+  }
+
+  span(): SourceRange {
+    return this.getSpan(this.ast.id)
+  }
+
+  *children(): IterableIterator<SpanTree<Ast>> {
+    for (const child of this.ast.children()) {
+      if (child instanceof Ast) yield new AstWithSpans(child, this.getSpan)
+    }
+  }
+}
diff --git a/app/gui2/shared/ast/sourceDocument.ts b/app/gui2/shared/ast/sourceDocument.ts
index 660569564eec..4dacefc903af 100644
--- a/app/gui2/shared/ast/sourceDocument.ts
+++ b/app/gui2/shared/ast/sourceDocument.ts
@@ -1,5 +1,9 @@
 import { print, type AstId, type Module, type ModuleUpdate } from '.'
-import { rangeEquals, sourceRangeFromKey, type SourceRange } from '../yjsModel'
+import { assertDefined } from '../util/assert'
+import type { SourceRangeEdit } from '../util/data/text'
+import { offsetEdit, textChangeToEdits } from '../util/data/text'
+import type { Origin, SourceRange } from '../yjsModel'
+import { rangeEquals, sourceRangeFromKey } from '../yjsModel'
 
 /** Provides a view of the text representation of a module,
  *  and information about the correspondence between the text and the ASTs,
@@ -8,10 +12,12 @@ import { rangeEquals, sourceRangeFromKey, type SourceRange } from '../yjsModel'
 export class SourceDocument {
   private text_: string
   private readonly spans: Map<AstId, SourceRange>
+  private readonly observers: SourceDocumentObserver[]
 
   private constructor(text: string, spans: Map<AstId, SourceRange>) {
     this.text_ = text
     this.spans = spans
+    this.observers = []
   }
 
   static Empty() {
@@ -19,23 +25,43 @@ export class SourceDocument {
   }
 
   clear() {
-    if (this.text_ !== '') this.text_ = ''
     if (this.spans.size !== 0) this.spans.clear()
+    if (this.text_ !== '') {
+      const range: SourceRange = [0, this.text_.length]
+      this.text_ = ''
+      this.notifyObservers([{ range, insert: '' }], undefined)
+    }
   }
 
   applyUpdate(module: Module, update: ModuleUpdate) {
     for (const id of update.nodesDeleted) this.spans.delete(id)
     const root = module.root()
     if (!root) return
+    const subtreeTextEdits = new Array<SourceRangeEdit>()
     const printed = print(root)
     for (const [key, nodes] of printed.info.nodes) {
       const range = sourceRangeFromKey(key)
       for (const node of nodes) {
         const oldSpan = this.spans.get(node.id)
         if (!oldSpan || !rangeEquals(range, oldSpan)) this.spans.set(node.id, range)
+        if (update.updateRoots.has(node.id) && node.id !== root.id) {
+          assertDefined(oldSpan)
+          const oldCode = this.text_.slice(oldSpan[0], oldSpan[1])
+          const newCode = printed.code.slice(range[0], range[1])
+          const subedits = textChangeToEdits(oldCode, newCode).map((textEdit) =>
+            offsetEdit(textEdit, oldSpan[0]),
+          )
+          subtreeTextEdits.push(...subedits)
+        }
       }
     }
-    if (printed.code !== this.text_) this.text_ = printed.code
+    if (printed.code !== this.text_) {
+      const textEdits = update.updateRoots.has(root.id)
+        ? [{ range: [0, this.text_.length] satisfies SourceRange, insert: printed.code }]
+        : subtreeTextEdits
+      this.text_ = printed.code
+      this.notifyObservers(textEdits, update.origin)
+    }
   }
 
   get text(): string {
@@ -45,4 +71,23 @@ export class SourceDocument {
   getSpan(id: AstId): SourceRange | undefined {
     return this.spans.get(id)
   }
+
+  observe(observer: SourceDocumentObserver) {
+    this.observers.push(observer)
+    if (this.text_.length) observer([{ range: [0, 0], insert: this.text_ }], undefined)
+  }
+
+  unobserve(observer: SourceDocumentObserver) {
+    const index = this.observers.indexOf(observer)
+    if (index !== undefined) this.observers.splice(index, 1)
+  }
+
+  private notifyObservers(textEdits: SourceRangeEdit[], origin: Origin | undefined) {
+    for (const o of this.observers) o(textEdits, origin)
+  }
 }
+
+export type SourceDocumentObserver = (
+  textEdits: SourceRangeEdit[],
+  origin: Origin | undefined,
+) => void
diff --git a/app/gui2/shared/ast/token.ts b/app/gui2/shared/ast/token.ts
index d4397fccb34e..e307f7a81cd4 100644
--- a/app/gui2/shared/ast/token.ts
+++ b/app/gui2/shared/ast/token.ts
@@ -23,6 +23,7 @@ export interface SyncTokenId {
   code_: string
   tokenType_: RawAst.Token.Type | undefined
 }
+
 export class Token implements SyncTokenId {
   readonly id: TokenId
   code_: string
@@ -47,6 +48,10 @@ export class Token implements SyncTokenId {
     return new this(code, type, id)
   }
 
+  static equal(a: SyncTokenId, b: SyncTokenId): boolean {
+    return a.tokenType_ === b.tokenType_ && a.code_ === b.code_
+  }
+
   code(): string {
     return this.code_
   }
diff --git a/app/gui2/shared/ast/tree.ts b/app/gui2/shared/ast/tree.ts
index 76641b3fd2d4..f9849f1615af 100644
--- a/app/gui2/shared/ast/tree.ts
+++ b/app/gui2/shared/ast/tree.ts
@@ -11,6 +11,7 @@ import type {
 } from '.'
 import {
   MutableModule,
+  ROOT_ID,
   Token,
   asOwned,
   isIdentifier,
@@ -18,17 +19,23 @@ import {
   isTokenId,
   newExternalId,
   parentId,
-  parse,
-  parseBlock,
-  print,
-  printAst,
-  printBlock,
 } from '.'
 import { assert, assertDefined, assertEqual, bail } from '../util/assert'
 import type { Result } from '../util/data/result'
 import { Err, Ok } from '../util/data/result'
+import type { SourceRangeEdit } from '../util/data/text'
 import type { ExternalId, VisualizationMetadata } from '../yjsModel'
+import { visMetadataEquals } from '../yjsModel'
 import * as RawAst from './generated/ast'
+import {
+  applyTextEditsToAst,
+  parse,
+  parseBlock,
+  print,
+  printAst,
+  printBlock,
+  syncToCode,
+} from './parse'
 
 declare const brandAstId: unique symbol
 export type AstId = string & { [brandAstId]: never }
@@ -47,12 +54,22 @@ export function asNodeMetadata(map: Map<string, unknown>): NodeMetadata {
   return map as unknown as NodeMetadata
 }
 /** @internal */
-export interface AstFields {
+interface RawAstFields {
   id: AstId
   type: string
   parent: AstId | undefined
   metadata: FixedMap<MetadataFields>
 }
+export interface AstFields extends RawAstFields, LegalFieldContent {}
+function allKeys<T>(keys: Record<keyof T, any>): (keyof T)[] {
+  return Object.keys(keys) as any
+}
+const astFieldKeys = allKeys<RawAstFields>({
+  id: null,
+  type: null,
+  parent: null,
+  metadata: null,
+})
 export abstract class Ast {
   readonly module: Module
   /** @internal */
@@ -104,8 +121,8 @@ export abstract class Ast {
     }
   }
 
-  visitRecursiveAst(visit: (ast: Ast) => void): void {
-    visit(this)
+  visitRecursiveAst(visit: (ast: Ast) => void | boolean): void {
+    if (visit(this) === false) return
     for (const child of this.children()) {
       if (!isToken(child)) child.visitRecursiveAst(visit)
     }
@@ -126,7 +143,7 @@ export abstract class Ast {
       if (isTokenId(child.node)) {
         yield this.module.getToken(child.node)
       } else {
-        const node = this.module.checkedGet(child.node)
+        const node = this.module.get(child.node)
         if (node) yield node
       }
     }
@@ -134,11 +151,11 @@ export abstract class Ast {
 
   get parentId(): AstId | undefined {
     const parentId = this.fields.get('parent')
-    if (parentId !== 'ROOT_ID') return parentId
+    if (parentId !== ROOT_ID) return parentId
   }
 
   parent(): Ast | undefined {
-    return this.module.checkedGet(this.parentId)
+    return this.module.get(this.parentId)
   }
 
   static parseBlock(source: string, inModule?: MutableModule) {
@@ -185,7 +202,7 @@ export abstract class MutableAst extends Ast {
   replace<T extends MutableAst>(replacement: Owned<T>): Owned<typeof this> {
     const parentId = this.fields.get('parent')
     if (parentId) {
-      const parent = this.module.checkedGet(parentId)
+      const parent = this.module.get(parentId)
       parent.replaceChild(this.id, replacement)
       this.fields.set('parent', undefined)
     }
@@ -230,7 +247,7 @@ export abstract class MutableAst extends Ast {
   takeIfParented(): Owned<typeof this> {
     const parent = parentId(this)
     if (parent) {
-      const parentAst = this.module.checkedGet(parent)
+      const parentAst = this.module.get(parent)
       const placeholder = Wildcard.new(this.module)
       parentAst.replaceChild(this.id, placeholder)
       this.fields.set('parent', undefined)
@@ -277,7 +294,17 @@ export abstract class MutableAst extends Ast {
   mutableParent(): MutableAst | undefined {
     const parentId = this.fields.get('parent')
     if (parentId === 'ROOT_ID') return
-    return this.module.checkedGet(parentId)
+    return this.module.get(parentId)
+  }
+
+  /** Modify this tree to represent the given code, while minimizing changes from the current set of `Ast`s. */
+  syncToCode(code: string, metadataSource?: Module) {
+    syncToCode(this, code, metadataSource)
+  }
+
+  /** Update the AST according to changes to its corresponding source code. */
+  applyTextEdits(textEdits: SourceRangeEdit[], metadataSource?: Module) {
+    applyTextEditsToAst(this, textEdits, metadataSource ?? this.module)
   }
 
   ///////////////////
@@ -287,7 +314,7 @@ export abstract class MutableAst extends Ast {
     if (module === this.module) return
     for (const child of this.concreteChildren()) {
       if (!isTokenId(child.node)) {
-        const childInForeignModule = module.checkedGet(child.node)
+        const childInForeignModule = module.get(child.node)
         assert(childInForeignModule !== undefined)
         const importedChild = this.module.copy(childInForeignModule)
         importedChild.fields.set('parent', undefined)
@@ -297,7 +324,11 @@ export abstract class MutableAst extends Ast {
   }
 
   /** @internal */
-  abstract replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>): void
+  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
+    const replacementId = this.claimChild(replacement)
+    const changes = rewriteRefs(this, (id) => (id === target ? replacementId : undefined))
+    assertEqual(changes, 1)
+  }
 
   protected claimChild<T extends MutableAst>(child: Owned<T>): AstId
   protected claimChild<T extends MutableAst>(child: Owned<T> | undefined): AstId | undefined
@@ -306,6 +337,130 @@ export abstract class MutableAst extends Ast {
   }
 }
 
+/** Values that may be found in fields of `Ast` subtypes. */
+type FieldData =
+  | NodeChild<AstId>
+  | NodeChild
+  | NodeChild<SyncTokenId>
+  | FieldData[]
+  | undefined
+  | StructuralField
+/** Objects that do not directly contain `AstId`s or `SyncTokenId`s, but may have `NodeChild` fields. */
+type StructuralField =
+  | RawMultiSegmentAppSegment
+  | RawBlockLine
+  | RawOpenCloseTokens
+  | RawNameSpecification
+/** Type whose fields are all suitable for storage as `Ast` fields. */
+interface FieldObject {
+  [field: string]: FieldData
+}
+/** Returns the fields of an `Ast` subtype that are not part of `AstFields`. */
+function* fieldDataEntries<Fields>(map: FixedMapView<Fields>) {
+  for (const entry of map.entries()) {
+    // All fields that are not from `AstFields` are `FieldData`.
+    if (!astFieldKeys.includes(entry[0] as any)) yield entry as [string, FieldData]
+  }
+}
+
+/** Apply the given function to each `AstId` in the fields of `ast`. For each value that it returns an output, that
+ *  output will be substituted for the input ID.
+ */
+export function rewriteRefs(ast: MutableAst, f: (id: AstId) => AstId | undefined) {
+  let fieldsChanged = 0
+  for (const [key, value] of fieldDataEntries(ast.fields)) {
+    const newValue = rewriteFieldRefs(value, f)
+    if (newValue !== undefined) {
+      ast.fields.set(key as any, newValue)
+      fieldsChanged += 1
+    }
+  }
+  return fieldsChanged
+}
+
+/** Copy all fields except the `Ast` base fields from `ast2` to `ast1`. A reference-rewriting function will be applied
+ *  to `AstId`s in copied fields; see {@link rewriteRefs}.
+ */
+export function syncFields(ast1: MutableAst, ast2: Ast, f: (id: AstId) => AstId | undefined) {
+  for (const [key, value] of fieldDataEntries(ast2.fields)) {
+    const changedValue = rewriteFieldRefs(value, f)
+    const newValue = changedValue ?? value
+    if (!fieldEqual(ast1.fields.get(key as any), newValue)) ast1.fields.set(key as any, newValue)
+  }
+}
+
+export function syncNodeMetadata(target: MutableNodeMetadata, source: NodeMetadata) {
+  const oldPos = target.get('position')
+  const newPos = source.get('position')
+  if (oldPos?.x !== newPos?.x || oldPos?.y !== newPos?.y) target.set('position', newPos)
+  const newVis = source.get('visualization')
+  if (!visMetadataEquals(target.get('visualization'), newVis)) target.set('visualization', newVis)
+}
+
+function rewriteFieldRefs(field: FieldData, f: (id: AstId) => AstId | undefined): FieldData {
+  if (field === undefined) return field
+  if ('node' in field) {
+    const child = field.node
+    if (isTokenId(child)) return
+    const newValue = f(child)
+    if (newValue !== undefined) {
+      field.node = newValue
+      return field
+    }
+  } else if (Array.isArray(field)) {
+    let fieldChanged = false
+    field.forEach((subfield, i) => {
+      const newValue = rewriteFieldRefs(subfield, f)
+      if (newValue !== undefined) {
+        field[i] = newValue
+        fieldChanged = true
+      }
+    })
+    if (fieldChanged) return field
+  } else {
+    const fieldObject = field satisfies StructuralField
+    let fieldChanged = false
+    for (const [key, value] of Object.entries(fieldObject)) {
+      const newValue = rewriteFieldRefs(value, f)
+      if (newValue !== undefined) {
+        // This update is safe because `newValue` was obtained by reading `fieldObject[key]` and modifying it in a
+        // type-preserving way.
+        ;(fieldObject as any)[key] = newValue
+        fieldChanged = true
+      }
+    }
+    if (fieldChanged) return fieldObject
+  }
+}
+
+function fieldEqual(field1: FieldData, field2: FieldData): boolean {
+  if (field1 === undefined) return field2 === undefined
+  if (field2 === undefined) return false
+  if ('node' in field1 && 'node' in field2) {
+    if (field1['whitespace'] !== field2['whitespace']) return false
+    if (isTokenId(field1.node) && isTokenId(field2.node))
+      return Token.equal(field1.node, field2.node)
+    else return field1.node === field2.node
+  } else if ('node' in field1 || 'node' in field2) {
+    return false
+  } else if (Array.isArray(field1) && Array.isArray(field2)) {
+    return (
+      field1.length === field2.length && field1.every((value1, i) => fieldEqual(value1, field2[i]))
+    )
+  } else if (Array.isArray(field1) || Array.isArray(field2)) {
+    return false
+  } else {
+    const fieldObject1 = field1 satisfies StructuralField
+    const fieldObject2 = field2 satisfies StructuralField
+    const keys = new Set<string>()
+    for (const key of Object.keys(fieldObject1)) keys.add(key)
+    for (const key of Object.keys(fieldObject2)) keys.add(key)
+    for (const key of keys)
+      if (!fieldEqual((fieldObject1 as any)[key], (fieldObject2 as any)[key])) return false
+    return true
+  }
+}
+
 function applyMixins(derivedCtor: any, constructors: any[]) {
   constructors.forEach((baseCtor) => {
     Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
@@ -320,10 +475,18 @@ function applyMixins(derivedCtor: any, constructors: any[]) {
 
 interface AppFields {
   function: NodeChild<AstId>
-  parens: { open: NodeChild<SyncTokenId>; close: NodeChild<SyncTokenId> } | undefined
-  nameSpecification: { name: NodeChild<SyncTokenId>; equals: NodeChild<SyncTokenId> } | undefined
+  parens: RawOpenCloseTokens | undefined
+  nameSpecification: RawNameSpecification | undefined
   argument: NodeChild<AstId>
 }
+interface RawOpenCloseTokens {
+  open: NodeChild<SyncTokenId>
+  close: NodeChild<SyncTokenId>
+}
+interface RawNameSpecification {
+  name: NodeChild<SyncTokenId>
+  equals: NodeChild<SyncTokenId>
+}
 export class App extends Ast {
   declare fields: FixedMap<AstFields & AppFields>
   constructor(module: Module, fields: FixedMapView<AstFields & AppFields>) {
@@ -344,7 +507,7 @@ export class App extends Ast {
   ) {
     const base = module.baseObject('App')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       function: concreteChild(module, func, id_),
       parens,
       nameSpecification,
@@ -361,7 +524,7 @@ export class App extends Ast {
   ) {
     return App.concrete(
       module,
-      unspaced(func),
+      autospaced(func),
       undefined,
       nameSpecification(argumentName),
       autospaced(argument),
@@ -369,26 +532,27 @@ export class App extends Ast {
   }
 
   get function(): Ast {
-    return this.module.checkedGet(this.fields.get('function').node)
+    return this.module.get(this.fields.get('function').node)
   }
   get argumentName(): Token | undefined {
     return this.module.getToken(this.fields.get('nameSpecification')?.name.node)
   }
   get argument(): Ast {
-    return this.module.checkedGet(this.fields.get('argument').node)
+    return this.module.get(this.fields.get('argument').node)
   }
 
   *concreteChildren(verbatim?: boolean): IterableIterator<NodeChild> {
     const { function: function_, parens, nameSpecification, argument } = getAll(this.fields)
-    yield function_
-    if (parens) yield parens.open
-    const spacedEquals = !!parens && !!nameSpecification?.equals.whitespace
+    yield ensureUnspaced(function_, verbatim)
+    const useParens = !!(parens && (nameSpecification || verbatim))
+    const spacedEquals = useParens && !!nameSpecification?.equals.whitespace
+    if (useParens) yield ensureSpaced(parens.open, verbatim)
     if (nameSpecification) {
-      yield ensureSpacedIf(nameSpecification.name, !parens, verbatim)
+      yield ensureSpacedIf(nameSpecification.name, !useParens, verbatim)
       yield ensureSpacedOnlyIf(nameSpecification.equals, spacedEquals, verbatim)
     }
     yield ensureSpacedOnlyIf(argument, !nameSpecification || spacedEquals, verbatim)
-    if (parens) yield parens.close
+    if (useParens) yield preferUnspaced(parens.close)
   }
 
   printSubtree(
@@ -424,6 +588,9 @@ function ensureUnspaced<T>(child: NodeChild<T>, verbatim: boolean | undefined):
   if (verbatim && child.whitespace != null) return child
   return child.whitespace === '' ? child : { whitespace: '', ...child }
 }
+function preferUnspaced<T>(child: NodeChild<T>): NodeChild<T> {
+  return child.whitespace === undefined ? { whitespace: '', ...child } : child
+}
 export class MutableApp extends App implements MutableAst {
   declare readonly module: MutableModule
   declare readonly fields: FixedMap<AstFields & AppFields>
@@ -437,14 +604,6 @@ export class MutableApp extends App implements MutableAst {
   setArgument<T extends MutableAst>(value: Owned<T>) {
     setNode(this.fields, 'argument', this.claimChild(value))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('function').node === target) {
-      this.setFunction(replacement)
-    } else if (this.fields.get('argument').node === target) {
-      this.setArgument(replacement)
-    }
-  }
 }
 export interface MutableApp extends App, MutableAst {
   get function(): MutableAst
@@ -474,7 +633,7 @@ export class UnaryOprApp extends Ast {
   ) {
     const base = module.baseObject('UnaryOprApp')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       operator,
       argument: concreteChild(module, argument, id_),
     })
@@ -489,7 +648,7 @@ export class UnaryOprApp extends Ast {
     return this.module.getToken(this.fields.get('operator').node)
   }
   get argument(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('argument')?.node)
+    return this.module.get(this.fields.get('argument')?.node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -508,12 +667,6 @@ export class MutableUnaryOprApp extends UnaryOprApp implements MutableAst {
   setArgument<T extends MutableAst>(argument: Owned<T> | undefined) {
     setNode(this.fields, 'argument', this.claimChild(argument))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('argument')?.node === target) {
-      this.setArgument(replacement)
-    }
-  }
 }
 export interface MutableUnaryOprApp extends UnaryOprApp, MutableAst {
   get argument(): MutableAst | undefined
@@ -538,7 +691,7 @@ export class NegationApp extends Ast {
   static concrete(module: MutableModule, operator: NodeChild<Token>, argument: NodeChild<Owned>) {
     const base = module.baseObject('NegationApp')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       operator,
       argument: concreteChild(module, argument, id_),
     })
@@ -553,7 +706,7 @@ export class NegationApp extends Ast {
     return this.module.getToken(this.fields.get('operator').node)
   }
   get argument(): Ast {
-    return this.module.checkedGet(this.fields.get('argument').node)
+    return this.module.get(this.fields.get('argument').node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -569,12 +722,6 @@ export class MutableNegationApp extends NegationApp implements MutableAst {
   setArgument<T extends MutableAst>(value: Owned<T>) {
     setNode(this.fields, 'argument', this.claimChild(value))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('argument')?.node === target) {
-      this.setArgument(replacement)
-    }
-  }
 }
 export interface MutableNegationApp extends NegationApp, MutableAst {
   get argument(): MutableAst
@@ -605,7 +752,7 @@ export class OprApp extends Ast {
   ) {
     const base = module.baseObject('OprApp')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       lhs: concreteChild(module, lhs, id_),
       operators,
       rhs: concreteChild(module, rhs, id_),
@@ -623,7 +770,7 @@ export class OprApp extends Ast {
   }
 
   get lhs(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('lhs')?.node)
+    return this.module.get(this.fields.get('lhs')?.node)
   }
   get operator(): Result<Token, NodeChild<Token>[]> {
     const operators = this.fields.get('operators')
@@ -635,7 +782,7 @@ export class OprApp extends Ast {
     return opr ? Ok(opr.node) : Err(operators_)
   }
   get rhs(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('rhs')?.node)
+    return this.module.get(this.fields.get('rhs')?.node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -658,14 +805,6 @@ export class MutableOprApp extends OprApp implements MutableAst {
   setRhs<T extends MutableAst>(value: Owned<T>) {
     setNode(this.fields, 'rhs', this.claimChild(value))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('lhs')?.node === target) {
-      this.setLhs(replacement)
-    } else if (this.fields.get('rhs')?.node === target) {
-      this.setRhs(replacement)
-    }
-  }
 }
 export interface MutableOprApp extends OprApp, MutableAst {
   get lhs(): MutableAst | undefined
@@ -736,7 +875,7 @@ export class PropertyAccess extends Ast {
   ) {
     const base = module.baseObject('PropertyAccess')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       lhs: concreteChild(module, lhs, id_),
       operator,
       rhs: concreteChild(module, rhs, id_),
@@ -745,13 +884,13 @@ export class PropertyAccess extends Ast {
   }
 
   get lhs(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('lhs')?.node)
+    return this.module.get(this.fields.get('lhs')?.node)
   }
   get operator(): Token {
     return this.module.getToken(this.fields.get('operator').node)
   }
   get rhs(): IdentifierOrOperatorIdentifierToken {
-    const ast = this.module.checkedGet(this.fields.get('rhs').node)
+    const ast = this.module.get(this.fields.get('rhs').node)
     assert(ast instanceof Ident)
     return ast.token as IdentifierOrOperatorIdentifierToken
   }
@@ -775,15 +914,6 @@ export class MutablePropertyAccess extends PropertyAccess implements MutableAst
     const old = this.fields.get('rhs')
     this.fields.set('rhs', old ? { ...old, node } : unspaced(node))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('lhs')?.node === target) {
-      this.setLhs(replacement)
-    } else if (this.fields.get('rhs')?.node === target) {
-      assert(replacement instanceof MutableIdent)
-      this.setRhs(replacement.token)
-    }
-  }
 }
 export interface MutablePropertyAccess extends PropertyAccess, MutableAst {
   get lhs(): MutableAst | undefined
@@ -802,7 +932,7 @@ export class Generic extends Ast {
   static concrete(module: MutableModule, children: NodeChild<Owned | Token>[]) {
     const base = module.baseObject('Generic')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       children: children.map((child) => concreteChild(module, child, id_)),
     })
     return asOwned(new MutableGeneric(module, fields))
@@ -815,14 +945,6 @@ export class Generic extends Ast {
 export class MutableGeneric extends Generic implements MutableAst {
   declare readonly module: MutableModule
   declare readonly fields: FixedMap<AstFields & GenericFields>
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const replacement_ = autospaced(this.claimChild(replacement))
-    this.fields.set(
-      'children',
-      this.fields.get('children').map((child) => (child.node === target ? replacement_ : child)),
-    )
-  }
 }
 export interface MutableGeneric extends Generic, MutableAst {}
 applyMixins(MutableGeneric, [MutableAst])
@@ -899,22 +1021,22 @@ export class Import extends Ast {
   }
 
   get polyglot(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('polyglot')?.body?.node)
+    return this.module.get(this.fields.get('polyglot')?.body?.node)
   }
   get from(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('from')?.body?.node)
+    return this.module.get(this.fields.get('from')?.body?.node)
   }
   get import_(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('import').body?.node)
+    return this.module.get(this.fields.get('import').body?.node)
   }
   get all(): Token | undefined {
     return this.module.getToken(this.fields.get('all')?.node)
   }
   get as(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('as')?.body?.node)
+    return this.module.get(this.fields.get('as')?.body?.node)
   }
   get hiding(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('hiding')?.body?.node)
+    return this.module.get(this.fields.get('hiding')?.body?.node)
   }
 
   static concrete(
@@ -928,7 +1050,7 @@ export class Import extends Ast {
   ) {
     const base = module.baseObject('Import')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       polyglot: multiSegmentAppSegmentToRaw(module, polyglot, id_),
       from: multiSegmentAppSegmentToRaw(module, from, id_),
       import: multiSegmentAppSegmentToRaw(module, import_, id_),
@@ -1023,21 +1145,6 @@ export class MutableImport extends Import implements MutableAst {
   setHiding<T extends MutableAst>(value: Owned<T> | undefined) {
     this.fields.set('hiding', this.toRaw(multiSegmentAppSegment('hiding', value)))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const { polyglot, from, import: import_, as, hiding } = getAll(this.fields)
-    polyglot?.body?.node === target
-      ? this.setPolyglot(replacement)
-      : from?.body?.node === target
-      ? this.setFrom(replacement)
-      : import_.body?.node === target
-      ? this.setImport(replacement)
-      : as?.body?.node === target
-      ? this.setAs(replacement)
-      : hiding?.body?.node === target
-      ? this.setHiding(replacement)
-      : bail(`Failed to find child ${target} in node ${this.externalId}.`)
-  }
 }
 export interface MutableImport extends Import, MutableAst {
   get polyglot(): MutableAst | undefined
@@ -1092,7 +1199,7 @@ export class TextLiteral extends Ast {
   ) {
     const base = module.baseObject('TextLiteral')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       open,
       newline,
       elements: elements.map((elem) => concreteChild(module, elem, id_)),
@@ -1119,14 +1226,6 @@ export class TextLiteral extends Ast {
 export class MutableTextLiteral extends TextLiteral implements MutableAst {
   declare readonly module: MutableModule
   declare readonly fields: FixedMap<AstFields & TextLiteralFields>
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const replacement_ = autospaced(this.claimChild(replacement))
-    this.fields.set(
-      'elements',
-      this.fields.get('elements').map((child) => (child.node === target ? replacement_ : child)),
-    )
-  }
 }
 export interface MutableTextLiteral extends TextLiteral, MutableAst {}
 applyMixins(MutableTextLiteral, [MutableAst])
@@ -1157,7 +1256,7 @@ export class Documented extends Ast {
   ) {
     const base = module.baseObject('Documented')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       open,
       elements: elements.map((elem) => concreteChild(module, elem, id_)),
       newlines,
@@ -1167,7 +1266,7 @@ export class Documented extends Ast {
   }
 
   get expression(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('expression')?.node)
+    return this.module.get(this.fields.get('expression')?.node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -1185,18 +1284,6 @@ export class MutableDocumented extends Documented implements MutableAst {
   setExpression<T extends MutableAst>(value: Owned<T> | undefined) {
     this.fields.set('expression', unspaced(this.claimChild(value)))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    if (this.fields.get('expression')?.node === target) {
-      this.setExpression(replacement)
-    } else {
-      const replacement_ = unspaced(this.claimChild(replacement))
-      this.fields.set(
-        'elements',
-        this.fields.get('elements').map((child) => (child.node === target ? replacement_ : child)),
-      )
-    }
-  }
 }
 export interface MutableDocumented extends Documented, MutableAst {
   get expression(): MutableAst | undefined
@@ -1218,7 +1305,7 @@ export class Invalid extends Ast {
   }
 
   get expression(): Ast {
-    return this.module.checkedGet(this.fields.get('expression').node)
+    return this.module.get(this.fields.get('expression').node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -1240,7 +1327,7 @@ export function invalidFields(
   expression: NodeChild<Owned>,
 ): FixedMap<AstFields & InvalidFields> {
   const id_ = base.get('id')
-  return setAll(base, { expression: concreteChild(module, expression, id_) })
+  return composeFieldData(base, { expression: concreteChild(module, expression, id_) })
 }
 export class MutableInvalid extends Invalid implements MutableAst {
   declare readonly module: MutableModule
@@ -1250,11 +1337,6 @@ export class MutableInvalid extends Invalid implements MutableAst {
   private setExpression<T extends MutableAst>(value: Owned<T>) {
     this.fields.set('expression', unspaced(this.claimChild(value)))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    assertEqual(this.fields.get('expression').node, target)
-    this.setExpression(replacement)
-  }
 }
 export interface MutableInvalid extends Invalid, MutableAst {
   /** The `expression` getter is intentionally not narrowed to provide mutable access:
@@ -1286,7 +1368,11 @@ export class Group extends Ast {
   ) {
     const base = module.baseObject('Group')
     const id_ = base.get('id')
-    const fields = setAll(base, { open, expression: concreteChild(module, expression, id_), close })
+    const fields = composeFieldData(base, {
+      open,
+      expression: concreteChild(module, expression, id_),
+      close,
+    })
     return asOwned(new MutableGroup(module, fields))
   }
 
@@ -1297,7 +1383,7 @@ export class Group extends Ast {
   }
 
   get expression(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('expression')?.node)
+    return this.module.get(this.fields.get('expression')?.node)
   }
 
   *concreteChildren(_verbatim?: boolean): IterableIterator<NodeChild> {
@@ -1314,11 +1400,6 @@ export class MutableGroup extends Group implements MutableAst {
   setExpression<T extends MutableAst>(value: Owned<T> | undefined) {
     this.fields.set('expression', unspaced(this.claimChild(value)))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    assertEqual(this.fields.get('expression')?.node, target)
-    this.setExpression(replacement)
-  }
 }
 export interface MutableGroup extends Group, MutableAst {
   get expression(): MutableAst | undefined
@@ -1344,7 +1425,7 @@ export class NumericLiteral extends Ast {
 
   static concrete(module: MutableModule, tokens: NodeChild<Token>[]) {
     const base = module.baseObject('NumericLiteral')
-    const fields = setAll(base, { tokens })
+    const fields = composeFieldData(base, { tokens })
     return asOwned(new MutableNumericLiteral(module, fields))
   }
 
@@ -1355,8 +1436,6 @@ export class NumericLiteral extends Ast {
 export class MutableNumericLiteral extends NumericLiteral implements MutableAst {
   declare readonly module: MutableModule
   declare readonly fields: FixedMap<AstFields & NumericLiteralFields>
-
-  replaceChild<T extends MutableAst>(_target: AstId, _replacement: Owned<T>) {}
 }
 export interface MutableNumericLiteral extends NumericLiteral, MutableAst {}
 applyMixins(MutableNumericLiteral, [MutableAst])
@@ -1398,10 +1477,10 @@ export class Function extends Ast {
   }
 
   get name(): Ast {
-    return this.module.checkedGet(this.fields.get('name').node)
+    return this.module.get(this.fields.get('name').node)
   }
   get body(): Ast | undefined {
-    return this.module.checkedGet(this.fields.get('body')?.node)
+    return this.module.get(this.fields.get('body')?.node)
   }
   get argumentDefinitions(): ArgumentDefinition[] {
     return this.fields.get('argumentDefinitions').map((raw) =>
@@ -1421,7 +1500,7 @@ export class Function extends Ast {
   ) {
     const base = module.baseObject('Function')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       name: concreteChild(module, name, id_),
       argumentDefinitions: argumentDefinitionsToRaw(module, argumentDefinitions, id_),
       equals,
@@ -1478,7 +1557,11 @@ export class Function extends Ast {
     for (const def of argumentDefinitions) yield* def
     yield { whitespace: equals.whitespace ?? ' ', node: this.module.getToken(equals.node) }
     if (body)
-      yield ensureSpacedOnlyIf(body, !(this.module.get(body.node) instanceof BodyBlock), verbatim)
+      yield ensureSpacedOnlyIf(
+        body,
+        !(this.module.tryGet(body.node) instanceof BodyBlock),
+        verbatim,
+      )
   }
 }
 export class MutableFunction extends Function implements MutableAst {
@@ -1503,23 +1586,6 @@ export class MutableFunction extends Function implements MutableAst {
     if (oldBody) newBody.push(oldBody.take())
     return newBody
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const { name, argumentDefinitions, body } = getAll(this.fields)
-    if (name.node === target) {
-      this.setName(replacement)
-    } else if (body?.node === target) {
-      this.setBody(replacement)
-    } else {
-      const replacement_ = this.claimChild(replacement)
-      const replaceChild = (child: NodeChild) =>
-        child.node === target ? { ...child, node: replacement_ } : child
-      this.fields.set(
-        'argumentDefinitions',
-        argumentDefinitions.map((def) => def.map(replaceChild)),
-      )
-    }
-  }
 }
 export interface MutableFunction extends Function, MutableAst {
   get name(): MutableAst
@@ -1551,7 +1617,7 @@ export class Assignment extends Ast {
   ) {
     const base = module.baseObject('Assignment')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       pattern: concreteChild(module, pattern, id_),
       equals,
       expression: concreteChild(module, expression, id_),
@@ -1569,10 +1635,10 @@ export class Assignment extends Ast {
   }
 
   get pattern(): Ast {
-    return this.module.checkedGet(this.fields.get('pattern').node)
+    return this.module.get(this.fields.get('pattern').node)
   }
   get expression(): Ast {
-    return this.module.checkedGet(this.fields.get('expression').node)
+    return this.module.get(this.fields.get('expression').node)
   }
 
   *concreteChildren(verbatim?: boolean): IterableIterator<NodeChild> {
@@ -1592,15 +1658,6 @@ export class MutableAssignment extends Assignment implements MutableAst {
   setExpression<T extends MutableAst>(value: Owned<T>) {
     setNode(this.fields, 'expression', this.claimChild(value))
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const { pattern, expression } = getAll(this.fields)
-    if (pattern.node === target) {
-      this.setPattern(replacement)
-    } else if (expression.node === target) {
-      this.setExpression(replacement)
-    }
-  }
 }
 export interface MutableAssignment extends Assignment, MutableAst {
   get pattern(): MutableAst
@@ -1625,7 +1682,7 @@ export class BodyBlock extends Ast {
   static concrete(module: MutableModule, lines: OwnedBlockLine[]) {
     const base = module.baseObject('BodyBlock')
     const id_ = base.get('id')
-    const fields = setAll(base, {
+    const fields = composeFieldData(base, {
       lines: lines.map((line) => lineToRaw(line, module, id_)),
     })
     return asOwned(new MutableBodyBlock(module, fields))
@@ -1702,19 +1759,10 @@ export class MutableBodyBlock extends BodyBlock implements MutableAst {
     const oldLines = this.fields.get('lines')
     const filteredLines = oldLines.filter((line) => {
       if (!line.expression) return true
-      return keep(this.module.checkedGet(line.expression.node))
+      return keep(this.module.get(line.expression.node))
     })
     this.fields.set('lines', filteredLines)
   }
-
-  replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
-    const replacement_ = this.claimChild(replacement)
-    const updateLine = (line: RawBlockLine) =>
-      line.expression?.node === target
-        ? { ...line, expression: { ...line.expression, node: replacement_ } }
-        : line
-    this.fields.set('lines', this.fields.get('lines').map(updateLine))
-  }
 }
 export interface MutableBodyBlock extends BodyBlock, MutableAst {
   statements(): IterableIterator<MutableAst>
@@ -1730,12 +1778,12 @@ interface Line<T> {
   expression: NodeChild<T> | undefined
 }
 
-type RawBlockLine = RawLine<AstId>
+interface RawBlockLine extends RawLine<AstId> {}
 export type BlockLine = Line<Ast>
 export type OwnedBlockLine = Line<Owned>
 
 function lineFromRaw(raw: RawBlockLine, module: Module): BlockLine {
-  const expression = raw.expression ? module.checkedGet(raw.expression.node) : undefined
+  const expression = raw.expression ? module.get(raw.expression.node) : undefined
   return {
     newline: { ...raw.newline, node: module.getToken(raw.newline.node) },
     expression: expression
@@ -1748,9 +1796,7 @@ function lineFromRaw(raw: RawBlockLine, module: Module): BlockLine {
 }
 
 function ownedLineFromRaw(raw: RawBlockLine, module: MutableModule): OwnedBlockLine {
-  const expression = raw.expression
-    ? module.checkedGet(raw.expression.node).takeIfParented()
-    : undefined
+  const expression = raw.expression ? module.get(raw.expression.node).takeIfParented() : undefined
   return {
     newline: { ...raw.newline, node: module.getToken(raw.newline.node) },
     expression: expression
@@ -1794,7 +1840,7 @@ export class Ident extends Ast {
 
   static concrete(module: MutableModule, token: NodeChild<Token>) {
     const base = module.baseObject('Ident')
-    const fields = setAll(base, { token })
+    const fields = composeFieldData(base, { token })
     return asOwned(new MutableIdent(module, fields))
   }
 
@@ -1823,8 +1869,6 @@ export class MutableIdent extends Ident implements MutableAst {
     this.fields.set('token', unspaced(toIdent(ident)))
   }
 
-  replaceChild<T extends MutableAst>(_target: AstId, _replacement: Owned<T>) {}
-
   code(): Identifier {
     return this.token.code()
   }
@@ -1852,7 +1896,7 @@ export class Wildcard extends Ast {
 
   static concrete(module: MutableModule, token: NodeChild<Token>) {
     const base = module.baseObject('Wildcard')
-    const fields = setAll(base, { token })
+    const fields = composeFieldData(base, { token })
     return asOwned(new MutableWildcard(module, fields))
   }
 
@@ -1869,8 +1913,6 @@ export class Wildcard extends Ast {
 export class MutableWildcard extends Wildcard implements MutableAst {
   declare readonly module: MutableModule
   declare readonly fields: FixedMap<AstFields & WildcardFields>
-
-  replaceChild<T extends MutableAst>(_target: AstId, _replacement: Owned<T>) {}
 }
 export interface MutableWildcard extends Wildcard, MutableAst {}
 applyMixins(MutableWildcard, [MutableAst])
@@ -2010,19 +2052,36 @@ function getAll<Fields extends object>(map: FixedMapView<Fields>): Fields {
   return Object.fromEntries(map.entries()) as Fields
 }
 
+declare const brandLegalFieldContent: unique symbol
+/** Used to add a constraint to all `AstFields`s subtypes ensuring that they were produced by `composeFieldData`, which
+ *  enforces a requirement that the provided fields extend `FieldObject`.
+ */
+interface LegalFieldContent {
+  [brandLegalFieldContent]: never
+}
+
 /** Modifies the input `map`. Returns the same object with an extended type. */
-export function setAll<Fields1, Fields2 extends object>(
+export function setAll<Fields1, Fields2 extends Record<string, any>>(
   map: FixedMap<Fields1>,
   fields: Fields2,
 ): FixedMap<Fields1 & Fields2> {
   const map_ = map as FixedMap<Fields1 & Fields2>
   for (const [k, v] of Object.entries(fields)) {
     const k_ = k as string & (keyof Fields1 | keyof Fields2)
-    map_.set(k_, v)
+    map_.set(k_, v as any)
   }
   return map_
 }
 
+/** Modifies the input `map`. Returns the same object with an extended type. The added fields are required to have only
+ *  types extending `FieldData`; the returned object is branded as `LegalFieldContent`. */
+export function composeFieldData<Fields1, Fields2 extends FieldObject>(
+  map: FixedMap<Fields1>,
+  fields: Fields2,
+): FixedMap<Fields1 & Fields2 & LegalFieldContent> {
+  return setAll(map, fields) as FixedMap<Fields1 & Fields2 & LegalFieldContent>
+}
+
 function claimChild<T extends MutableAst>(
   module: MutableModule,
   child: Owned<T>,
diff --git a/app/gui2/shared/util/data/__tests__/iterable.test.ts b/app/gui2/shared/util/data/__tests__/iterable.test.ts
new file mode 100644
index 000000000000..3ee69da0453e
--- /dev/null
+++ b/app/gui2/shared/util/data/__tests__/iterable.test.ts
@@ -0,0 +1,8 @@
+import { tryGetSoleValue } from 'shared/util/data/iterable'
+import { expect, test } from 'vitest'
+
+test('tryGetSoleValue', () => {
+  expect(tryGetSoleValue([])).toBeUndefined()
+  expect(tryGetSoleValue([1])).toEqual(1)
+  expect(tryGetSoleValue([1, 2])).toBeUndefined()
+})
diff --git a/app/gui2/shared/util/data/__tests__/text.test.ts b/app/gui2/shared/util/data/__tests__/text.test.ts
new file mode 100644
index 000000000000..ff82efe66072
--- /dev/null
+++ b/app/gui2/shared/util/data/__tests__/text.test.ts
@@ -0,0 +1,166 @@
+import { fc, test } from '@fast-check/vitest'
+import { expect } from 'vitest'
+import { applyTextEdits, applyTextEditsToSpans, textChangeToEdits, trimEnd } from '../text'
+
+test.prop({
+  before: fc.array(fc.boolean(), { minLength: 32, maxLength: 64 }),
+  after: fc.array(fc.boolean(), { minLength: 32, maxLength: 64 }),
+})('textChangeToEdits / applyTextEdits round-trip', ({ before, after }) => {
+  // Generate strings composed of a mix of only two characters so that `textChangeToEdits` will find a variety of
+  // similarities between the inputs.
+  const stringFromBools = (bools: Array<boolean>) =>
+    bools.map((bool) => (bool ? 't' : 'f')).join('')
+  const beforeString = stringFromBools(before)
+  const afterString = stringFromBools(after)
+  const edits = textChangeToEdits(beforeString, afterString)
+  expect(applyTextEdits(beforeString, edits)).toBe(afterString)
+})
+
+/** Test that `textChangeToEdits` and `applyTextEdits` work when inputs contain any special characters representable by
+ *  a `string`, including newlines and even incomplete surrogate pairs (invalid Unicode).
+ */
+test.prop({
+  before: fc.array(fc.string16bits(), { maxLength: 8 }),
+})('textChangeToEdits / applyTextEdits round-trip: Special characters', ({ before }) => {
+  const beforeString = before.join('\n')
+  // Produce the after-string by rearranging the lines of the before-string, so that the edit-relationship between them
+  // is non-trivial.
+  const afterString = before.sort().join('\n')
+  const edits = textChangeToEdits(beforeString, afterString)
+  expect(applyTextEdits(beforeString, edits)).toBe(afterString)
+})
+
+/** Tests that:
+ *  - When the code in `a[0]` is edited to become the code in `b[0]`,
+ *    `applyTextEditsToSpans` followed by `trimEnd` transforms the spans in `a.slice(1)` into the spans in `b.slice(1)`.
+ *  - The same holds when editing from `b` to `a`.
+ */
+function checkCorrespondence(a: string[], b: string[]) {
+  checkCorrespondenceForward(a, b)
+  checkCorrespondenceForward(b, a)
+}
+
+/** Performs the same check as {@link checkCorrespondence}, for correspondences that are not expected to be reversible.
+ */
+function checkCorrespondenceForward(before: string[], after: string[]) {
+  const leadingSpacesAndLength = (input: string): [number, number] => [
+    input.lastIndexOf(' ') + 1,
+    input.length,
+  ]
+  const spacesAndHyphens = ([spaces, length]: readonly [number, number]) => {
+    return ' '.repeat(spaces) + '-'.repeat(length - spaces)
+  }
+  const edits = textChangeToEdits(before[0]!, after[0]!)
+  const spansAfter = applyTextEditsToSpans(edits, before.slice(1).map(leadingSpacesAndLength)).map(
+    ([_spanBefore, spanAfter]) => trimEnd(spanAfter, after[0]!),
+  )
+  expect([after[0]!, ...spansAfter.map(spacesAndHyphens)]).toEqual(after)
+}
+
+test('applyTextEditsToSpans: Add and remove argument names.', () => {
+  checkCorrespondence(
+    [
+      'func arg1 arg2', // prettier-ignore
+      '----',
+      '     ----',
+      '---------',
+      '          ----',
+      '--------------',
+    ],
+    [
+      'func name1=arg1 name2=arg2',
+      '----',
+      '           ----',
+      '---------------',
+      '                      ----',
+      '--------------------------',
+    ],
+  )
+})
+
+test('applyTextEditsToSpans: Lengthen and shorten argument names.', () => {
+  checkCorrespondence(
+    [
+      'func name1=arg1 name2=arg2',
+      '----',
+      '           ----',
+      '---------------',
+      '                      ----',
+      '--------------------------',
+    ],
+    [
+      'func longName1=arg1 longName2=arg2',
+      '----',
+      '               ----',
+      '-------------------',
+      '                              ----',
+      '----------------------------------',
+    ],
+  )
+})
+
+test('applyTextEditsToSpans: Add and remove inner application.', () => {
+  checkCorrespondence(
+    [
+      'func bbb2', // prettier-ignore
+      '----',
+      '     ----',
+      '---------',
+    ],
+    [
+      'func aaa1 bbb2', // prettier-ignore
+      '----',
+      '          ----',
+      '--------------',
+    ],
+  )
+})
+
+test('applyTextEditsToSpans: Add and remove outer application.', () => {
+  checkCorrespondence(
+    [
+      'func arg1', // prettier-ignore
+      '----',
+      '     ----',
+      '---------',
+    ],
+    [
+      'func arg1 arg2', // prettier-ignore
+      '----',
+      '     ----',
+      '---------',
+    ],
+  )
+})
+
+test('applyTextEditsToSpans: Distinguishing repeated subexpressions.', () => {
+  checkCorrespondence(
+    [
+      'foo (2 + 2) bar () (2 + 2)', // prettier-ignore
+      '     -----',
+      '    -------',
+      '                    -----',
+      '                   -------',
+    ],
+    [
+      'foo (2 + 2) bar (2 + 2) (2 + 2)', // prettier-ignore
+      '     -----',
+      '    -------',
+      '                         -----',
+      '                        -------',
+    ],
+  )
+})
+
+test('applyTextEditsToSpans: Space after line content.', () => {
+  checkCorrespondenceForward(
+    [
+      'value = 1 +', // prettier-ignore
+      '-----------',
+    ],
+    [
+      'value = 1 ', // prettier-ignore
+      '---------',
+    ],
+  )
+})
diff --git a/app/gui2/shared/util/data/iterable.ts b/app/gui2/shared/util/data/iterable.ts
new file mode 100644
index 000000000000..96d36d9406a4
--- /dev/null
+++ b/app/gui2/shared/util/data/iterable.ts
@@ -0,0 +1,98 @@
+/** @file Functions for manipulating {@link Iterable}s. */
+
+export function* empty(): Generator<never> {}
+
+export function* range(start: number, stop: number, step = start <= stop ? 1 : -1) {
+  if ((step > 0 && start > stop) || (step < 0 && start < stop)) {
+    throw new Error(
+      "The range's step is in the wrong direction - please use Infinity or -Infinity as the endpoint for an infinite range.",
+    )
+  }
+  if (start <= stop) {
+    while (start < stop) {
+      yield start
+      start += step
+    }
+  } else {
+    while (start > stop) {
+      yield start
+      start += step
+    }
+  }
+}
+
+export function* map<T, U>(iter: Iterable<T>, map: (value: T) => U) {
+  for (const value of iter) {
+    yield map(value)
+  }
+}
+
+export function* chain<T>(...iters: Iterable<T>[]) {
+  for (const iter of iters) {
+    yield* iter
+  }
+}
+
+export function* zip<T, U>(left: Iterable<T>, right: Iterable<U>): Generator<[T, U]> {
+  const leftIterator = left[Symbol.iterator]()
+  const rightIterator = right[Symbol.iterator]()
+  while (true) {
+    const leftResult = leftIterator.next()
+    const rightResult = rightIterator.next()
+    if (leftResult.done || rightResult.done) break
+    yield [leftResult.value, rightResult.value]
+  }
+}
+
+export function* zipLongest<T, U>(
+  left: Iterable<T>,
+  right: Iterable<U>,
+): Generator<[T | undefined, U | undefined]> {
+  const leftIterator = left[Symbol.iterator]()
+  const rightIterator = right[Symbol.iterator]()
+  while (true) {
+    const leftResult = leftIterator.next()
+    const rightResult = rightIterator.next()
+    if (leftResult.done && rightResult.done) break
+    yield [
+      leftResult.done ? undefined : leftResult.value,
+      rightResult.done ? undefined : rightResult.value,
+    ]
+  }
+}
+
+export function tryGetSoleValue<T>(iter: Iterable<T>): T | undefined {
+  const iterator = iter[Symbol.iterator]()
+  const result = iterator.next()
+  if (result.done) return
+  const excessResult = iterator.next()
+  if (!excessResult.done) return
+  return result.value
+}
+
+/** Utility to simplify consuming an iterator a part at a time. */
+export class Resumable<T> {
+  private readonly iterator: Iterator<T>
+  private current: IteratorResult<T>
+  constructor(iterable: Iterable<T>) {
+    this.iterator = iterable[Symbol.iterator]()
+    this.current = this.iterator.next()
+  }
+
+  /** The given function peeks at the current value. If the function returns `true`, the current value will be advanced
+   *  and the function called again; if it returns `false`, the peeked value remains current and `advanceWhile` returns.
+   */
+  advanceWhile(f: (value: T) => boolean) {
+    while (!this.current.done && f(this.current.value)) {
+      this.current = this.iterator.next()
+    }
+  }
+
+  /** Apply the given function to all values remaining in the iterator. */
+  forEach(f: (value: T) => void) {
+    while (!this.current.done) {
+      f(this.current.value)
+      this.current = this.iterator.next()
+    }
+  }
+}
diff --git a/app/gui2/shared/util/data/text.ts b/app/gui2/shared/util/data/text.ts
new file mode 100644
index 000000000000..9f4027df94b4
--- /dev/null
+++ b/app/gui2/shared/util/data/text.ts
@@ -0,0 +1,149 @@
+import diff from 'fast-diff'
+import { rangeEncloses, rangeLength, type SourceRange } from '../../yjsModel'
+import { Resumable } from './iterable'
+
+export type SourceRangeEdit = { range: SourceRange; insert: string }
+
+/** Given text and a set of `TextEdit`s, return the result of applying the edits to the text. */
+export function applyTextEdits(oldText: string, textEdits: SourceRangeEdit[]) {
+  textEdits.sort((a, b) => a.range[0] - b.range[0])
+  let start = 0
+  let newText = ''
+  for (const textEdit of textEdits) {
+    newText += oldText.slice(start, textEdit.range[0])
+    newText += textEdit.insert
+    start = textEdit.range[1]
+  }
+  newText += oldText.slice(start)
+  return newText
+}
+
+/** Given text before and after a change, return one possible set of {@link SourceRangeEdit}s describing the change. */
+export function textChangeToEdits(before: string, after: string): SourceRangeEdit[] {
+  const textEdits: SourceRangeEdit[] = []
+  let nextEdit: undefined | SourceRangeEdit
+  let pos = 0
+  // Sequences fast-diff emits:
+  // EQUAL, INSERT
+  // EQUAL, DELETE
+  // DELETE, EQUAL
+  // DELETE, INSERT
+  // INSERT, EQUAL
+  for (const [op, text] of diff(before, after)) {
+    switch (op) {
+      case diff.INSERT:
+        if (!nextEdit) nextEdit = { range: [pos, pos], insert: '' }
+        nextEdit.insert = text
+        break
+      case diff.EQUAL:
+        if (nextEdit) {
+          textEdits.push(nextEdit)
+          nextEdit = undefined
+        }
+        pos += text.length
+        break
+      case diff.DELETE: {
+        if (nextEdit) textEdits.push(nextEdit)
+        const endPos = pos + text.length
+        nextEdit = { range: [pos, endPos], insert: '' }
+        pos = endPos
+        break
+      }
+    }
+  }
+  if (nextEdit) textEdits.push(nextEdit)
+  return textEdits
+}
+
+/** Translate a `TextEdit` by the specified offset. */
+export function offsetEdit(textEdit: SourceRangeEdit, offset: number): SourceRangeEdit {
+  return { ...textEdit, range: [textEdit.range[0] + offset, textEdit.range[1] + offset] }
+}
+
+/** Given:
+ *  @param textEdits - A change described by a set of text edits.
+ *  @param spansBefore - A collection of spans in the text before the edit.
+ *  @returns - A sequence of: Each span from `spansBefore` paired with the smallest span of the text after the edit that
+ *  contains all text that was in the original span and has not been deleted. */
+export function applyTextEditsToSpans(textEdits: SourceRangeEdit[], spansBefore: SourceRange[]) {
+  // Gather start and end points.
+  const numerically = (a: number, b: number) => a - b
+  const starts = new Resumable(spansBefore.map(([start, _end]) => start).sort(numerically))
+  const ends = new Resumable(spansBefore.map(([_start, end]) => end).sort(numerically))
+
+  // Construct translations from old locations to new locations for all start and end points.
+  const startMap = new Map<number, number>()
+  const endMap = new Map<number, number>()
+  let offset = 0
+  for (const { range, insert } of textEdits) {
+    starts.advanceWhile((start) => {
+      if (start < range[0]) {
+        startMap.set(start, start + offset)
+        return true
+      } else if (start <= range[1]) {
+        startMap.set(start, range[0] + offset + insert.length)
+        return true
+      }
+      return false
+    })
+    ends.advanceWhile((end) => {
+      if (end <= range[0]) {
+        endMap.set(end, end + offset)
+        return true
+      } else if (end <= range[1]) {
+        endMap.set(end, range[0] + offset)
+        return true
+      }
+      return false
+    })
+    offset += insert.length - rangeLength(range)
+  }
+  starts.forEach((start) => startMap.set(start, start + offset))
+  ends.forEach((end) => endMap.set(end, end + offset))
+
+  // Apply the translations to the map.
+  const spansBeforeAndAfter = new Array<readonly [SourceRange, SourceRange]>()
+  for (const spanBefore of spansBefore) {
+    const startAfter = startMap.get(spanBefore[0])!
+    const endAfter = endMap.get(spanBefore[1])!
+    if (endAfter > startAfter) spansBeforeAndAfter.push([spanBefore, [startAfter, endAfter]])
+  }
+  return spansBeforeAndAfter
+}
+
+export interface SpanTree<NodeId> {
+  id(): NodeId
+  span(): SourceRange
+  children(): IterableIterator<SpanTree<NodeId>>
+}
+
+/** Given a span tree and some ranges, for each range find the smallest node that fully encloses it.
+ *  Return nodes paired with the ranges that are most closely enclosed by them.
+ */
+export function enclosingSpans<NodeId>(
+  tree: SpanTree<NodeId>,
+  ranges: SourceRange[],
+  resultsOut?: [NodeId, SourceRange[]][],
+) {
+  const results = resultsOut ?? []
+  for (const child of tree.children()) {
+    const childSpan = child.span()
+    const childRanges: SourceRange[] = []
+    ranges = ranges.filter((range) => {
+      if (rangeEncloses(childSpan, range)) {
+        childRanges.push(range)
+        return false
+      }
+      return true
+    })
+    if (childRanges.length) enclosingSpans(child, childRanges, results)
+  }
+  if (ranges.length) results.push([tree.id(), ranges])
+  return results
+}
+
+/** Return the given range with any trailing spaces stripped. */
+export function trimEnd(range: SourceRange, text: string): SourceRange {
+  const trimmedLength = text.slice(range[0], range[1]).search(/ +$/)
+  return trimmedLength === -1 ? range : [range[0], range[0] + trimmedLength]
+}
diff --git a/app/gui2/shared/yjsModel.ts b/app/gui2/shared/yjsModel.ts
index bd333ae84dc5..609962081a81 100644
--- a/app/gui2/shared/yjsModel.ts
+++ b/app/gui2/shared/yjsModel.ts
@@ -120,15 +120,25 @@ export class DistributedModule {
     this.undoManager = new Y.UndoManager([this.doc.nodes])
   }
 
-  transact<T>(fn: () => T): T {
-    return this.doc.ydoc.transact(fn, 'local')
-  }
-
   dispose(): void {
     this.doc.ydoc.destroy()
   }
 }
 
+export const localOrigins = ['local', 'local:CodeEditor'] as const
+export type LocalOrigin = (typeof localOrigins)[number]
+export type Origin = LocalOrigin | 'remote'
+/** Locally-originated changes not otherwise specified. */
+export const defaultLocalOrigin: LocalOrigin = 'local'
+export function isLocalOrigin(origin: string): origin is LocalOrigin {
+  const localOriginNames: readonly string[] = localOrigins
+  return localOriginNames.includes(origin)
+}
+export function tryAsOrigin(origin: string): Origin | undefined {
+  if (isLocalOrigin(origin)) return origin
+  if (origin === 'remote') return origin
+}
+
 export type SourceRange = readonly [start: number, end: number]
 declare const brandSourceRangeKey: unique symbol
 export type SourceRangeKey = string & { [brandSourceRangeKey]: never }
@@ -230,6 +240,14 @@ export function rangeEquals(a: SourceRange, b: SourceRange): boolean {
   return a[0] == b[0] && a[1] == b[1]
 }
 
+export function rangeIncludes(a: SourceRange, b: number): boolean {
+  return a[0] <= b && a[1] >= b
+}
+
+export function rangeLength(a: SourceRange): number {
+  return a[1] - a[0]
+}
+
 export function rangeEncloses(a: SourceRange, b: SourceRange): boolean {
   return a[0] <= b[0] && a[1] >= b[1]
 }
diff --git a/app/gui2/src/assets/icons.svg b/app/gui2/src/assets/icons.svg
index 8bbd0d7d56f9..848cee9ef98b 100644
--- a/app/gui2/src/assets/icons.svg
+++ b/app/gui2/src/assets/icons.svg
@@ -152,6 +152,10 @@
     <path opacity="0.9" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5.5V4.5C5.5 3.94772 5.05228 3.5 4.5 3.5C3.94772 3.5 3.5 3.94772 3.5 4.5C3.5 5.05228 3.94772 5.5 4.5 5.5H5.5ZM5.5 7H4.5C3.11929 7 2 5.88071 2 4.5C2 3.11929 3.11929 2 4.5 2C5.88071 2 7 3.11929 7 4.5V5.5H9V4.5C9 3.11929 10.1193 2 11.5 2C12.8807 2 14 3.11929 14 4.5C14 5.88071 12.8807 7 11.5 7H10.5V9H11.5C12.8807 9 14 10.1193 14 11.5C14 12.8807 12.8807 14 11.5 14C10.1193 14 9 12.8807 9 11.5V10.5H7V11.5C7 12.8807 5.88071 14 4.5 14C3.11929 14 2 12.8807 2 11.5C2 10.1193 3.11929 9 4.5 9H5.5V7ZM5.5 10.5H4.5C3.94772 10.5 3.5 10.9477 3.5 11.5C3.5 12.0523 3.94772 12.5 4.5 12.5C5.05228 12.5 5.5 12.0523 5.5 11.5V10.5ZM7 9V8.5V7.5V7H7.5H8.5H9V7.5V8.5V9H8.5H7.5H7ZM10.5 10.5V11.5C10.5 12.0523 10.9477 12.5 11.5 12.5C12.0523 12.5 12.5 12.0523 12.5 11.5C12.5 10.9477 12.0523 10.5 11.5 10.5H10.5ZM10.5 5.5H11.5C12.0523 5.5 12.5 5.05228 12.5 4.5C12.5 3.94772 12.0523 3.5 11.5 3.5C10.9477 3.5 10.5 3.94772 10.5 4.5V5.5Z" fill="currentColor"></path>
   </symbol>
 
+  <symbol id="comment" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M1.33334 6C1.33334 3.79086 3.1242 2 5.33334 2H10.6667C12.8758 2 14.6667 3.79086 14.6667 6V10C14.6667 12.2091 12.8758 14 10.6667 14H2.00001C1.63182 14 1.33334 13.7015 1.33334 13.3333V6ZM6.00001 6C5.63182 6 5.33334 6.29848 5.33334 6.66667C5.33334 7.03486 5.63182 7.33333 6.00001 7.33333H10C10.3682 7.33333 10.6667 7.03486 10.6667 6.66667C10.6667 6.29848 10.3682 6 10 6H6.00001ZM6.00001 8.66667C5.63182 8.66667 5.33334 8.96514 5.33334 9.33333C5.33334 9.70152 5.63182 10 6.00001 10H8.00001C8.3682 10 8.66668 9.70152 8.66668 9.33333C8.66668 8.96514 8.3682 8.66667 8.00001 8.66667H6.00001Z" fill="currentColor"></path>
+  </symbol>
+
   <symbol id="compass" viewBox="0 0 16 16" width="16" height="16" fill="none">
     <g opacity="0.3">
       <path d="M6.32655 4.46256 2.90912 2.90918 4.46248 6.32658 5.8182 5.81818 6.32655 4.46256ZM4.46256 9.67344 2.90912 13.091 6.32663 11.5376 5.8182 10.1818 4.46256 9.67344ZM9.67339 11.5376 13.0909 13.091 11.5375 9.67343 10.1818 10.1818 9.67339 11.5376ZM11.5376 6.32659 13.0909 2.90918 9.67346 4.46257 10.1818 5.81818 11.5376 6.32659Z" fill="currentColor"></path>
@@ -248,6 +252,10 @@
     </g>
   </symbol>
 
+  <symbol id="error" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path d="M10.2167 2H5.78999C5.61666 2 5.44333 2.07333 5.32333 2.19333L2.19666 5.32C2.07666 5.44 2.00333 5.61333 2.00333 5.78667V10.2067C2.00333 10.3867 2.07666 10.5533 2.19666 10.68L5.31666 13.8C5.44333 13.9267 5.61666 14 5.78999 14H10.21C10.39 14 10.5567 13.9267 10.6833 13.8067L13.8033 10.6867C13.93 10.56 13.9967 10.3933 13.9967 10.2133V5.78667C13.9967 5.60667 13.9233 5.44 13.8033 5.31333L10.6833 2.19333C10.5633 2.07333 10.39 2 10.2167 2ZM8.00333 11.5333C7.52333 11.5333 7.13666 11.1467 7.13666 10.6667C7.13666 10.1867 7.52333 9.8 8.00333 9.8C8.48333 9.8 8.86999 10.1867 8.86999 10.6667C8.86999 11.1467 8.48333 11.5333 8.00333 11.5333ZM8.00333 8.66667C7.63666 8.66667 7.33666 8.36667 7.33666 8V5.33333C7.33666 4.96667 7.63666 4.66667 8.00333 4.66667C8.36999 4.66667 8.66999 4.96667 8.66999 5.33333V8C8.66999 8.36667 8.36999 8.66667 8.00333 8.66667Z" fill="currentColor"></path>
+  </symbol>
+
   <symbol id="exclamation" viewBox="0 0 16 16" width="16" height="16" fill="none">
     <path d="M8.5 1H7.5C6.94772 1 6.5 1.44772 6.5 2V10C6.5 10.5523 6.94772 11 7.5 11H8.5C9.05228 11 9.5 10.5523 9.5 10V2C9.5 1.44772 9.05228 1 8.5 1ZM8.5 12H7.5C6.94772 12 6.5 12.4477 6.5 13V14C6.5 14.5523 6.94772 15 7.5 15H8.5C9.05228 15 9.5 14.5523 9.5 14V13C9.5 12.4477 9.05228 12 8.5 12Z" fill="currentColor"></path>
   </symbol>
@@ -367,6 +375,24 @@
     <path fill-rule="evenodd" clip-rule="evenodd" d="M0.494585 6.61468C0.770727 7.09298 1.38232 7.25685 1.86061 6.98071L8.01169 3.42938L14.1317 6.96279C14.61 7.23893 15.2216 7.07505 15.4978 6.59676C15.7739 6.11847 15.61 5.50688 15.1317 5.23074L8.01741 1.12328L8.01455 1.11833L8.01169 1.11998L8.00887 1.11835L8.00604 1.12324L0.86061 5.24866C0.382318 5.5248 0.218442 6.13639 0.494585 6.61468Z" fill="currentColor"></path>
   </symbol>
 
+  <symbol id="icon/lock" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <g clip-path="url(#clip0_104_190)">
+      <circle cx="8" cy="4" r="3" stroke="currentColor" stroke-width="2"></circle>
+    </g>
+    <rect x="4" y="4" width="2" height="2" fill="currentColor"></rect>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 6C2.89543 6 2 6.89543 2 8V13C2 14.1046 2.89543 15 4 15H12C13.1046 15 14 14.1046 14 13V8C14 6.89543 13.1046 6 12 6H4ZM8 9C7.44772 9 7 9.44772 7 10V11C7 11.5523 7.44772 12 8 12C8.55228 12 9 11.5523 9 11V10C9 9.44772 8.55228 9 8 9Z" fill="currentColor"></path>
+    <defs>
+      <clipPath id="clip0_104_190">
+        <rect width="12" height="4" fill="white" transform="translate(2)"></rect>
+      </clipPath>
+    </defs>
+  </symbol>
+
+  <symbol id="icon/skip" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path d="M2.5547 3.03647L8.75192 7.16795C9.34566 7.56377 9.34566 8.43623 8.75192 8.83205L2.5547 12.9635C1.89015 13.4066 1 12.9302 1 12.1315L1 3.86852C1 3.06982 1.89015 2.59343 2.5547 3.03647Z" fill="currentColor"></path>
+    <rect x="12" y="2" width="2" height="12" rx="1" fill="currentColor"></rect>
+  </symbol>
+
   <symbol id="image" viewBox="0 0 16 16" width="16" height="16" fill="none">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M2.00002 2C1.44774 2 1.00002 2.44772 1.00002 3V13C1.00002 13.5523 1.44774 14 2.00002 14H14C14.5523 14 15 13.5523 15 13V3C15 2.44772 14.5523 2 14 2H2.00002ZM13 4H3.00002V12H13V4Z" fill="currentColor"></path>
     <path d="M10.5 8C11.3284 8 12 7.32843 12 6.5 12 5.67157 11.3284 5 10.5 5 9.67159 5 9.00002 5.67157 9.00002 6.5 9.00002 7.32843 9.67159 8 10.5 8ZM4.00002 11.0237V8.02372C6.00002 5.52371 7.00002 6.00001 8.50002 7.50004L12 11.0237H4.00002Z" fill="currentColor"></path>
@@ -650,6 +676,14 @@
     <path fill-rule="evenodd" clip-rule="evenodd" d="M0 8C0 6.14915 0.641755 4.35557 1.81592 2.92485C2.99008 1.49413 4.624 0.514797 6.43928 0.153715C8.25456 -0.207366 10.1389 0.0721462 11.7712 0.944627C13.4035 1.81711 14.6827 3.22857 15.391 4.93853C16.0993 6.64848 16.1928 8.55113 15.6555 10.3223C15.1183 12.0934 13.9835 13.6235 12.4446 14.6518C10.9056 15.68 9.05779 16.1429 7.21586 15.9615C5.37394 15.7801 3.65189 14.9656 2.34315 13.6569L3.76867 12.2313C4.74761 13.2103 6.0357 13.8195 7.41347 13.9552C8.79123 14.0909 10.1734 13.7447 11.3245 12.9755C12.4756 12.2064 13.3245 11.0619 13.7263 9.73706C14.1282 8.41224 14.0583 6.98907 13.5285 5.71002C12.9987 4.43097 12.0418 3.3752 10.8208 2.72258C9.59988 2.06996 8.19041 1.86089 6.83258 2.13098C5.47475 2.40107 4.25258 3.13361 3.37431 4.20379C2.49603 5.27397 2.016 6.61557 2.016 8H4L1 12L-2 8H0ZM8 4C7.44772 4 7 4.44771 7 5V8C7 8.37712 7.20876 8.70549 7.51702 8.87584L9.77767 10.181C10.256 10.4572 10.8675 10.2933 11.1437 9.815C11.4198 9.33671 11.256 8.72512 10.7777 8.44897L9 7.42264V5C9 4.44771 8.55228 4 8 4Z" fill="currentColor"></path>
   </symbol>
 
+  <symbol id="record" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path d="M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15Z" fill="currentColor"></path>
+  </symbol>
+
+  <symbol id="record_once" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path d="M1.33333 2H.66667C.29848 2 0 2.38376 0 2.85714V13.1429C0 13.6162.29848 14 .66667 14H1.33333C1.70152 14 2 13.6162 2 13.1429V2.85714C2 2.38376 1.70152 2 1.33333 2ZM8 13C10.7614 13 13 10.7614 13 8 13 5.23858 10.7614 3 8 3 5.23858 3 3 5.23858 3 8 3 10.7614 5.23858 13 8 13ZM15.3333 2H14.6667C14.2985 2 14 2.38376 14 2.85714V13.1429C14 13.6162 14.2985 14 14.6667 14H15.3333C15.7015 14 16 13.6162 16 13.1429V2.85714C16 2.38376 15.7015 2 15.3333 2Z" fill="currentColor"></path>
+  </symbol>
+
   <symbol id="right_side_panel" viewBox="0 0 16 16" width="16" height="16" fill="none">
     <path opacity="0.3" d="M0 3C0 1.34315 1.34315 0 3 0H8V16H3C1.34315 16 0 14.6569 0 13V3Z" fill="currentColor"></path>
     <path fill-rule="evenodd" clip-rule="evenodd" d="M13 0H9V16H13C14.6569 16 16 14.6569 16 13V3C16 1.34315 14.6569 0 13 0ZM14 4H11V5H14V4ZM14 6H11V7H14V6ZM11 8H14V9H11V8Z" fill="currentColor"></path>
@@ -893,6 +927,10 @@
     <path fill-rule="evenodd" clip-rule="evenodd" d="M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM7 7V3H9V7H13V9H9V13H7V9H3V7H7Z" fill="currentColor"></path>
   </symbol>
 
+  <symbol id="warning" viewBox="0 0 16 16" width="16" height="16" fill="none">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.33334C8.23527 1.33334 8.45312 1.45735 8.57324 1.65965L14.9066 12.3263C15.0289 12.5324 15.0313 12.7882 14.9127 12.9965C14.7942 13.2047 14.573 13.3333 14.3333 13.3333H1.66667C1.42703 13.3333 1.20584 13.2047 1.08729 12.9965C0.968745 12.7882 0.971089 12.5324 1.09343 12.3263L7.42676 1.65965C7.54688 1.45735 7.76473 1.33334 8 1.33334ZM8 6.00001C8.36819 6.00001 8.66667 6.29849 8.66667 6.66668V8.00001C8.66667 8.3682 8.36819 8.66668 8 8.66668C7.63181 8.66668 7.33333 8.3682 7.33333 8.00001V6.66668C7.33333 6.29849 7.63181 6.00001 8 6.00001ZM7.16667 10C7.16667 9.53977 7.53976 9.16668 8 9.16668C8.46024 9.16668 8.83333 9.53977 8.83333 10C8.83333 10.4602 8.46024 10.8333 8 10.8333C7.53976 10.8333 7.16667 10.4602 7.16667 10Z" fill="currentColor"></path>
+  </symbol>
+
   <symbol id="workflow_play" viewBox="0 0 16 16" width="16" height="16" fill="none">
     <path opacity="0.75" d="M4.48492 3.22332L11.5227 7.12545C12.2095 7.50624 12.2095 8.49379 11.5227 8.87458L4.48491 12.7767C3.8184 13.1462 3.00001 12.6642 3.00001 11.9021L3.00001 4.09789C3.00001 3.33578 3.8184 2.85377 4.48492 3.22332Z" fill="currentColor"></path>
   </symbol>
diff --git a/app/gui2/src/bindings.ts b/app/gui2/src/bindings.ts
index 4643b2cea50a..0f96b8ee5101 100644
--- a/app/gui2/src/bindings.ts
+++ b/app/gui2/src/bindings.ts
@@ -28,7 +28,7 @@ export const graphBindings = defineKeybinds('graph-editor', {
   deleteSelected: ['OsDelete'],
   zoomToSelected: ['Mod+Shift+A'],
   selectAll: ['Mod+A'],
-  deselectAll: ['Escape', 'PointerMain'],
+  deselectAll: ['Escape'],
   copyNode: ['Mod+C'],
   pasteNode: ['Mod+V'],
   collapse: ['Mod+G'],
diff --git a/app/gui2/src/components/CircularMenu.vue b/app/gui2/src/components/CircularMenu.vue
index 11afe43e18f5..b34d3ae9d781 100644
--- a/app/gui2/src/components/CircularMenu.vue
+++ b/app/gui2/src/components/CircularMenu.vue
@@ -18,7 +18,12 @@ const emit = defineEmits<{
 </script>
 
 <template>
-  <div :class="`${props.isFullMenuVisible ? 'CircularMenu full' : 'CircularMenu partial'}`">
+  <div
+    :class="`${props.isFullMenuVisible ? 'CircularMenu full' : 'CircularMenu partial'}`"
+    @pointerdown.stop
+    @pointerup.stop
+    @click.stop
+  >
     <ToggleIcon
       icon="eye"
       class="icon-container button slot5"
@@ -26,7 +31,12 @@ const emit = defineEmits<{
       :modelValue="props.isVisualizationVisible"
       @update:modelValue="emit('update:isVisualizationVisible', $event)"
     />
-    <SvgIcon name="edit" class="icon-container button slot6" @pointerdown="emit('startEditing')" />
+    <SvgIcon
+      name="edit"
+      class="icon-container button slot6"
+      data-testid="edit-button"
+      @click.stop="emit('startEditing')"
+    />
     <ToggleIcon
       :icon="props.isOutputContextEnabledGlobally ? 'no_auto_replay' : 'auto_replay'"
       class="icon-container button slot7"
diff --git a/app/gui2/src/components/CodeEditor.vue b/app/gui2/src/components/CodeEditor.vue
index 3d101f23f572..b2035e10040f 100644
--- a/app/gui2/src/components/CodeEditor.vue
+++ b/app/gui2/src/components/CodeEditor.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Diagnostic, Highlighter } from '@/components/CodeEditor/codemirror'
+import type { ChangeSet, Diagnostic, Highlighter } from '@/components/CodeEditor/codemirror'
+import { Annotation, StateEffect, StateField } from '@/components/CodeEditor/codemirror'
 import { usePointer } from '@/composables/events'
 import { useGraphStore, type NodeId } from '@/stores/graph'
-import { asNodeId } from '@/stores/graph/graphDatabase'
 import { useProjectStore } from '@/stores/project'
 import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { useAutoBlur } from '@/util/autoBlur'
@@ -10,8 +10,11 @@ import { chain } from '@/util/data/iterable'
 import { unwrap } from '@/util/data/result'
 import { qnJoin, tryQualifiedName } from '@/util/qualifiedName'
 import { useLocalStorage } from '@vueuse/core'
-import { rangeEncloses } from 'shared/yjsModel'
-import { computed, onMounted, ref, watch, watchEffect } from 'vue'
+import { createDebouncer } from 'lib0/eventloop'
+import { MutableModule } from 'shared/ast'
+import { textChangeToEdits, type SourceRangeEdit } from 'shared/util/data/text'
+import { rangeEncloses, type Origin } from 'shared/yjsModel'
+import { computed, onMounted, onUnmounted, ref, shallowRef, watch, watchEffect } from 'vue'
 
 // Use dynamic imports to aid code splitting. The codemirror dependency is quite large.
 const {
@@ -38,35 +41,41 @@ const suggestionDbStore = useSuggestionDbStore()
 const rootElement = ref<HTMLElement>()
 useAutoBlur(rootElement)
 
-const executionContextDiagnostics = computed(() =>
-  projectStore.module && graphStore.moduleSource.text
-    ? lsDiagnosticsToCMDiagnostics(graphStore.moduleSource.text, projectStore.diagnostics)
-    : [],
-)
+const executionContextDiagnostics = shallowRef<Diagnostic[]>([])
+
+// Effect that can be applied to the document to invalidate the linter state.
+const diagnosticsUpdated = StateEffect.define()
+// State value that is perturbed by any `diagnosticsUpdated` effect.
+const diagnosticsVersion = StateField.define({
+  create: (_state) => 0,
+  update: (value, transaction) => {
+    for (const effect of transaction.effects) {
+      if (effect.is(diagnosticsUpdated)) value += 1
+    }
+    return value
+  },
+})
 
 const expressionUpdatesDiagnostics = computed(() => {
-  const nodeMap = graphStore.db.nodeIdToNode
   const updates = projectStore.computedValueRegistry.db
   const panics = updates.type.reverseLookup('Panic')
   const errors = updates.type.reverseLookup('DataflowError')
   const diagnostics: Diagnostic[] = []
-  for (const id of chain(panics, errors)) {
-    const update = updates.get(id)
+  for (const externalId of chain(panics, errors)) {
+    const update = updates.get(externalId)
     if (!update) continue
-    const externalId = graphStore.db.idFromExternal(id)
-    if (!externalId) continue
-    const node = nodeMap.get(asNodeId(externalId))
-    if (!node) continue
-    const rootSpan = graphStore.moduleSource.getSpan(node.rootSpan.id)
-    if (!rootSpan) continue
-    const [from, to] = rootSpan
+    const astId = graphStore.db.idFromExternal(externalId)
+    if (!astId) continue
+    const span = graphStore.moduleSource.getSpan(astId)
+    if (!span) continue
+    const [from, to] = span
     switch (update.payload.type) {
       case 'Panic': {
         diagnostics.push({ from, to, message: update.payload.message, severity: 'error' })
         break
       }
       case 'DataflowError': {
-        const error = projectStore.dataflowErrors.lookup(id)
+        const error = projectStore.dataflowErrors.lookup(externalId)
         if (error?.value?.message) {
           diagnostics.push({ from, to, message: error.value.message, severity: 'error' })
         }
@@ -80,21 +89,16 @@ const expressionUpdatesDiagnostics = computed(() => {
 // == CodeMirror editor setup  ==
 
 const editorView = new EditorView()
+const viewInitialized = ref(false)
 watchEffect(() => {
   const module = projectStore.module
   if (!module) return
-  /*
-  const yText = module.doc.contents
-  const undoManager = module.undoManager
-  const awareness = projectStore.awareness.internal
-  extensions: [yCollab(yText, awareness, { undoManager }), ...]
-   */
-  if (!graphStore.moduleSource.text) return
   editorView.setState(
     EditorState.create({
-      doc: graphStore.moduleSource.text,
       extensions: [
         minimalSetup,
+        updateListener(),
+        diagnosticsVersion,
         syntaxHighlighting(defaultHighlightStyle as Highlighter),
         bracketMatching(),
         foldGutter(),
@@ -157,13 +161,136 @@ watchEffect(() => {
           return { dom }
         }),
         enso(),
-        linter(() => [...executionContextDiagnostics.value, ...expressionUpdatesDiagnostics.value]),
+        linter(
+          () => [...executionContextDiagnostics.value, ...expressionUpdatesDiagnostics.value],
+          {
+            needsRefresh(update) {
+              return (
+                update.state.field(diagnosticsVersion) !==
+                update.startState.field(diagnosticsVersion)
+              )
+            },
+          },
+        ),
       ],
     }),
   )
+  viewInitialized.value = true
+})
+
+function changeSetToTextEdits(changes: ChangeSet) {
+  const textEdits = new Array<SourceRangeEdit>()
+  changes.iterChanges((from, to, _fromB, _toB, insert) =>
+    textEdits.push({ range: [from, to], insert: insert.toString() }),
+  )
+  return textEdits
+}
+function textEditToChangeSpec({ range: [from, to], insert }: SourceRangeEdit) {
+  return { from, to, insert }
+}
+
+let pendingChanges: ChangeSet | undefined
+let currentModule: MutableModule | undefined
+/** Set the editor contents the current module state, discarding any pending editor-initiated changes. */
+function resetView() {
+  console.info(`Resetting the editor to the module code.`)
+  pendingChanges = undefined
+  currentModule = undefined
+  const viewText = editorView.state.doc.toString()
+  const code = graphStore.moduleSource.text
+  editorView.dispatch({
+    changes: textChangeToEdits(viewText, code).map(textEditToChangeSpec),
+    annotations: synchronizedModule.of(graphStore.startEdit()),
+  })
+}
+
+/** Apply any pending changes to the currently-synchronized module, clearing the set of pending changes. */
+function commitPendingChanges() {
+  if (!pendingChanges || !currentModule) return
+  try {
+    currentModule.applyTextEdits(changeSetToTextEdits(pendingChanges), graphStore.viewModule())
+    graphStore.commitEdit(currentModule, undefined, 'local:CodeEditor')
+  } catch (error) {
+    console.error(`Code Editor failed to modify module`, error)
+    resetView()
+  }
+  pendingChanges = undefined
+}
+
+function updateListener() {
+  const debouncer = createDebouncer(0)
+  return EditorView.updateListener.of((update) => {
+    for (const transaction of update.transactions) {
+      const newModule = transaction.annotation(synchronizedModule)
+      if (newModule) {
+        // Flush the pipeline of edits that were based on the old module.
+        commitPendingChanges()
+        currentModule = newModule
+      } else if (transaction.docChanged && currentModule) {
+        pendingChanges = pendingChanges
+          ? pendingChanges.compose(transaction.changes)
+          : transaction.changes
+        // Defer the update until after pending events have been processed, so that if changes are arriving faster than
+        // we would be able to apply them individually we coalesce them to keep up.
+        debouncer(commitPendingChanges)
+      }
+    }
+  })
+}
+
+let needResync = false
+// Indicates a change updating the text to correspond to the given module state.
+const synchronizedModule = Annotation.define<MutableModule>()
+watch(
+  viewInitialized,
+  (ready) => {
+    if (ready) graphStore.moduleSource.observe(observeSourceChange)
+  },
+  { immediate: true },
+)
+onUnmounted(() => graphStore.moduleSource.unobserve(observeSourceChange))
+
+function observeSourceChange(textEdits: SourceRangeEdit[], origin: Origin | undefined) {
+  // If we received an update from outside the Code Editor while the editor contained uncommitted changes, we cannot
+  // proceed incrementally; we wait for the changes to be merged as Y.Js AST updates, and then set the view to the
+  // resulting code.
+  if (needResync) {
+    if (!pendingChanges) {
+      resetView()
+      needResync = false
+    }
+    return
+  }
+  // When we aren't in the `needResync` state, we can ignore updates that originated in the Code Editor.
+  if (origin === 'local:CodeEditor') return
+  if (pendingChanges) {
+    console.info(`Deferring update (editor dirty).`)
+    needResync = true
+    return
+  }
+
+  // If none of the above exit-conditions were reached, the transaction is applicable to our current state.
+  editorView.dispatch({
+    changes: textEdits.map(textEditToChangeSpec),
+    annotations: synchronizedModule.of(graphStore.startEdit()),
+  })
+}
+
+// The LS protocol doesn't identify what version of the file updates are in reference to. When diagnostics are received
+// from the LS, we map them to the text assuming that they are applicable to the current version of the module. This
+// will be correct if there is no one else editing, and we aren't editing faster than the LS can send updates. Typing
+// too quickly can result in incorrect ranges, but at idle it should correct itself when we receive new diagnostics.
+watch([viewInitialized, () => projectStore.diagnostics], ([ready, diagnostics]) => {
+  if (!ready) return
+  executionContextDiagnostics.value = graphStore.moduleSource.text
+    ? lsDiagnosticsToCMDiagnostics(graphStore.moduleSource.text, diagnostics)
+    : []
 })
 
-watch([executionContextDiagnostics, expressionUpdatesDiagnostics], () => forceLinting(editorView))
+watch([executionContextDiagnostics, expressionUpdatesDiagnostics], () => {
+  editorView.dispatch({ effects: diagnosticsUpdated.of(null) })
+  forceLinting(editorView)
+})
 
 onMounted(() => {
   editorView.focus()
@@ -206,6 +333,8 @@ const editorStyle = computed(() => {
     @keydown.delete.stop
     @wheel.stop.passive
     @pointerdown.stop
+    @pointerup.stop
+    @click.stop
     @contextmenu.stop
   >
     <div class="resize-handle" v-on="resize.events" @dblclick="resetSize">
diff --git a/app/gui2/src/components/CodeEditor/codemirror.ts b/app/gui2/src/components/CodeEditor/codemirror.ts
index b5b5551b4352..801269465ea0 100644
--- a/app/gui2/src/components/CodeEditor/codemirror.ts
+++ b/app/gui2/src/components/CodeEditor/codemirror.ts
@@ -13,7 +13,7 @@ export {
 } from '@codemirror/language'
 export { forceLinting, lintGutter, linter, type Diagnostic } from '@codemirror/lint'
 export { highlightSelectionMatches } from '@codemirror/search'
-export { EditorState } from '@codemirror/state'
+export { Annotation, EditorState, StateEffect, StateField, type ChangeSet } from '@codemirror/state'
 export { EditorView, tooltips, type TooltipView } from '@codemirror/view'
 export { type Highlighter } from '@lezer/highlight'
 export { minimalSetup } from 'codemirror'
@@ -42,6 +42,7 @@ import {
 import { styleTags, tags } from '@lezer/highlight'
 import { EditorView } from 'codemirror'
 import type { Diagnostic as LSDiagnostic } from 'shared/languageServerTypes'
+import { tryGetSoleValue } from 'shared/util/data/iterable'
 
 export function lsDiagnosticsToCMDiagnostics(
   source: string,
@@ -57,15 +58,17 @@ export function lsDiagnosticsToCMDiagnostics(
   }
   for (const diagnostic of diagnostics) {
     if (!diagnostic.location) continue
-    results.push({
-      from:
-        (lineStartIndices[diagnostic.location.start.line] ?? 0) +
-        diagnostic.location.start.character,
-      to: (lineStartIndices[diagnostic.location.end.line] ?? 0) + diagnostic.location.end.character,
-      message: diagnostic.message,
-      severity:
-        diagnostic.kind === 'Error' ? 'error' : diagnostic.kind === 'Warning' ? 'warning' : 'info',
-    })
+    const from =
+      (lineStartIndices[diagnostic.location.start.line] ?? 0) + diagnostic.location.start.character
+    const to =
+      (lineStartIndices[diagnostic.location.end.line] ?? 0) + diagnostic.location.end.character
+    if (to > source.length || from > source.length) {
+      // Suppress temporary errors if the source is not the version of the document the LS is reporting diagnostics for.
+      continue
+    }
+    const severity =
+      diagnostic.kind === 'Error' ? 'error' : diagnostic.kind === 'Warning' ? 'warning' : 'info'
+    results.push({ from, to, message: diagnostic.message, severity })
   }
   return results
 }
@@ -115,8 +118,7 @@ function astToCodeMirrorTree(
   const [start, end] = ast.span()
   const children = ast.children()
 
-  const hasSingleTokenChild = children.length === 1 && children[0]!.isToken()
-  const childrenToConvert = hasSingleTokenChild ? [] : children
+  const childrenToConvert = tryGetSoleValue(children)?.isToken() ? [] : children
 
   const tree = new Tree(
     nodeSet.types[ast.inner.type + (ast.isToken() ? RawAst.Tree.typeNames.length : 0)]!,
diff --git a/app/gui2/src/components/ComponentBrowser.vue b/app/gui2/src/components/ComponentBrowser.vue
index 3a902977785c..60c3668d368f 100644
--- a/app/gui2/src/components/ComponentBrowser.vue
+++ b/app/gui2/src/components/ComponentBrowser.vue
@@ -43,7 +43,6 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   accepted: [searcherExpression: string, requiredImports: RequiredImport[]]
-  closed: [searcherExpression: string, requiredImports: RequiredImport[]]
   canceled: []
 }>()
 
@@ -107,8 +106,10 @@ function readInputFieldSelection() {
     inputField.value.selectionStart != null &&
     inputField.value.selectionEnd != null
   ) {
-    input.selection.value.start = inputField.value.selectionStart
-    input.selection.value.end = inputField.value.selectionEnd
+    input.selection.value = {
+      start: inputField.value.selectionStart,
+      end: inputField.value.selectionEnd,
+    }
   }
 }
 // HTMLInputElement's same event is not supported in chrome yet. We just react for any
@@ -146,6 +147,17 @@ function handleDefocus(e: FocusEvent) {
   }
 }
 
+/** Prevent default on an event if input is not its target.
+ *
+ * The mouse events emitted on other elements may make input selection disappear, what we want to
+ * avoid.
+ */
+function preventNonInputDefault(e: Event) {
+  if (inputField.value != null && e.target !== inputField.value) {
+    e.preventDefault()
+  }
+}
+
 useEvent(
   window,
   'pointerdown',
@@ -153,7 +165,11 @@ useEvent(
     if (event.button !== 0) return
     if (!(event.target instanceof Element)) return
     if (!cbRoot.value?.contains(event.target)) {
-      emit('closed', input.code.value, input.importsToAdd())
+      if (input.anyChange.value) {
+        emit('accepted', input.code.value, input.importsToAdd())
+      } else {
+        emit('canceled')
+      }
     }
   },
   { capture: true },
@@ -319,7 +335,7 @@ function acceptSuggestion(index: Opt<Component> = null) {
 }
 
 function acceptInput() {
-  emit('accepted', input.code.value, input.importsToAdd())
+  emit('accepted', input.code.value.trim(), input.importsToAdd())
 }
 
 // === Key Events Handler ===
@@ -363,7 +379,9 @@ const handler = componentBrowserBindings.handler({
     tabindex="-1"
     @focusout="handleDefocus"
     @keydown="handler"
-    @pointerdown.stop
+    @pointerdown.stop="preventNonInputDefault"
+    @pointerup.stop="preventNonInputDefault"
+    @click.stop="preventNonInputDefault"
     @keydown.enter.stop
     @keydown.backspace.stop
     @keydown.delete.stop
@@ -401,10 +419,7 @@ const handler = componentBrowserBindings.handler({
                   :style="{ color: componentColor(item.component) }"
                 />
                 <span>
-                  <span
-                    v-if="!item.component.matchedRanges || item.component.matchedAlias"
-                    v-text="item.component.label"
-                  ></span>
+                  <span v-if="!item.component.matchedRanges" v-text="item.component.label"></span>
                   <span
                     v-for="range in allRanges(
                       item.component.matchedRanges,
@@ -432,10 +447,7 @@ const handler = componentBrowserBindings.handler({
               >
                 <SvgIcon :name="item.component.icon" />
                 <span>
-                  <span
-                    v-if="!item.component.matchedRanges || item.component.matchedAlias"
-                    v-text="item.component.label"
-                  ></span>
+                  <span v-if="!item.component.matchedRanges" v-text="item.component.label"></span>
                   <span
                     v-for="range in allRanges(
                       item.component.matchedRanges,
diff --git a/app/gui2/src/components/ComponentBrowser/__tests__/component.test.ts b/app/gui2/src/components/ComponentBrowser/__tests__/component.test.ts
index b393b946e721..4dc58a2d7d10 100644
--- a/app/gui2/src/components/ComponentBrowser/__tests__/component.test.ts
+++ b/app/gui2/src/components/ComponentBrowser/__tests__/component.test.ts
@@ -89,7 +89,7 @@ test('Suggestions are ordered properly', () => {
 
 test('Matched ranges are correct', () => {
   function replaceMatches(component: Component) {
-    if (!component.matchedRanges || component.matchedAlias) return component.label
+    if (!component.matchedRanges) return component.label
     const parts: string[] = []
     for (const range of allRanges(component.matchedRanges, component.label.length)) {
       const text = component.label.slice(range.start, range.end)
@@ -98,16 +98,6 @@ test('Matched ranges are correct', () => {
     return parts.join('')
   }
 
-  function replaceAliasMatches(component: Component) {
-    if (!component.matchedRanges || !component.matchedAlias) return
-    const parts: string[] = []
-    for (const range of allRanges(component.matchedRanges, component.matchedAlias.length)) {
-      const text = component.matchedAlias.slice(range.start, range.end)
-      parts.push(range.isMatch ? `<${text}>` : text)
-    }
-    return parts.join('')
-  }
-
   const pattern = 'foo_bar'
   const filtering = new Filtering({ pattern })
   const matchedSorted = [
@@ -117,34 +107,29 @@ test('Matched ranges are correct', () => {
     {
       name: 'bar',
       aliases: ['foo_bar', 'foo'],
-      highlighted: 'Project.bar',
-      highlightedAlias: '<foo><_bar>',
+      highlighted: '<foo><_bar> (Project.bar)',
     }, // exact alias match
     {
       name: 'bar',
       aliases: ['foo', 'foo_xyz_barabc'],
-      highlighted: 'Project.bar',
-      highlightedAlias: '<foo>_xyz<_bar>abc',
+      highlighted: '<foo>_xyz<_bar>abc (Project.bar)',
     }, // alias first word exact match
     {
       name: 'bar',
       aliases: ['foo', 'fooabc_barabc'],
-      highlighted: 'Project.bar',
-      highlightedAlias: '<foo>abc<_bar>abc',
+      highlighted: '<foo>abc<_bar>abc (Project.bar)',
     }, // alias first word match
     { name: 'xyz_foo_abc_bar_xyz', highlighted: 'Project.xyz_<foo>_abc<_bar>_xyz' }, // exact word match
     { name: 'xyz_fooabc_abc_barabc_xyz', highlighted: 'Project.xyz_<foo>abc_abc<_bar>abc_xyz' }, // non-exact word match
     {
       name: 'bar',
       aliases: ['xyz_foo_abc_bar_xyz'],
-      highlighted: 'Project.bar',
-      highlightedAlias: 'xyz_<foo>_abc<_bar>_xyz',
+      highlighted: 'xyz_<foo>_abc<_bar>_xyz (Project.bar)',
     }, // alias word exact match
     {
       name: 'bar',
       aliases: ['xyz_fooabc_abc_barabc_xyz'],
-      highlighted: 'Project.bar',
-      highlightedAlias: 'xyz_<foo>abc_abc<_bar>abc_xyz',
+      highlighted: 'xyz_<foo>abc_abc<_bar>abc_xyz (Project.bar)',
     }, // alias word start match
   ]
   const entries = Array.from(matchedSorted, ({ name, aliases }, id) => {
@@ -159,9 +144,5 @@ test('Matched ranges are correct', () => {
       replaceMatches(makeComponent(entries[i]!, filtering)),
       `replaceMatches(${JSON.stringify(matchedSorted[i])})`,
     ).toEqual(matchedSorted[i]!.highlighted)
-    expect(
-      replaceAliasMatches(makeComponent(entries[i]!, filtering)),
-      `replaceAliasMatches(${JSON.stringify(matchedSorted[i])})`,
-    ).toEqual(matchedSorted[i]!.highlightedAlias)
   }
 })
diff --git a/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts b/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
index 91d87a8c3abd..261357b35af9 100644
--- a/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
+++ b/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
@@ -181,8 +181,16 @@ test.each([
   expect(filtering.filter(entry)).toBeNull()
 })
 
-test.each(['bar', 'barfoo', 'fo', 'bar_fo_bar'])("%s is not matched by pattern 'foo'", (name) => {
-  const pattern = 'foo'
+test.each`
+  name            | pattern
+  ${'bar'}        | ${'foo'}
+  ${'barfoo'}     | ${'foo'}
+  ${'fo'}         | ${'foo'}
+  ${'bar_fo_bar'} | ${'foo'}
+  ${'bar'}        | ${'+'}
+  ${'*'}          | ${'+'}
+  ${'<='}         | ${'='}
+`('$name is not matched by pattern $pattern', ({ name, pattern }) => {
   const entry = makeModuleMethod(`local.Project.${name}`)
   const filtering = new Filtering({ pattern })
   expect(filtering.filter(entry)).toBeNull()
@@ -281,6 +289,43 @@ test('Matching pattern with underscores', () => {
   }
 })
 
+test('Matching operators', () => {
+  const pattern = '+'
+  const filtering = new Filtering({
+    pattern,
+    selfArg: { type: 'known', typename: 'local.Project.Type' },
+  })
+  const matchedSorted = [
+    { name: '+' }, // exact match
+    { name: '+=' }, // prefix match
+    { name: 'add', aliases: ['+'] }, // alias exact match
+    { name: 'increase', aliases: ['+='] }, // alias match
+  ]
+  const matchResults = Array.from(matchedSorted, ({ name, aliases }) => {
+    const entry = { ...makeMethod(`local.Project.Type.${name}`), aliases: aliases ?? [] }
+    return filtering.filter(entry)
+  })
+  expect(matchResults[0]).not.toBeNull()
+  expect(
+    matchedText(matchedSorted[0]!.name, matchResults[0]!),
+    `matchedText('${matchedSorted[0]!.name}')`,
+  ).toEqual(pattern)
+  for (let i = 1; i < matchResults.length; i++) {
+    expect(
+      matchResults[i],
+      `\`matchResults\` for ${JSON.stringify(matchedSorted[i]!)}`,
+    ).not.toBeNull()
+    expect(
+      matchResults[i]!.score,
+      `score('${matchedSorted[i]!.name}') > score('${matchedSorted[i - 1]!.name}')`,
+    ).toBeGreaterThan(matchResults[i - 1]!.score)
+    expect(
+      matchedText(matchedSorted[i]!.name, matchResults[i]!),
+      `matchedText('${matchedSorted[i]!.name}')`,
+    ).toEqual(pattern)
+  }
+})
+
 test('Unstable filtering', () => {
   const stableEntry = makeStaticMethod('local.Project.Type.stable')
   const unstableEntry = {
diff --git a/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts b/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
index 1303820711ad..681e8e365916 100644
--- a/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
+++ b/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
@@ -1,5 +1,5 @@
 import { useComponentBrowserInput } from '@/components/ComponentBrowser/input'
-import { GraphDb } from '@/stores/graph/graphDatabase'
+import { asNodeId, GraphDb } from '@/stores/graph/graphDatabase'
 import type { RequiredImport } from '@/stores/graph/imports'
 import { ComputedValueRegistry } from '@/stores/project/computedValueRegistry'
 import { SuggestionDb } from '@/stores/suggestionDatabase'
@@ -20,9 +20,28 @@ import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
 import { initializeFFI } from 'shared/ast/ffi'
 import type { ExternalId, Uuid } from 'shared/yjsModel'
 import { expect, test } from 'vitest'
+import { nextTick } from 'vue'
 
 await initializeFFI()
 
+const operator1Id = '3d0e9b96-3ca0-4c35-a820-7d3a1649de55' as AstId
+const operator1ExternalId = operator1Id as Uuid as ExternalId
+const operator2Id = '5eb16101-dd2b-4034-a6e2-476e8bfa1f2b' as AstId
+
+function mockGraphDb() {
+  const computedValueRegistryMock = ComputedValueRegistry.Mock()
+  computedValueRegistryMock.db.set(operator1ExternalId, {
+    typename: 'Standard.Base.Number',
+    methodCall: undefined,
+    payload: { type: 'Value' },
+    profilingInfo: [],
+  })
+  const db = GraphDb.Mock(computedValueRegistryMock)
+  db.mockNode('operator1', operator1Id, 'Data.read')
+  db.mockNode('operator2', operator2Id)
+  return db
+}
+
 test.each([
   ['', 0, { type: 'insert', position: 0 }, {}],
   [
@@ -101,21 +120,7 @@ test.each([
       selfArg?: { type: string; typename?: string }
     },
   ) => {
-    const operator1Id = '3d0e9b96-3ca0-4c35-a820-7d3a1649de55' as AstId
-    const operator1ExternalId = operator1Id as Uuid as ExternalId
-    const operator2Id = '5eb16101-dd2b-4034-a6e2-476e8bfa1f2b' as AstId
-    const computedValueRegistryMock = ComputedValueRegistry.Mock()
-    computedValueRegistryMock.db.set(operator1ExternalId, {
-      typename: 'Standard.Base.Number',
-      methodCall: undefined,
-      payload: { type: 'Value' },
-      profilingInfo: [],
-    })
-    const mockGraphDb = GraphDb.Mock(computedValueRegistryMock)
-    mockGraphDb.mockNode('operator1', operator1Id)
-    mockGraphDb.mockNode('operator2', operator2Id)
-
-    const input = useComponentBrowserInput(mockGraphDb, new SuggestionDb())
+    const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb())
     input.code.value = code
     input.selection.value = { start: cursorPos, end: cursorPos }
     const context = input.context.value
@@ -359,3 +364,57 @@ test.each([
     expect(input.importsToAdd()).toEqual(expectedImports)
   },
 )
+test.each`
+  typed    | finalCodeWithSourceNode
+  ${'foo'} | ${'operator1.foo'}
+  ${' '}   | ${'operator1. '}
+  ${'+'}   | ${'operator1 +'}
+  ${'>='}  | ${'operator1 >='}
+`('Initialize input for new node and type $typed', async ({ typed, finalCodeWithSourceNode }) => {
+  const mockDb = mockGraphDb()
+  const sourceNode = operator1Id
+  const sourcePort = mockDb.getNodeFirstOutputPort(asNodeId(sourceNode))
+  const input = useComponentBrowserInput(mockDb, new SuggestionDb())
+
+  // Without source node
+  input.reset({ type: 'newNode' })
+  expect(input.code.value).toBe('')
+  expect(input.selection.value).toEqual({ start: 0, end: 0 })
+  expect(input.anyChange.value).toBeFalsy()
+  input.code.value = typed
+  input.selection.value.start = input.selection.value.end = typed.length
+  await nextTick()
+  expect(input.code.value).toBe(typed)
+  expect(input.selection.value).toEqual({ start: typed.length, end: typed.length })
+  expect(input.anyChange.value).toBeTruthy()
+
+  // With source node
+  input.reset({ type: 'newNode', sourcePort })
+  expect(input.code.value).toBe('operator1.')
+  expect(input.selection.value).toEqual({ start: 10, end: 10 })
+  expect(input.anyChange.value).toBeFalsy()
+  input.code.value = `operator1.${typed}`
+  input.selection.value.start = input.selection.value.end = typed.length + 10
+  await nextTick()
+  expect(input.code.value).toBe(finalCodeWithSourceNode)
+  expect(input.selection.value).toEqual({
+    start: finalCodeWithSourceNode.length,
+    end: finalCodeWithSourceNode.length,
+  })
+  expect(input.anyChange.value).toBeTruthy()
+})
+
+test('Initialize input for edited node', async () => {
+  const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb())
+  input.reset({ type: 'editNode', node: asNodeId(operator1Id), cursorPos: 4 })
+  expect(input.code.value).toBe('Data.read')
+  expect(input.selection.value).toEqual({ start: 4, end: 4 })
+  expect(input.anyChange.value).toBeFalsy()
+  // Typing anything should not affected existing code (in contrary to new node creation)
+  input.code.value = `Data.+.read`
+  input.selection.value.start = input.selection.value.end = 5
+  await nextTick()
+  expect(input.code.value).toEqual('Data.+.read')
+  expect(input.selection.value).toEqual({ start: 5, end: 5 })
+  expect(input.anyChange.value).toBeTruthy()
+})
diff --git a/app/gui2/src/components/ComponentBrowser/component.ts b/app/gui2/src/components/ComponentBrowser/component.ts
index 9c5d68d63b1d..ed3a113625fe 100644
--- a/app/gui2/src/components/ComponentBrowser/component.ts
+++ b/app/gui2/src/components/ComponentBrowser/component.ts
@@ -12,12 +12,17 @@ import { displayedIconOf } from '@/util/getIconName'
 import type { Icon } from '@/util/iconName'
 import { qnIsTopElement, qnLastSegmentIndex } from '@/util/qualifiedName'
 
-interface ComponentLabel {
+interface ComponentLabelInfo {
   label: string
   matchedAlias?: string | undefined
   matchedRanges?: Range[] | undefined
 }
 
+interface ComponentLabel {
+  label: string
+  matchedRanges?: Range[] | undefined
+}
+
 export interface Component extends ComponentLabel {
   suggestionId: SuggestionId
   icon: Icon
@@ -28,7 +33,7 @@ export function labelOfEntry(
   entry: SuggestionEntry,
   filtering: Filtering,
   match: MatchResult,
-): ComponentLabel {
+): ComponentLabelInfo {
   const isTopModule = entry.kind == SuggestionKind.Module && qnIsTopElement(entry.definedIn)
   if (filtering.isMainView() && isTopModule) return { label: entry.definedIn }
   else if (entry.memberOf && entry.selfType == null) {
@@ -69,6 +74,15 @@ export function labelOfEntry(
       : { label: entry.name, matchedAlias: match.matchedAlias }
 }
 
+function formatLabel(labelInfo: ComponentLabelInfo): ComponentLabel {
+  return {
+    label: labelInfo.matchedAlias
+      ? `${labelInfo.matchedAlias} (${labelInfo.label})`
+      : labelInfo.label,
+    matchedRanges: labelInfo.matchedRanges,
+  }
+}
+
 export interface MatchedSuggestion {
   id: SuggestionId
   entry: SuggestionEntry
@@ -99,7 +113,7 @@ export function makeComponent(
   filtering: Filtering,
 ): Component {
   return {
-    ...labelOfEntry(entry, filtering, match),
+    ...formatLabel(labelOfEntry(entry, filtering, match)),
     suggestionId: id,
     icon: displayedIconOf(entry),
     group: entry.groupIndex,
diff --git a/app/gui2/src/components/ComponentBrowser/filtering.ts b/app/gui2/src/components/ComponentBrowser/filtering.ts
index 05d84cd6c111..a21ab25bda70 100644
--- a/app/gui2/src/components/ComponentBrowser/filtering.ts
+++ b/app/gui2/src/components/ComponentBrowser/filtering.ts
@@ -6,6 +6,7 @@ import {
 import type { Opt } from '@/util/data/opt'
 import { Range } from '@/util/data/range'
 import { qnIsTopElement, qnParent, type QualifiedName } from '@/util/qualifiedName'
+import escapeStringRegexp from '@/util/regexp'
 
 export type SelfArg =
   | {
@@ -58,7 +59,7 @@ class FilteringWithPattern {
     // - The unmatched rest of the word, up to, but excluding, the next underscore
     // - The unmatched words before the next matched word, including any underscores
     this.wordMatchRegex = new RegExp(
-      '(^|.*?_)(' + pattern.replace(/_/g, ')([^_]*)(.*?)(_') + ')([^_]*)(.*)',
+      '(^|.*?_)(' + escapeStringRegexp(pattern).replace(/_/g, ')([^_]*)(.*?)(_') + ')([^_]*)(.*)',
       'i',
     )
     if (pattern.length > 1 && !/_/.test(pattern)) {
@@ -302,10 +303,11 @@ export class Filtering {
       let prefix = ''
       let suffix = ''
       for (const [, text, separator] of this.fullPattern.matchAll(/(.+?)([._]|$)/g)) {
+        const escaped = escapeStringRegexp(text ?? '')
         const segment =
           separator === '_'
-            ? `()(${text})([^_.]*)(_)`
-            : `([^.]*_)?(${text})([^.]*)(${separator === '.' ? '\\.' : ''})`
+            ? `()(${escaped})([^_.]*)(_)`
+            : `([^.]*_)?(${escaped})([^.]*)(${separator === '.' ? '\\.' : ''})`
         prefix = '(?:' + prefix
         suffix += segment + ')?'
       }
diff --git a/app/gui2/src/components/ComponentBrowser/input.ts b/app/gui2/src/components/ComponentBrowser/input.ts
index 91bfc4565e90..5996d0dc6ec2 100644
--- a/app/gui2/src/components/ComponentBrowser/input.ts
+++ b/app/gui2/src/components/ComponentBrowser/input.ts
@@ -10,7 +10,7 @@ import {
   type Typename,
 } from '@/stores/suggestionDatabase/entry'
 import { RawAst, RawAstExtended, astContainingChar } from '@/util/ast'
-import type { AstId } from '@/util/ast/abstract.ts'
+import { isOperator, type AstId } from '@/util/ast/abstract.ts'
 import { AliasAnalyzer } from '@/util/ast/aliasAnalysis'
 import { GeneralOprApp, type OperatorChain } from '@/util/ast/opr'
 import { MappedSet } from '@/util/containers'
@@ -23,7 +23,7 @@ import {
 } from '@/util/qualifiedName'
 import { equalFlat } from 'lib0/array'
 import { sourceRangeKey, type SourceRange } from 'shared/yjsModel'
-import { computed, ref, type ComputedRef } from 'vue'
+import { computed, nextTick, ref, type ComputedRef } from 'vue'
 
 /** Information how the component browser is used, needed for proper input initializing. */
 export type Usage =
@@ -70,10 +70,42 @@ export function useComponentBrowserInput(
   suggestionDb: SuggestionDb = useSuggestionDbStore().entries,
 ) {
   const code = ref('')
+  const cbUsage = ref<Usage>()
+  const anyChange = ref(false)
   const selection = ref({ start: 0, end: 0 })
   const ast = computed(() => RawAstExtended.parse(code.value))
   const imports = ref<RequiredImport[]>([])
 
+  // Code Model to being edited externally (by user).
+  //
+  // Some user actions (like typing operator right after input) may handled differently than
+  // internal changes (like applying suggestion).
+  const codeModel = computed({
+    get: () => code.value,
+    set: (newValue) => {
+      if (newValue != code.value) {
+        // When user, right after opening CB with source node types operator, we should
+        // re-initialize input with it instead of dot at the end.
+        const startedTyping = !anyChange.value && newValue.startsWith(code.value)
+        const typed = newValue.substring(code.value.length)
+        code.value = newValue
+        anyChange.value = true
+
+        if (
+          startedTyping &&
+          cbUsage.value?.type === 'newNode' &&
+          cbUsage.value?.sourcePort &&
+          isOperator(typed)
+        ) {
+          const sourcePort = cbUsage.value.sourcePort
+          // We do any code updates in next tick, as in the current we may yet expect selection
+          // changes we would like to override.
+          nextTick(() => setSourceNode(sourcePort, ` ${typed}`))
+        }
+      }
+    },
+  })
+
   const context: ComputedRef<EditingContext> = computed(() => {
     const cursorPosition = selection.value.start
     if (cursorPosition === 0) return { type: 'insert', position: 0 }
@@ -414,10 +446,7 @@ export function useComponentBrowserInput(
     switch (usage.type) {
       case 'newNode':
         if (usage.sourcePort) {
-          const sourceNodeName = graphDb.getOutputPortIdentifier(usage.sourcePort)
-          code.value = sourceNodeName ? sourceNodeName + '.' : ''
-          const caretPosition = code.value.length
-          selection.value = { start: caretPosition, end: caretPosition }
+          setSourceNode(usage.sourcePort)
         } else {
           code.value = ''
           selection.value = { start: 0, end: 0 }
@@ -429,11 +458,21 @@ export function useComponentBrowserInput(
         break
     }
     imports.value = []
+    cbUsage.value = usage
+    anyChange.value = false
+  }
+
+  function setSourceNode(sourcePort: AstId, operator: string = '.') {
+    const sourceNodeName = graphDb.getOutputPortIdentifier(sourcePort)
+    code.value = sourceNodeName ? `${sourceNodeName}${operator}` : ''
+    selection.value = { start: code.value.length, end: code.value.length }
   }
 
   return {
     /** The current input's text (code). */
-    code,
+    code: codeModel,
+    /** A flag indicating that input was changed after last reset. */
+    anyChange,
     /** The current selection (or cursor position if start is equal to end). */
     selection,
     /** The editing context deduced from code and selection */
diff --git a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
index 2e5830bb7f38..484c3fb8fdd0 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
@@ -9,7 +9,7 @@ const emit = defineEmits<{ click: [] }>()
 <template>
   <div class="Breadcrumb">
     <SvgIcon v-if="props.icon" :name="props.icon || ''" />
-    <span @pointerdown="emit('click')" v-text="props.text"></span>
+    <span @click.stop="emit('click')" v-text="props.text"></span>
   </div>
 </template>
 
diff --git a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
index dcfaed62abe9..00420da4cf89 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
@@ -33,13 +33,13 @@ function shrinkFactor(index: number): number {
         name="arrow_left"
         draggable="false"
         :class="['icon', 'button', 'arrow', { inactive: !props.canGoBackward }]"
-        @pointerdown="emit('backward')"
+        @click.stop="emit('backward')"
       />
       <SvgIcon
         name="arrow_right"
         draggable="false"
         :class="['icon', 'button', 'arrow', { inactive: !props.canGoForward }]"
-        @pointerdown="emit('forward')"
+        @click.stop="emit('forward')"
       />
     </div>
     <TransitionGroup name="breadcrumbs">
diff --git a/app/gui2/src/components/DocumentationPanel/DocsList.vue b/app/gui2/src/components/DocumentationPanel/DocsList.vue
index fa0a9584c3f7..a25344a495d7 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsList.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsList.vue
@@ -48,10 +48,7 @@ const annotations = computed<Array<string | undefined>>(() => {
 <template>
   <ul v-if="props.items.items.length > 0">
     <li v-for="(item, index) in props.items.items" :key="index" :class="props.items.kind">
-      <a
-        :class="['link', props.items.kind]"
-        @pointerdown.stop.prevent="emit('linkClicked', item.id)"
-      >
+      <a :class="['link', props.items.kind]" @click.stop="emit('linkClicked', item.id)">
         <span class="entryName">{{ qnSplit(item.name)[1] }}</span>
         <span class="arguments">{{ ' ' + argumentsList(item.arguments) }}</span>
       </a>
diff --git a/app/gui2/src/components/ExecutionModeSelector.vue b/app/gui2/src/components/ExecutionModeSelector.vue
deleted file mode 100644
index 56cea97a0879..000000000000
--- a/app/gui2/src/components/ExecutionModeSelector.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<script setup lang="ts">
-import SvgIcon from '@/components/SvgIcon.vue'
-import { useEvent } from '@/composables/events'
-import { ref } from 'vue'
-
-const props = defineProps<{ modes: string[]; modelValue: string }>()
-const emit = defineEmits<{ execute: []; 'update:modelValue': [mode: string] }>()
-
-const isDropdownOpen = ref(false)
-
-const executionModeSelectorNode = ref<HTMLElement>()
-
-function onDocumentClick(event: MouseEvent) {
-  if (
-    event.target instanceof Node &&
-    executionModeSelectorNode.value?.contains(event.target) === false
-  ) {
-    isDropdownOpen.value = false
-  }
-}
-
-useEvent(document, 'pointerdown', onDocumentClick)
-</script>
-
-<template>
-  <div ref="executionModeSelectorNode" class="ExecutionModeSelector">
-    <div class="execution-mode-button">
-      <div class="execution-mode button" @pointerdown.stop="isDropdownOpen = !isDropdownOpen">
-        <span v-text="props.modelValue"></span>
-      </div>
-      <div class="divider"></div>
-      <SvgIcon
-        name="workflow_play"
-        class="play button"
-        draggable="false"
-        @pointerdown="
-          () => {
-            isDropdownOpen = false
-            emit('execute')
-          }
-        "
-      />
-    </div>
-    <Transition name="dropdown">
-      <div v-if="isDropdownOpen" class="execution-mode-dropdown">
-        <template v-for="otherMode in props.modes" :key="otherMode">
-          <span
-            v-if="modelValue !== otherMode"
-            class="button"
-            @pointerdown="emit('update:modelValue', otherMode), (isDropdownOpen = false)"
-            v-text="otherMode"
-          ></span>
-        </template>
-      </div>
-    </Transition>
-  </div>
-</template>
-
-<style scoped>
-span {
-  display: inline-block;
-  height: 24px;
-  padding: 1px 0px;
-  vertical-align: middle;
-  overflow: clip;
-}
-
-.ExecutionModeSelector {
-  position: relative;
-  color: white;
-}
-
-.execution-mode-button {
-  display: flex;
-  align-items: center;
-  height: 24px;
-  border-radius: var(--radius-full);
-  background: #64b526;
-
-  > .execution-mode {
-    font-weight: 600;
-    padding: 0 8px;
-  }
-
-  > .divider {
-    align-self: stretch;
-    width: 1px;
-    background-color: rgba(0, 0, 0, 0.12);
-  }
-
-  > .play {
-    box-sizing: content-box;
-    padding: 0 8px;
-    color: rgba(255, 255, 255, 0.75);
-  }
-}
-
-.execution-mode-dropdown {
-  display: flex;
-  flex-flow: column;
-  position: absolute;
-  background: #64b526;
-  border-radius: 10px;
-  width: 100%;
-  top: 100%;
-  margin-top: 4px;
-  padding: 4px;
-
-  > span {
-    border-radius: 6px;
-    padding-left: 4px;
-    padding-right: 4px;
-    width: 100%;
-  }
-
-  *:hover {
-    background: var(--color-dim);
-  }
-}
-
-.dropdown-enter-active,
-.dropdown-leave-active {
-  transition: all 0.1s;
-
-  > span {
-    transition: all 0.1s;
-  }
-}
-
-.dropdown-enter-from,
-.dropdown-leave-to {
-  max-height: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  overflow: hidden;
-
-  > span {
-    padding-top: 0;
-    padding-bottom: 0;
-    max-height: 0;
-  }
-}
-</style>
diff --git a/app/gui2/src/components/ExtendedMenu.vue b/app/gui2/src/components/ExtendedMenu.vue
new file mode 100644
index 000000000000..eed5812f4a9f
--- /dev/null
+++ b/app/gui2/src/components/ExtendedMenu.vue
@@ -0,0 +1,190 @@
+<script setup lang="ts">
+import SvgIcon from '@/components/SvgIcon.vue'
+import { ref } from 'vue'
+
+const isDropdownOpen = ref(false)
+
+const props = defineProps<{
+  zoomLevel: number
+}>()
+const emit = defineEmits<{ zoomIn: []; zoomOut: []; fitToAllClicked: [] }>()
+</script>
+
+<template>
+  <div class="ExtendedMenu">
+    <div class="moreIcon" @pointerdown="isDropdownOpen = !isDropdownOpen"></div>
+    <Transition name="dropdown">
+      <div v-show="isDropdownOpen" class="ExtendedMenuPane">
+        <div class="row">
+          <div class="zoomBar row">
+            <div class="label">Zoom</div>
+            <div class="zoomControl last">
+              <div
+                class="zoomButton minus"
+                title="Decrease zoom"
+                @pointerdown.stop="emit('zoomOut')"
+              />
+              <span
+                class="zoomScaleLabel"
+                v-text="props.zoomLevel ? props.zoomLevel.toFixed(0) + '%' : '?'"
+              ></span>
+              <div
+                class="zoomButton plus"
+                title="increase zoom"
+                @pointerdown.stop="emit('zoomIn')"
+              />
+            </div>
+          </div>
+          <div class="divider"></div>
+          <SvgIcon
+            name="show_all"
+            class="last showAllIcon"
+            @pointerdown="emit('fitToAllClicked')"
+          />
+        </div>
+      </div>
+    </Transition>
+  </div>
+</template>
+
+<style scoped>
+.ExtendedMenu {
+  display: flex;
+  place-items: center;
+  gap: 12px;
+  width: 32px;
+  height: 32px;
+  margin-left: auto;
+  margin-right: 125px;
+}
+
+.ExtendedMenu:before {
+  position: absolute;
+  content: '';
+  border-radius: var(--radius-full);
+  background: var(--color-frame-bg);
+  backdrop-filter: var(--blur-app-bg);
+  width: 32px;
+  height: 32px;
+}
+
+.ExtendedMenuPane {
+  position: fixed;
+  display: flex;
+  width: 300px;
+  top: 40px;
+  margin-top: 6px;
+  padding: 4px;
+  right: 0px;
+
+  border-radius: var(--radius-full);
+  background: var(--color-frame-bg);
+  backdrop-filter: var(--blur-app-bg);
+}
+
+.label {
+  user-select: none;
+  pointer-events: none;
+}
+
+.row {
+  width: 100%;
+  display: flex;
+  gap: 4px;
+  padding-left: 4px;
+  align-items: center;
+  justify-content: center;
+}
+
+.last {
+  margin-left: auto;
+}
+
+.divider {
+  border-left: 1px solid var(--color-text);
+  border-right: 1px solid var(--color-text);
+  height: 17px;
+  margin-left: 10px;
+  margin-right: 10px;
+  opacity: 0.3;
+}
+
+.zoomControl {
+  display: flex;
+  gap: 4px;
+  align-items: center;
+}
+
+.showAllIcon {
+  margin-right: 10px;
+  cursor: pointer;
+}
+
+.zoomScaleLabel {
+  width: 4em;
+  text-align: center;
+}
+
+.moreIcon {
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  font-size: 24px;
+  font-family: var(--font-code);
+  position: relative;
+  right: -4px;
+  top: 8px;
+}
+
+.moreIcon:before {
+  content: '\2807';
+}
+
+.zoomButton {
+  width: 16px;
+  height: 16px;
+  border-radius: var(--radius-full);
+  position: relative;
+  margin: 0px;
+  display: inline-block;
+  vertical-align: middle;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.zoomButton:hover {
+  background-color: var(--color-menu-entry-hover-bg);
+}
+
+.zoomButton.plus:before,
+.zoomButton.plus:after {
+  content: '';
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  background: var(--color-text);
+}
+
+.zoomButton.plus:before {
+  width: 2px;
+  height: 12px;
+}
+
+.zoomButton.plus:after {
+  height: 2px;
+  width: 12px;
+}
+
+.zoomButton.minus:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: var(--color-text);
+  margin: auto 2px;
+  height: 2px;
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor.vue b/app/gui2/src/components/GraphEditor.vue
index 571810a44d1c..789926de7f96 100644
--- a/app/gui2/src/components/GraphEditor.vue
+++ b/app/gui2/src/components/GraphEditor.vue
@@ -38,7 +38,6 @@ import { computed, onMounted, onScopeDispose, onUnmounted, ref, watch } from 'vu
 import { ProjectManagerEvents } from '../../../ide-desktop/lib/dashboard/src/utilities/ProjectManager'
 import { type Usage } from './ComponentBrowser/input'
 
-const EXECUTION_MODES = ['design', 'live']
 // Assumed size of a newly created node. This is used to place the component browser.
 const DEFAULT_NODE_SIZE = new Vec2(0, 24)
 const gapBetweenNodes = 48.0
@@ -90,12 +89,12 @@ projectStore.lsRpcConnection.then(
     })
   },
   (err) => {
-    toast.error(`Connection to language server failed: ${err}`)
+    toast.error(`Connection to language server failed: ${JSON.stringify(err)}`)
   },
 )
 
 projectStore.executionContext.on('executionFailed', (err) => {
-  toast.error(`Execution Failed: ${err}`, {})
+  toast.error(`Execution Failed: ${JSON.stringify(err)}`, {})
 })
 
 onMounted(() => {
@@ -163,12 +162,36 @@ function sourcePortForSelection() {
 }
 
 useEvent(window, 'keydown', (event) => {
-  interactionBindingsHandler(event) || graphBindingsHandler(event) || codeEditorHandler(event)
+  ;(!keyboardBusy() && (interactionBindingsHandler(event) || graphBindingsHandler(event))) ||
+    (!keyboardBusyExceptIn(codeEditorArea.value) && codeEditorHandler(event))
 })
 useEvent(window, 'pointerdown', interactionBindingsHandler, { capture: true })
 
 onMounted(() => viewportNode.value?.focus())
 
+function zoomToSelected() {
+  if (!viewportNode.value) return
+  let left = Infinity
+  let top = Infinity
+  let right = -Infinity
+  let bottom = -Infinity
+  const nodesToCenter =
+    nodeSelection.selected.size === 0 ? graphStore.db.nodeIdToNode.keys() : nodeSelection.selected
+  for (const id of nodesToCenter) {
+    const rect = graphStore.vizRects.get(id) ?? graphStore.nodeRects.get(id)
+    if (!rect) continue
+    left = Math.min(left, rect.left)
+    right = Math.max(right, rect.right)
+    top = Math.min(top, rect.top)
+    bottom = Math.max(bottom, rect.bottom)
+  }
+  graphNavigator.panAndZoomTo(
+    Rect.FromBounds(left, top, right, bottom),
+    0.1,
+    Math.max(1, graphNavigator.scale),
+  )
+}
+
 const graphBindingsHandler = graphBindings.handler({
   undo() {
     projectStore.module?.undoManager.undo()
@@ -201,26 +224,7 @@ const graphBindingsHandler = graphBindings.handler({
     })
   },
   zoomToSelected() {
-    if (!viewportNode.value) return
-    let left = Infinity
-    let top = Infinity
-    let right = -Infinity
-    let bottom = -Infinity
-    const nodesToCenter =
-      nodeSelection.selected.size === 0 ? graphStore.db.nodeIdToNode.keys() : nodeSelection.selected
-    for (const id of nodesToCenter) {
-      const rect = graphStore.vizRects.get(id) ?? graphStore.nodeRects.get(id)
-      if (!rect) continue
-      left = Math.min(left, rect.left)
-      right = Math.max(right, rect.right)
-      top = Math.min(top, rect.top)
-      bottom = Math.max(bottom, rect.bottom)
-    }
-    graphNavigator.panAndZoomTo(
-      Rect.FromBounds(left, top, right, bottom),
-      0.1,
-      Math.max(1, graphNavigator.scale),
-    )
+    zoomToSelected()
   },
   selectAll() {
     if (keyboardBusy()) return
@@ -281,7 +285,7 @@ const graphBindingsHandler = graphBindings.handler({
         // For collapsed function, only selected nodes would affect placement of the output node.
         collapsedFunctionEnv.nodeRects = collapsedFunctionEnv.selectedNodeRects
         edit
-          .checkedGet(refactoredNodeId)
+          .get(refactoredNodeId)
           .mutableNodeMetadata()
           .set('position', { x: position.x, y: position.y })
         if (outputNodeId != null) {
@@ -290,7 +294,7 @@ const graphBindingsHandler = graphBindings.handler({
             collapsedFunctionEnv,
           )
           edit
-            .checkedGet(outputNodeId)
+            .get(outputNodeId)
             .mutableNodeMetadata()
             .set('position', { x: position.x, y: position.y })
         }
@@ -312,7 +316,7 @@ const graphBindingsHandler = graphBindings.handler({
   },
 })
 
-const handleClick = useDoubleClick(
+const { handleClick } = useDoubleClick(
   (e: MouseEvent) => {
     graphBindingsHandler(e)
   },
@@ -320,18 +324,17 @@ const handleClick = useDoubleClick(
     if (keyboardBusy()) return false
     stackNavigator.exitNode()
   },
-).handleClick
+)
 const codeEditorArea = ref<HTMLElement>()
 const showCodeEditor = ref(false)
 const codeEditorHandler = codeEditorBindings.handler({
   toggle() {
-    if (keyboardBusyExceptIn(codeEditorArea.value)) return false
     showCodeEditor.value = !showCodeEditor.value
   },
 })
 
-/** Track play button presses. */
-function onPlayButtonPress() {
+/** Handle record-once button presses. */
+function onRecordOnceButtonPress() {
   projectStore.lsRpcConnection.then(async () => {
     const modeValue = projectStore.executionMode
     if (modeValue == undefined) {
@@ -417,7 +420,7 @@ function onComponentBrowserCommit(content: string, requiredImports: RequiredImpo
     if (graphStore.editedNodeInfo) {
       // We finish editing a node.
       graphStore.setNodeContent(graphStore.editedNodeInfo.id, content)
-    } else {
+    } else if (content != '') {
       // We finish creating a new node.
       const metadata = undefined
       const createdNode = graphStore.createNode(
@@ -641,9 +644,7 @@ function handleEdgeDrop(source: AstId, position: Vec2) {
         @nodeDoubleClick="(id) => stackNavigator.enterNode(id)"
       />
     </div>
-    <svg :viewBox="graphNavigator.viewBox" class="svgBackdropLayer">
-      <GraphEdges @createNodeFromEdge="handleEdgeDrop" />
-    </svg>
+    <GraphEdges :navigator="graphNavigator" @createNodeFromEdge="handleEdgeDrop" />
 
     <ComponentBrowser
       v-if="componentBrowserVisible"
@@ -652,22 +653,27 @@ function handleEdgeDrop(source: AstId, position: Vec2) {
       :nodePosition="componentBrowserNodePosition"
       :usage="componentBrowserUsage"
       @accepted="onComponentBrowserCommit"
-      @closed="onComponentBrowserCommit"
       @canceled="onComponentBrowserCancel"
     />
     <TopBar
-      v-model:mode="projectStore.executionMode"
-      :title="projectStore.displayName"
-      :modes="EXECUTION_MODES"
+      v-model:recordMode="projectStore.recordMode"
       :breadcrumbs="stackNavigator.breadcrumbLabels.value"
       :allowNavigationLeft="stackNavigator.allowNavigationLeft.value"
       :allowNavigationRight="stackNavigator.allowNavigationRight.value"
+      :zoomLevel="100.0 * graphNavigator.scale"
       @breadcrumbClick="stackNavigator.handleBreadcrumbClick"
       @back="stackNavigator.exitNode"
       @forward="stackNavigator.enterNextNodeFromHistory"
-      @execute="onPlayButtonPress()"
+      @recordOnce="onRecordOnceButtonPress()"
+      @fitToAllClicked="zoomToSelected"
+      @zoomIn="graphNavigator.scale *= 1.1"
+      @zoomOut="graphNavigator.scale *= 0.9"
+    />
+    <PlusButton
+      @click.stop="interaction.setCurrent(creatingNodeFromButton)"
+      @pointerdown.stop
+      @pointerup.stop
     />
-    <PlusButton @pointerdown="interaction.setCurrent(creatingNodeFromButton)" />
     <Transition>
       <Suspense ref="codeEditorArea">
         <CodeEditor v-if="showCodeEditor" />
@@ -686,13 +692,6 @@ function handleEdgeDrop(source: AstId, position: Vec2) {
   --node-color-no-type: #596b81;
 }
 
-.svgBackdropLayer {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: -1;
-}
-
 .htmlLayer {
   position: absolute;
   top: 0;
diff --git a/app/gui2/src/components/GraphEditor/GraphEdge.vue b/app/gui2/src/components/GraphEditor/GraphEdge.vue
index a376f7e5a104..39ebc0ca44bb 100644
--- a/app/gui2/src/components/GraphEditor/GraphEdge.vue
+++ b/app/gui2/src/components/GraphEditor/GraphEdge.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import { useGraphStore, type Edge } from '@/stores/graph'
+import { isConnected, useGraphStore, type Edge } from '@/stores/graph'
 import { assert } from '@/util/assert'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
@@ -15,6 +15,7 @@ const graph = useGraphStore()
 
 const props = defineProps<{
   edge: Edge
+  maskSource?: boolean
 }>()
 
 const base = ref<SVGPathElement>()
@@ -49,21 +50,29 @@ const targetNode = computed(
 )
 const targetNodeRect = computed(() => targetNode.value && graph.nodeRects.get(targetNode.value))
 
-const targetRect = computed<Rect | undefined>(() => {
+const targetPos = computed<Vec2 | undefined>(() => {
   const expr = targetExpr.value
   if (expr != null && targetNode.value != null && targetNodeRect.value != null) {
     const targetRectRelative = graph.getPortRelativeRect(expr)
     if (targetRectRelative == null) return
-    return targetRectRelative.offsetBy(targetNodeRect.value.pos)
+    const yAdjustment = targetIsSelfArgument.value
+      ? -(selfArgumentArrowHeight + selfArgumentArrowYOffset)
+      : 0
+    return targetNodeRect.value.pos.add(new Vec2(targetRectRelative.center().x, yAdjustment))
   } else if (navigator?.sceneMousePos != null) {
-    return new Rect(navigator.sceneMousePos, Vec2.Zero)
+    return navigator.sceneMousePos
   } else {
     return undefined
   }
 })
+
+const sourceNodeRect = computed<Rect | undefined>(() => {
+  return sourceNode.value && graph.nodeRects.get(sourceNode.value)
+})
+
 const sourceRect = computed<Rect | undefined>(() => {
-  if (sourceNode.value != null) {
-    return graph.nodeRects.get(sourceNode.value)
+  if (sourceNodeRect.value) {
+    return sourceNodeRect.value
   } else if (navigator?.sceneMousePos != null) {
     return new Rect(navigator.sceneMousePos, Vec2.Zero)
   } else {
@@ -71,6 +80,20 @@ const sourceRect = computed<Rect | undefined>(() => {
   }
 })
 
+type NodeMask = {
+  id: string
+  rect: Rect
+  radius: number
+}
+const sourceMask = computed<NodeMask | undefined>(() => {
+  if (!props.maskSource) return
+  const rect = sourceNodeRect.value
+  if (!rect) return
+  const radius = 16
+  const id = `mask_for_edge_to-${props.edge.target ?? 'unconnected'}`
+  return { id, rect, radius }
+})
+
 const edgeColor = computed(
   () =>
     (targetNode.value && graph.db.getNodeColorStyle(targetNode.value)) ??
@@ -82,20 +105,14 @@ interface Inputs {
   /** The width and height of the node that originates the edge, if any.
    *  The edge may begin anywhere around the bottom half of the node. */
   sourceSize: Vec2
-  /** The width and height of the port that the edge is attached to, if any. */
-  targetSize: Vec2
   /** The coordinates of the node input port that is the edge's destination, relative to the source
    * position. The edge enters the port from above. */
   targetOffset: Vec2
-  /** The distance between the target port top edge and the target node top edge. It is undefined
-   *  when there is no clear target node set, e.g. when the edge is being dragged. */
-  targetPortTopDistanceInNode: number | undefined
 }
 
 interface JunctionPoints {
   points: Vec2[]
   maxRadius: number
-  targetAttachment: { target: Vec2; length: number } | undefined
 }
 
 function circleIntersection(x: number, r1: number, r2: number): number {
@@ -140,26 +157,17 @@ function circleIntersection(x: number, r1: number, r2: number): number {
  */
 
 /** Calculate the start and end positions of each 1-corner section composing an edge to the
- *  given offset. Return the points, the maximum radius that should be used to draw the corners
- *  connecting them, and the length of the target attachment bit.
+ *  given offset. Return the points and the maximum radius that should be used to draw the corners
+ *  connecting them.
  */
 function junctionPoints(inputs: Inputs): JunctionPoints | null {
   let halfSourceSize = inputs.sourceSize?.scale(0.5) ?? Vec2.Zero
   // The maximum x-distance from the source (our local coordinate origin) for the point where the
   // edge will begin.
   const sourceMaxXOffset = Math.max(halfSourceSize.x - theme.node.corner_radius, 0)
-  const attachment =
-    inputs.targetPortTopDistanceInNode != null
-      ? {
-          target: inputs.targetOffset.add(new Vec2(0, inputs.targetSize.y * -0.5)),
-          length: inputs.targetPortTopDistanceInNode,
-        }
-      : undefined
-
-  const targetWellBelowSource =
-    inputs.targetOffset.y - (inputs.targetPortTopDistanceInNode ?? 0) >=
-    theme.edge.min_approach_height
-  const targetBelowSource = inputs.targetOffset.y > theme.node.height / 2.0
+  const attachmentTarget = inputs.targetOffset
+  const targetWellBelowSource = inputs.targetOffset.y >= theme.edge.min_approach_height
+  const targetBelowSource = inputs.targetOffset.y > 0
   const targetBeyondSource = Math.abs(inputs.targetOffset.x) > sourceMaxXOffset
   const horizontalRoomFor3Corners =
     targetBeyondSource &&
@@ -199,18 +207,9 @@ function junctionPoints(inputs: Inputs): JunctionPoints | null {
       sourceDY = -innerTheme.source_node_overlap + halfSourceSize.y
     }
     const source = new Vec2(sourceX, sourceDY)
-    // The target attachment will extend as far toward the edge of the node as it can without
-    // rising above the source.
-    let attachmentHeight =
-      inputs.targetPortTopDistanceInNode != null
-        ? Math.min(inputs.targetPortTopDistanceInNode, Math.abs(inputs.targetOffset.y))
-        : 0
-    let attachmentY = inputs.targetOffset.y - attachmentHeight - inputs.targetSize.y / 2.0
-    let targetAttachment = new Vec2(inputs.targetOffset.x, attachmentY)
     return {
-      points: [source, targetAttachment],
+      points: [source, inputs.targetOffset],
       maxRadius,
-      targetAttachment: attachment,
     }
   } else {
     const radiusMax = theme.edge.three_corner.radius_max
@@ -249,20 +248,16 @@ function junctionPoints(inputs: Inputs): JunctionPoints | null {
       heightAdjustment = 0
     }
     if (j0x == null || j1x == null || heightAdjustment == null) return null
-    const attachmentHeight = inputs.targetPortTopDistanceInNode ?? 0
     const top = Math.min(
-      inputs.targetOffset.y - theme.edge.min_approach_height - attachmentHeight + heightAdjustment,
+      inputs.targetOffset.y - theme.edge.min_approach_height + heightAdjustment,
       0,
     )
     const source = new Vec2(sourceX, 0)
     const j0 = new Vec2(j0x, top / 2)
     const j1 = new Vec2(j1x, top)
-    // The corners meet the target attachment at the top of the node.
-    const attachmentTarget = attachment?.target ?? inputs.targetOffset
     return {
       points: [source, j0, j1, attachmentTarget],
       maxRadius: radiusMax,
-      targetAttachment: attachment,
     }
   }
 }
@@ -330,15 +325,12 @@ function render(sourcePos: Vec2, elements: Element[]): string {
 }
 
 const currentJunctionPoints = computed(() => {
-  const target = targetRect.value
-  const targetNode = targetNodeRect.value
+  const target = targetPos.value
   const source = sourceRect.value
   if (target == null || source == null) return null
   const inputs: Inputs = {
-    targetOffset: target.center().sub(source.center()),
     sourceSize: source.size,
-    targetSize: target.size,
-    targetPortTopDistanceInNode: targetNode != null ? target.top - targetNode.top : undefined,
+    targetOffset: target.sub(source.center()),
   }
   return junctionPoints(inputs)
 })
@@ -358,9 +350,7 @@ const activePath = computed(() => {
   else return undefined
 })
 
-function lengthTo(pos: Vec2): number | undefined {
-  const path = base.value
-  if (path == null) return undefined
+function lengthTo(path: SVGPathElement, pos: Vec2): number {
   const totalLength = path.getTotalLength()
   let best: number | undefined
   let bestDist: number | undefined
@@ -383,93 +373,171 @@ function lengthTo(pos: Vec2): number | undefined {
   return best
 }
 
+const mouseLocationOnEdge = computed(() => {
+  if (navigator?.sceneMousePos == null) return
+  if (base.value == null) return
+  const sourceToMouse = lengthTo(base.value, navigator.sceneMousePos)
+  const sourceToTarget = base.value.getTotalLength()
+  const mouseToTarget = sourceToTarget - sourceToMouse
+  return { sourceToMouse, sourceToTarget, mouseToTarget }
+})
+
 const hovered = ref(false)
 const activeStyle = computed(() => {
   if (!hovered.value) return {}
   if (props.edge.source == null || props.edge.target == null) return {}
-  if (base.value == null) return {}
-  if (navigator?.sceneMousePos == null) return {}
-  const length = base.value.getTotalLength()
-  let offset = lengthTo(navigator.sceneMousePos)
-  if (offset == null) return {}
-  offset = length - offset
-  if (offset < length / 2) {
-    offset += length
-  }
+  const distances = mouseLocationOnEdge.value
+  if (distances == null) return {}
+  const offset =
+    distances.sourceToMouse < distances.mouseToTarget
+      ? distances.mouseToTarget
+      : -distances.sourceToMouse
   return {
     ...baseStyle.value,
-    strokeDasharray: length,
+    strokeDasharray: distances.sourceToTarget,
     strokeDashoffset: offset,
   }
 })
 
+const targetEndIsDimmed = computed(() => {
+  if (!hovered.value) return false
+  const distances = mouseLocationOnEdge.value
+  if (!distances) return false
+  return distances.sourceToMouse < distances.mouseToTarget
+})
+
 const baseStyle = computed(() => ({ '--node-base-color': edgeColor.value ?? 'tan' }))
 
 function click() {
-  if (base.value == null) return
-  if (navigator?.sceneMousePos == null) return
-  const length = base.value.getTotalLength()
-  let offset = lengthTo(navigator?.sceneMousePos)
-  if (offset == null) return
-  if (offset < length / 2) graph.disconnectTarget(props.edge)
+  const distances = mouseLocationOnEdge.value
+  if (distances == null) return
+  if (distances.sourceToMouse < distances.mouseToTarget) graph.disconnectTarget(props.edge)
   else graph.disconnectSource(props.edge)
 }
 
-function arrowPosition(): Vec2 | undefined {
+function svgTranslate(offset: Vec2): string {
+  return `translate(${offset.x},${offset.y})`
+}
+
+const backwardEdgeArrowTransform = computed<string | undefined>(() => {
   if (props.edge.source == null || props.edge.target == null) return
   const points = currentJunctionPoints.value?.points
   if (points == null || points.length < 3) return
-  const target = targetRect.value
+  const target = targetPos.value
   const source = sourceRect.value
   if (target == null || source == null) return
-  if (target.pos.y > source.pos.y - theme.edge.three_corner.backward_edge_arrow_threshold) return
+  if (target.y > source.pos.y - theme.edge.three_corner.backward_edge_arrow_threshold) return
   if (points[1] == null) return
-  return source.center().add(points[1])
-}
+  return svgTranslate(source.center().add(points[1]))
+})
 
-const arrowTransform = computed(() => {
-  const pos = arrowPosition()
-  if (pos != null) return `translate(${pos.x},${pos.y})`
-  else return undefined
+const targetIsSelfArgument = computed(() => {
+  if (!targetExpr.value) return
+  const nodeId = graph.getPortNodeId(targetExpr.value)
+  if (!nodeId) return
+  const primarySubject = graph.db.nodeIdToNode.get(nodeId)?.primarySubject
+  if (!primarySubject) return
+  return targetExpr.value === primarySubject
+})
+
+const selfArgumentArrowHeight = 9
+const selfArgumentArrowYOffset = 0
+const selfArgumentArrowTransform = computed<string | undefined>(() => {
+  const selfArgumentArrowTopOffset = 4
+  const selfArgumentArrowWidth = 12
+  if (!targetIsSelfArgument.value) return
+  const target = targetPos.value
+  if (target == null) return
+  const pos = target.sub(new Vec2(selfArgumentArrowWidth / 2, selfArgumentArrowTopOffset))
+  return svgTranslate(pos)
 })
+
+const selfArgumentArrowPath = [
+  'M10.9635 1.5547',
+  'L6.83205 7.75193',
+  'C6.43623 8.34566 5.56377 8.34566 5.16795 7.75192',
+  'L1.03647 1.5547',
+  'C0.593431 0.890146 1.06982 0 1.86852 0',
+  'L10.1315 0',
+  'C10.9302 0 11.4066 0.890147 10.9635 1.5547',
+  'Z',
+].join('')
+
+const connected = computed(() => isConnected(props.edge))
 </script>
 
 <template>
   <template v-if="basePath">
-    <path
-      v-if="activePath"
-      :d="basePath"
-      class="edge visible dimmed"
-      :style="baseStyle"
-      :data-source-node-id="sourceNode"
-      :data-target-node-id="targetNode"
-    />
-    <path
-      :d="basePath"
-      class="edge io"
-      :data-source-node-id="sourceNode"
-      :data-target-node-id="targetNode"
-      @pointerdown="click"
-      @pointerenter="hovered = true"
-      @pointerleave="hovered = false"
-    />
-    <path
-      ref="base"
-      :d="activePath ?? basePath"
-      class="edge visible"
-      :style="activePath ? activeStyle : baseStyle"
-      :data-source-node-id="sourceNode"
-      :data-target-node-id="targetNode"
-    />
-    <polygon
-      v-if="arrowTransform"
-      :transform="arrowTransform"
-      points="0,-9.375 -9.375,9.375 9.375,9.375"
-      class="arrow visible"
-      :style="baseStyle"
-      :data-source-node-id="sourceNode"
-      :data-target-node-id="targetNode"
-    />
+    <mask
+      v-if="sourceMask && navigator"
+      :id="sourceMask.id"
+      :x="navigator.viewport.left"
+      :y="navigator.viewport.top"
+      width="100%"
+      height="100%"
+      maskUnits="userSpaceOnUse"
+    >
+      <rect
+        :x="navigator.viewport.left"
+        :y="navigator.viewport.top"
+        width="100%"
+        height="100%"
+        fill="white"
+      />
+      <rect
+        :x="sourceMask.rect.left"
+        :y="sourceMask.rect.top"
+        :width="sourceMask.rect.width"
+        :height="sourceMask.rect.height"
+        :rx="sourceMask.radius"
+        :ry="sourceMask.radius"
+        fill="black"
+      />
+    </mask>
+    <g v-bind="sourceMask && { mask: `url('#${sourceMask.id}')` }">
+      <path
+        v-if="activePath"
+        :d="basePath"
+        class="edge visible dimmed"
+        :style="baseStyle"
+        :data-source-node-id="sourceNode"
+        :data-target-node-id="targetNode"
+      />
+      <path
+        v-if="connected"
+        :d="basePath"
+        class="edge io"
+        :data-source-node-id="sourceNode"
+        :data-target-node-id="targetNode"
+        @pointerdown="click"
+        @pointerenter="hovered = true"
+        @pointerleave="hovered = false"
+      />
+      <path
+        ref="base"
+        :d="activePath ?? basePath"
+        class="edge visible"
+        :style="activePath ? activeStyle : baseStyle"
+        :data-source-node-id="sourceNode"
+        :data-target-node-id="targetNode"
+      />
+      <polygon
+        v-if="backwardEdgeArrowTransform"
+        :transform="backwardEdgeArrowTransform"
+        points="0,-9.375 -9.375,9.375 9.375,9.375"
+        class="arrow visible"
+        :style="baseStyle"
+        :data-source-node-id="sourceNode"
+        :data-target-node-id="targetNode"
+      />
+      <path
+        v-if="selfArgumentArrowTransform"
+        :transform="selfArgumentArrowTransform"
+        :d="selfArgumentArrowPath"
+        :class="{ arrow: true, visible: true, dimmed: targetEndIsDimmed }"
+        :style="baseStyle"
+      />
+    </g>
   </template>
 </template>
 
@@ -503,4 +571,8 @@ const arrowTransform = computed(() => {
   /* stroke: rgba(255, 255, 255, 0.4); */
   stroke: color-mix(in oklab, var(--edge-color) 60%, white 40%);
 }
+
+.arrow.visible.dimmed {
+  fill: color-mix(in oklab, var(--edge-color) 60%, white 40%);
+}
 </style>
diff --git a/app/gui2/src/components/GraphEditor/GraphEdges.vue b/app/gui2/src/components/GraphEditor/GraphEdges.vue
index eddf1b66897d..958503be431b 100644
--- a/app/gui2/src/components/GraphEditor/GraphEdges.vue
+++ b/app/gui2/src/components/GraphEditor/GraphEdges.vue
@@ -14,6 +14,10 @@ const graph = useGraphStore()
 const selection = injectGraphSelection(true)
 const interaction = injectInteractionHandler()
 
+const props = defineProps<{
+  navigator: GraphNavigator
+}>()
+
 const emits = defineEmits<{
   createNodeFromEdge: [source: AstId, position: Vec2]
 }>()
@@ -99,5 +103,36 @@ function createEdge(source: AstId, target: PortId) {
 </script>
 
 <template>
-  <GraphEdge v-for="(edge, index) in graph.edges" :key="index" :edge="edge" />
+  <div>
+    <svg :viewBox="props.navigator.viewBox" class="overlay behindNodes">
+      <GraphEdge v-for="edge in graph.connectedEdges" :key="edge.target" :edge="edge" />
+    </svg>
+    <svg
+      v-if="graph.unconnectedEdge"
+      :viewBox="props.navigator.viewBox"
+      class="overlay aboveNodes nonInteractive"
+    >
+      <GraphEdge :edge="graph.unconnectedEdge" maskSource />
+    </svg>
+  </div>
 </template>
+
+<style scoped>
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.overlay.behindNodes {
+  z-index: -1;
+}
+
+.overlay.aboveNodes {
+  z-index: 20;
+}
+
+.nonInteractive {
+  pointer-events: none;
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor/GraphNode.vue b/app/gui2/src/components/GraphEditor/GraphNode.vue
index 67a19a57d268..cfb7bc847940 100644
--- a/app/gui2/src/components/GraphEditor/GraphNode.vue
+++ b/app/gui2/src/components/GraphEditor/GraphNode.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { nodeEditBindings } from '@/bindings'
 import CircularMenu from '@/components/CircularMenu.vue'
-import GraphNodeError from '@/components/GraphEditor/GraphNodeError.vue'
+import GraphNodeError from '@/components/GraphEditor/GraphNodeMessage.vue'
 import GraphVisualization from '@/components/GraphEditor/GraphVisualization.vue'
 import NodeWidgetTree from '@/components/GraphEditor/NodeWidgetTree.vue'
-import SvgIcon from '@/components/SvgIcon.vue'
 import { useApproach } from '@/composables/animation'
 import { useDoubleClick } from '@/composables/doubleClick'
 import { usePointer, useResizeObserver } from '@/composables/events'
@@ -26,8 +25,6 @@ import { computed, onUnmounted, ref, watch, watchEffect } from 'vue'
 
 const MAXIMUM_CLICK_LENGTH_MS = 300
 const MAXIMUM_CLICK_DISTANCE_SQ = 50
-/** The width in pixels that is not the widget tree. This includes the icon, and padding. */
-const NODE_EXTRA_WIDTH_PX = 30
 
 const prefixes = Prefixes.FromLines({
   enableOutputContext:
@@ -73,15 +70,19 @@ const outputPortsSet = computed(() => {
 const widthOverridePx = ref<number>()
 const nodeId = computed(() => asNodeId(props.node.rootSpan.id))
 const externalId = computed(() => props.node.rootSpan.externalId)
+const potentialSelfArgumentId = computed(() => props.node.primarySubject)
+const connectedSelfArgumentId = computed(() =>
+  props.node.primarySubject && graph.isConnectedTarget(props.node.primarySubject)
+    ? props.node.primarySubject
+    : undefined,
+)
 
 onUnmounted(() => graph.unregisterNodeRect(nodeId.value))
 
 const rootNode = ref<HTMLElement>()
 const contentNode = ref<HTMLElement>()
 const nodeSize = useResizeObserver(rootNode)
-const baseNodeSize = computed(
-  () => new Vec2((contentNode.value?.scrollWidth ?? 0) + NODE_EXTRA_WIDTH_PX, nodeSize.value.y),
-)
+const baseNodeSize = computed(() => new Vec2(contentNode.value?.scrollWidth ?? 0, nodeSize.value.y))
 
 /// Menu can be full, partial or off
 enum MenuState {
@@ -107,6 +108,15 @@ const error = computed(() => {
   }
 })
 
+const warning = computed(() => {
+  const externalId = graph.db.idToExternal(nodeId.value)
+  if (!externalId) return
+  const info = projectStore.computedValueRegistry.db.get(externalId)
+  const warning = info?.payload.type === 'Value' ? info.payload.warnings?.value : undefined
+  if (!warning) return
+  return '⚠ Warning: ' + warning!
+})
+
 const isSelected = computed(() => nodeSelection?.isSelected(nodeId.value) ?? false)
 watch(isSelected, (selected) => {
   if (!selected) {
@@ -140,6 +150,9 @@ const startEpochMs = ref(0)
 let startEvent: PointerEvent | null = null
 let startPos = Vec2.Zero
 
+// TODO[ao]: Now, the dragPointer.events are preventing `click` events on widgets if they don't
+// stop pointerup and pointerdown. Now we ensure that any widget handling click does that, but
+// instead `usePointer` should be smarter.
 const dragPointer = usePointer((pos, event, type) => {
   if (type !== 'start') {
     const fullOffset = pos.absolute.sub(startPos)
@@ -159,7 +172,8 @@ const dragPointer = usePointer((pos, event, type) => {
         startEvent != null &&
         pos.absolute.distanceSquared(startPos) <= MAXIMUM_CLICK_DISTANCE_SQ
       ) {
-        nodeSelection?.handleSelectionOf(startEvent, new Set([nodeId.value]))
+        nodeSelection?.handleSelectionOf(event, new Set([nodeId.value]))
+        handleNodeClick(event)
         menuVisible.value = MenuState.Partial
       }
       startEvent = null
@@ -170,9 +184,7 @@ const dragPointer = usePointer((pos, event, type) => {
 })
 
 const matches = computed(() => prefixes.extractMatches(props.node.rootSpan))
-const displayedExpression = computed(() =>
-  props.node.rootSpan.module.checkedGet(matches.value.innerExpr),
-)
+const displayedExpression = computed(() => props.node.rootSpan.module.get(matches.value.innerExpr))
 
 const isOutputContextOverridden = computed({
   get() {
@@ -244,7 +256,7 @@ const nodeEditHandler = nodeEditBindings.handler({
 })
 
 function startEditingNode(position: Vec2 | undefined) {
-  let sourceOffset = 0
+  let sourceOffset = props.node.rootSpan.code().length
   if (position != null) {
     let domNode, domOffset
     if ((document as any).caretPositionFromPoint) {
@@ -333,6 +345,8 @@ watchEffect(() => {
   }
 })
 
+const nodeHovered = ref(false)
+
 function portGroupStyle(port: PortData) {
   const [start, end] = port.clipRange
   return {
@@ -358,7 +372,7 @@ function openFullMenu() {
       transform,
       width:
         widthOverridePx != null && isVisualizationVisible
-          ? `${Math.max(widthOverridePx, (contentNode?.scrollWidth ?? 0) + NODE_EXTRA_WIDTH_PX)}px`
+          ? `${Math.max(widthOverridePx, contentNode?.scrollWidth ?? 0)}px`
           : undefined,
       '--node-group-color': color,
     }"
@@ -370,6 +384,8 @@ function openFullMenu() {
       ['executionState-' + executionState]: true,
     }"
     :data-node-id="nodeId"
+    @pointerenter="nodeHovered = true"
+    @pointerleave="nodeHovered = false"
   >
     <div class="selection" v-on="dragPointer.events"></div>
     <div class="binding" @pointerdown.stop>
@@ -401,17 +417,31 @@ function openFullMenu() {
       @update:id="emit('update:visualizationId', $event)"
       @update:visible="emit('update:visualizationVisible', $event)"
     />
-    <div class="node" @pointerdown="handleNodeClick" v-on="dragPointer.events">
-      <SvgIcon
-        class="icon grab-handle"
-        :name="icon"
-        @pointerdown.right.stop="openFullMenu"
-      ></SvgIcon>
-      <div ref="contentNode" class="widget-tree">
-        <NodeWidgetTree :ast="displayedExpression" :nodeId="nodeId" />
-      </div>
+    <div
+      ref="contentNode"
+      class="node"
+      v-on="dragPointer.events"
+      @click.stop
+      @pointerdown.stop
+      @pointerup.stop
+    >
+      <NodeWidgetTree
+        :ast="displayedExpression"
+        :nodeId="nodeId"
+        :icon="icon"
+        :connectedSelfArgumentId="connectedSelfArgumentId"
+        :potentialSelfArgumentId="potentialSelfArgumentId"
+        @openFullMenu="openFullMenu"
+      />
     </div>
-    <GraphNodeError v-if="error" class="error" :error="error" />
+    <GraphNodeError v-if="error" class="message" :message="error" type="error" />
+    <GraphNodeError
+      v-if="warning && (nodeHovered || isSelected)"
+      class="message warning"
+      :class="menuVisible === MenuState.Off ? '' : 'messageWithMenu'"
+      :message="warning"
+      type="warning"
+    />
     <svg class="bgPaths" :style="bgStyleVariables">
       <rect class="bgFill" />
       <template v-for="port of outputPorts" :key="port.portId">
@@ -548,7 +578,7 @@ function openFullMenu() {
   caret-shape: bar;
   height: var(--node-height);
   border-radius: var(--node-border-radius);
-  display: flex;
+  display: inline-flex;
   flex-direction: row;
   align-items: center;
   white-space: nowrap;
@@ -620,11 +650,6 @@ function openFullMenu() {
   gap: 4px;
 }
 
-.grab-handle {
-  color: white;
-  margin: 0 4px;
-}
-
 .CircularMenu {
   z-index: 25;
 }
@@ -633,9 +658,17 @@ function openFullMenu() {
   z-index: 1;
 }
 
-.error {
+.message {
   position: absolute;
   top: 100%;
   margin-top: 4px;
 }
+
+.messageWithMenu {
+  left: 40px;
+}
+
+.warning {
+  top: 35px;
+}
 </style>
diff --git a/app/gui2/src/components/GraphEditor/GraphNodeError.vue b/app/gui2/src/components/GraphEditor/GraphNodeError.vue
deleted file mode 100644
index 945ed2229fc8..000000000000
--- a/app/gui2/src/components/GraphEditor/GraphNodeError.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<script setup lang="ts">
-const props = defineProps<{ error: string }>()
-</script>
-
-<template>
-  <div class="GraphNodeError" v-text="props.error"></div>
-</template>
-
-<style scoped>
-.GraphNodeError {
-  display: flex;
-  height: 24px;
-  padding: 1px 8px;
-  align-items: flex-start;
-  gap: 10px;
-  font-weight: 800;
-  white-space: nowrap;
-  border-radius: var(--radius-full);
-  background-color: #e85252;
-  color: var(--color-text-inversed);
-  line-height: 20px;
-}
-</style>
diff --git a/app/gui2/src/components/GraphEditor/GraphNodeMessage.vue b/app/gui2/src/components/GraphEditor/GraphNodeMessage.vue
new file mode 100644
index 000000000000..7f3eb58ab990
--- /dev/null
+++ b/app/gui2/src/components/GraphEditor/GraphNodeMessage.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+/// types of messages
+export type GraphNodeMessageType = 'error' | 'warning'
+
+const props = defineProps<{ message: string; type: GraphNodeMessageType }>()
+
+function styleClassForType(type: GraphNodeMessageType) {
+  switch (type) {
+    case 'error':
+      return 'GraphNodeError'
+    case 'warning':
+      return 'GraphNodeWarning'
+    default:
+      return ''
+  }
+}
+</script>
+
+<template>
+  <div class="GraphNodeMessage" :class="styleClassForType(props.type)" v-text="props.message"></div>
+</template>
+
+<style scoped>
+.GraphNodeMessage {
+  display: flex;
+  height: 24px;
+  padding: 1px 8px;
+  align-items: flex-start;
+  gap: 10px;
+  font-weight: 800;
+  white-space: nowrap;
+  border-radius: var(--radius-full);
+  color: var(--color-text-inversed);
+  line-height: 20px;
+}
+
+.GraphNodeWarning {
+  background-color: #faa212;
+}
+
+.GraphNodeError {
+  background-color: #e85252;
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue b/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
index d26b551160ac..b841b2557094 100644
--- a/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
+++ b/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
@@ -1,13 +1,24 @@
 <script setup lang="ts">
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
+import SvgIcon from '@/components/SvgIcon.vue'
 import { useTransitioning } from '@/composables/animation'
 import { WidgetInput, type WidgetUpdate } from '@/providers/widgetRegistry'
 import { provideWidgetTree } from '@/providers/widgetTree'
 import { useGraphStore, type NodeId } from '@/stores/graph'
 import { Ast } from '@/util/ast'
+import type { Icon } from '@/util/iconName'
 import { computed, toRef } from 'vue'
 
-const props = defineProps<{ ast: Ast.Ast; nodeId: NodeId }>()
+const props = defineProps<{
+  ast: Ast.Ast
+  nodeId: NodeId
+  icon: Icon
+  connectedSelfArgumentId: Ast.AstId | undefined
+  potentialSelfArgumentId: Ast.AstId | undefined
+}>()
+const emit = defineEmits<{
+  openFullMenu: []
+}>()
 const graph = useGraphStore()
 const rootPort = computed(() => {
   const input = WidgetInput.FromAst(props.ast)
@@ -36,12 +47,12 @@ function handleWidgetUpdates(update: WidgetUpdate) {
     const { value, origin } = update.portUpdate
     if (Ast.isAstId(origin)) {
       const ast =
-        value instanceof Ast.Ast
-          ? value
-          : value == null
-          ? Ast.Wildcard.new(edit)
-          : Ast.parse(value, edit)
-      edit.replaceValue(origin as Ast.AstId, ast)
+        value instanceof Ast.Ast ? value : value == null ? Ast.Wildcard.new(edit) : undefined
+      if (ast) {
+        edit.replaceValue(origin as Ast.AstId, ast)
+      } else if (typeof value === 'string') {
+        edit.tryGet(origin)?.syncToCode(value)
+      }
     } else {
       console.error(`[UPDATE ${origin}] Invalid top-level origin. Expected expression ID.`)
     }
@@ -52,11 +63,28 @@ function handleWidgetUpdates(update: WidgetUpdate) {
 }
 
 const layoutTransitions = useTransitioning(observedLayoutTransitions)
-provideWidgetTree(toRef(props, 'ast'), toRef(props, 'nodeId'), layoutTransitions.active)
+provideWidgetTree(
+  toRef(props, 'ast'),
+  toRef(props, 'nodeId'),
+  toRef(props, 'icon'),
+  toRef(props, 'connectedSelfArgumentId'),
+  toRef(props, 'potentialSelfArgumentId'),
+  layoutTransitions.active,
+  () => {
+    emit('openFullMenu')
+  },
+)
 </script>
 
 <template>
   <div class="NodeWidgetTree" spellcheck="false" v-on="layoutTransitions.events">
+    <!-- Display an icon for the node if no widget in the tree provides one. -->
+    <SvgIcon
+      v-if="!props.connectedSelfArgumentId"
+      class="icon grab-handle"
+      :name="props.icon"
+      @click.right.stop.prevent="emit('openFullMenu')"
+    />
     <NodeWidget :input="rootPort" @update="handleWidgetUpdates" />
   </div>
 </template>
@@ -64,7 +92,6 @@ provideWidgetTree(toRef(props, 'ast'), toRef(props, 'nodeId'), layoutTransitions
 <style scoped>
 .NodeWidgetTree {
   color: white;
-  margin-left: 4px;
 
   outline: none;
   height: 24px;
@@ -83,4 +110,13 @@ provideWidgetTree(toRef(props, 'ast'), toRef(props, 'nodeId'), layoutTransitions
 .GraphEditor.draggingEdge .NodeWidgetTree {
   transition: margin 0.2s ease;
 }
+
+.icon {
+  margin-right: 4px;
+}
+
+.grab-handle {
+  color: white;
+  margin: 0 4px;
+}
 </style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
index 86170bee1412..d9c4146dcff2 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
@@ -21,6 +21,11 @@ const showArgumentValue = computed(() => {
 
 const placeholder = computed(() => props.input instanceof ArgumentPlaceholder)
 const primary = computed(() => props.nesting < 2)
+
+const innerInput = computed(() => ({
+  ...props.input,
+  [ArgumentNameShownKey]: true,
+}))
 </script>
 
 <script lang="ts">
@@ -40,13 +45,15 @@ export const widgetDefinition = defineWidget(hasKnownArgumentName, {
     return isPlaceholder || isTopArg ? Score.Perfect : Score.Mismatch
   },
 })
+
+export const ArgumentNameShownKey: unique symbol = Symbol('ArgumentNameShownKey')
 </script>
 
 <template>
   <div class="WidgetArgumentName" :class="{ placeholder, primary }">
     <template v-if="showArgumentValue">
       <span class="name">{{ props.input[ArgumentInfoKey].info.name }}</span
-      ><NodeWidget :input="props.input" allowEmpty />
+      ><NodeWidget :input="innerInput" allowEmpty />
     </template>
     <template v-else>{{ props.input[ArgumentInfoKey].info.name }}</template>
   </div>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetCheckbox.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetCheckbox.vue
index 10b6b1be788f..9f9ba8126af4 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetCheckbox.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetCheckbox.vue
@@ -1,14 +1,16 @@
 <script setup lang="ts">
+import { ArgumentNameShownKey } from '@/components/GraphEditor/widgets/WidgetArgumentName.vue'
 import CheckboxWidget from '@/components/widgets/CheckboxWidget.vue'
 import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { useGraphStore } from '@/stores/graph'
 import { requiredImportsByFQN } from '@/stores/graph/imports'
-import { SuggestionDb, useSuggestionDbStore } from '@/stores/suggestionDatabase'
+import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
-import type { TokenId } from '@/util/ast/abstract.ts'
+import type { TokenId } from '@/util/ast/abstract'
+import { ArgumentInfoKey } from '@/util/callTree'
 import { asNot } from '@/util/data/types.ts'
-import { type Identifier, type QualifiedName } from '@/util/qualifiedName.ts'
+import { type Identifier, type QualifiedName } from '@/util/qualifiedName'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
@@ -55,6 +57,12 @@ const value = computed({
     }
   },
 })
+
+const primary = computed(() => props.nesting < 2)
+const argumentName = computed(() => {
+  if (ArgumentNameShownKey in props.input) return
+  return props.input[ArgumentInfoKey]?.info?.name
+})
 </script>
 
 <script lang="ts">
@@ -90,10 +98,29 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
 </script>
 
 <template>
-  <CheckboxWidget
-    v-model="value"
-    class="WidgetCheckbox"
-    contenteditable="false"
-    @beforeinput.stop
-  />
+  <div class="CheckboxContainer" :class="{ primary }">
+    <span v-if="argumentName" class="name" v-text="argumentName" />
+    <!-- See comment in GraphNode next to dragPointer definition about stopping pointerdown and pointerup -->
+    <CheckboxWidget
+      v-model="value"
+      class="WidgetCheckbox"
+      contenteditable="false"
+      @beforeinput.stop
+      @pointerdown.stop
+      @pointerup.stop
+    />
+  </div>
 </template>
+
+<style scoped>
+.CheckboxContainer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.name {
+  color: rgb(255 255 255 / 0.5);
+  margin-right: 8px;
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetHierarchy.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetHierarchy.vue
index 683df7bbeb2e..693912133534 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetHierarchy.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetHierarchy.vue
@@ -1,13 +1,26 @@
 <script setup lang="ts">
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
+import { injectWidgetTree } from '@/providers/widgetTree'
 import { Ast } from '@/util/ast'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
+const tree = injectWidgetTree()
 
 const spanClass = computed(() => props.input.value.typeName())
-const children = computed(() => [...props.input.value.children()])
+const children = computed(() => {
+  if (
+    props.input.value instanceof Ast.PropertyAccess &&
+    tree.connectedSelfArgumentId &&
+    props.input.value.lhs?.id === tree.connectedSelfArgumentId
+  ) {
+    // When a self argument is rendered as an icon, omit the property access operator.
+    return [props.input.value.lhs, props.input.value.rhs]
+  } else {
+    return [...props.input.value.children()]
+  }
+})
 
 function transformChild(child: Ast.Ast | Ast.Token) {
   const childInput = WidgetInput.FromAst(child)
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetNumber.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetNumber.vue
index c40c3c0f51a9..1885755d03dc 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetNumber.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetNumber.vue
@@ -52,7 +52,14 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
 </script>
 
 <template>
-  <NumericInputWidget v-model="value" class="WidgetNumber r-24" :limits="limits" />
+  <!-- See comment in GraphNode next to dragPointer definition about stopping pointerdown and pointerup -->
+  <NumericInputWidget
+    v-model="value"
+    class="WidgetNumber r-24"
+    :limits="limits"
+    @pointerdown.stop
+    @pointerup.stop
+  />
 </template>
 
 <style scoped>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
index 8220076671c9..4605658d37a9 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
@@ -10,7 +10,7 @@ import { injectWidgetTree } from '@/providers/widgetTree'
 import { PortViewInstance, useGraphStore } from '@/stores/graph'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
-import type { AstId, TokenId } from '@/util/ast/abstract'
+import type { TokenId } from '@/util/ast/abstract'
 import { ArgumentInfoKey } from '@/util/callTree'
 import { Rect } from '@/util/data/rect'
 import { asNot } from '@/util/data/types.ts'
@@ -39,13 +39,31 @@ const selection = injectGraphSelection(true)
 
 const isHovered = computed(() => selection?.hoveredPort === props.input.portId)
 
-const hasConnection = computed(
-  () => graph.db.connections.reverseLookup(portId.value as AstId).size > 0,
-)
+const hasConnection = computed(() => graph.isConnectedTarget(portId.value))
 const isCurrentEdgeHoverTarget = computed(
   () => isHovered.value && graph.unconnectedEdge != null && selection?.hoveredPort === portId.value,
 )
-const connected = computed(() => hasConnection.value || isCurrentEdgeHoverTarget.value)
+const isCurrentDisconectedEdgeTarget = computed(
+  () =>
+    graph.unconnectedEdge?.disconnectedEdgeTarget === portId.value &&
+    graph.unconnectedEdge?.target !== portId.value,
+)
+const isSelfArgument = computed(
+  () =>
+    props.input.value instanceof Ast.Ast && props.input.value.id === tree.connectedSelfArgumentId,
+)
+const isPotentialSelfArgument = computed(
+  () =>
+    props.input.value instanceof Ast.Ast && props.input.value.id === tree.potentialSelfArgumentId,
+)
+const connected = computed(
+  () => (!isSelfArgument.value && hasConnection.value) || isCurrentEdgeHoverTarget.value,
+)
+const isTarget = computed(
+  () =>
+    (hasConnection.value && !isCurrentDisconectedEdgeTarget.value) ||
+    isCurrentEdgeHoverTarget.value,
+)
 
 const rootNode = shallowRef<HTMLElement>()
 const nodeSize = useResizeObserver(rootNode, false)
@@ -145,6 +163,9 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
     class="WidgetPort"
     :class="{
       connected,
+      isTarget,
+      isSelfArgument,
+      isPotentialSelfArgument,
       'r-24': connected,
       newToConnect: !hasConnection && isCurrentEdgeHoverTarget,
       primary: props.nesting < 2,
@@ -213,4 +234,20 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
     right: 0px;
   }
 }
+
+.WidgetPort.isTarget:not(.isPotentialSelfArgument):after {
+  content: '';
+  position: absolute;
+  top: -4px;
+  left: 50%;
+  width: 4px;
+  height: 5px;
+  transform: translate(-50%, 0);
+  background-color: var(--node-color-port);
+  z-index: -1;
+}
+
+.isSelfArgument {
+  margin-right: 2px;
+}
 </style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetSelection.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetSelection.vue
index 01c9bfaed72c..7c60187801f0 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetSelection.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetSelection.vue
@@ -124,9 +124,9 @@ function toggleDropdownWidget() {
   showDropdownWidget.value = !showDropdownWidget.value
 }
 
-function onClick(index: number) {
+function onClick(index: number, keepOpen: boolean) {
   selectedIndex.value = index
-  showDropdownWidget.value = false
+  showDropdownWidget.value = keepOpen
 }
 
 // When the selected index changes, we update the expression content.
@@ -171,7 +171,8 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
 </script>
 
 <template>
-  <div class="WidgetSelection" @pointerdown.stop="toggleDropdownWidget">
+  <!-- See comment in GraphNode next to dragPointer definition about stopping pointerdown and pointerup -->
+  <div class="WidgetSelection" @pointerdown.stop @pointerup.stop @click.stop="toggleDropdownWidget">
     <NodeWidget ref="childWidgetRef" :input="innerWidgetInput" />
     <SvgIcon name="arrow_right_head_only" class="arrow" />
     <DropdownWidget
@@ -180,8 +181,7 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
       :color="'var(--node-color-primary)'"
       :values="tagLabels"
       :selectedValue="selectedLabel"
-      @pointerdown.stop
-      @click="onClick($event)"
+      @click="onClick"
     />
   </div>
 </template>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetSelfIcon.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetSelfIcon.vue
new file mode 100644
index 000000000000..721b2c01918d
--- /dev/null
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetSelfIcon.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import SvgIcon from '@/components/SvgIcon.vue'
+import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
+import { injectWidgetTree } from '@/providers/widgetTree'
+import { computed } from 'vue'
+
+const _props = defineProps(widgetProps(widgetDefinition))
+const tree = injectWidgetTree()
+
+const icon = computed(() => tree.icon)
+</script>
+
+<script lang="ts">
+export const widgetDefinition = defineWidget(WidgetInput.isAst, {
+  priority: 1,
+  score: (props, _db) =>
+    props.input.value.id === injectWidgetTree().connectedSelfArgumentId
+      ? Score.Perfect
+      : Score.Mismatch,
+})
+</script>
+
+<template>
+  <SvgIcon class="icon" :name="icon" @click.right.stop.prevent="tree.emitOpenFullMenu()" />
+</template>
+
+<style scoped>
+.icon {
+  margin: 0 4px;
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetText.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetText.vue
index 0a595be42cb5..c3f22a8eb174 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetText.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetText.vue
@@ -36,7 +36,8 @@ export const widgetDefinition = defineWidget(WidgetInput.isAstOrPlaceholder, {
 </script>
 
 <template>
-  <EnsoTextInputWidget v-model="value" class="WidgetText r-24" />
+  <!-- See comment in GraphNode next to dragPointer definition about stopping pointerdown -->
+  <EnsoTextInputWidget v-model="value" class="WidgetText r-24" @pointerdown.stop />
 </template>
 
 <style scoped>
diff --git a/app/gui2/src/components/NavBar.vue b/app/gui2/src/components/NavBar.vue
index 580745f6ce2e..0d44e6aac7d5 100644
--- a/app/gui2/src/components/NavBar.vue
+++ b/app/gui2/src/components/NavBar.vue
@@ -11,7 +11,7 @@ const emit = defineEmits<{ back: []; forward: []; breadcrumbClick: [index: numbe
 </script>
 
 <template>
-  <div class="NavBar">
+  <div class="NavBar" @pointerdown.stop @pointerup.stop @click.stop>
     <SvgIcon name="graph_editor" draggable="false" class="icon" />
     <div class="breadcrumbs-controls">
       <SvgIcon
@@ -19,14 +19,14 @@ const emit = defineEmits<{ back: []; forward: []; breadcrumbClick: [index: numbe
         draggable="false"
         class="icon button"
         :class="{ inactive: !props.allowNavigationLeft }"
-        @pointerdown="emit('back')"
+        @click.stop="emit('back')"
       />
       <SvgIcon
         name="arrow_right"
         draggable="false"
         class="icon button"
         :class="{ inactive: !props.allowNavigationRight }"
-        @pointerdown="emit('forward')"
+        @click.stop="emit('forward')"
       />
     </div>
     <NavBreadcrumbs :breadcrumbs="props.breadcrumbs" @selected="emit('breadcrumbClick', $event)" />
diff --git a/app/gui2/src/components/NavBreadcrumb.vue b/app/gui2/src/components/NavBreadcrumb.vue
index faf4e123fc85..69242ee16356 100644
--- a/app/gui2/src/components/NavBreadcrumb.vue
+++ b/app/gui2/src/components/NavBreadcrumb.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 const props = defineProps<{ text: string; active: boolean }>()
-const emit = defineEmits<{ click: [] }>()
 </script>
 
 <template>
   <div :class="['NavBreadcrumb', { inactive: !props.active }]">
-    <span @click="emit('click')" v-text="props.text"></span>
+    <span v-text="props.text"></span>
   </div>
 </template>
 
diff --git a/app/gui2/src/components/NavBreadcrumbs.vue b/app/gui2/src/components/NavBreadcrumbs.vue
index 22e0c7dee298..b522b5b4d1f1 100644
--- a/app/gui2/src/components/NavBreadcrumbs.vue
+++ b/app/gui2/src/components/NavBreadcrumbs.vue
@@ -23,7 +23,7 @@ const emit = defineEmits<{ selected: [index: number] }>()
       <NavBreadcrumb
         :text="breadcrumb.label"
         :active="breadcrumb.active"
-        @pointerdown="emit('selected', index)"
+        @click.stop="emit('selected', index)"
       />
     </template>
   </div>
diff --git a/app/gui2/src/components/ProjectTitle.vue b/app/gui2/src/components/ProjectTitle.vue
deleted file mode 100644
index 9be2ebad99ae..000000000000
--- a/app/gui2/src/components/ProjectTitle.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script setup lang="ts">
-import ExecutionModeSelector from '@/components/ExecutionModeSelector.vue'
-
-const props = defineProps<{ title: string; modes: string[]; mode: string }>()
-const emit = defineEmits<{ execute: []; 'update:mode': [mode: string] }>()
-</script>
-
-<template>
-  <div class="ProjectTitle">
-    <span class="title" v-text="props.title"></span>
-    <ExecutionModeSelector
-      :modes="props.modes"
-      :modelValue="props.mode"
-      @execute="emit('execute')"
-      @update:modelValue="emit('update:mode', $event)"
-    />
-  </div>
-</template>
-
-<style scoped>
-.ProjectTitle {
-  user-select: none;
-  display: flex;
-  align-items: center;
-  background: var(--color-frame-bg);
-  border-radius: var(--radius-full);
-  backdrop-filter: var(--blur-app-bg);
-  gap: 8px;
-  padding-left: 10px;
-  padding-right: 4px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-
-  > .title {
-    display: inline-block;
-    height: 24px;
-    padding: 1px 0px;
-  }
-}
-</style>
diff --git a/app/gui2/src/components/RecordControl.vue b/app/gui2/src/components/RecordControl.vue
new file mode 100644
index 000000000000..b8322bb8c4ee
--- /dev/null
+++ b/app/gui2/src/components/RecordControl.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import SvgIcon from '@/components/SvgIcon.vue'
+import ToggleIcon from '@/components/ToggleIcon.vue'
+
+const props = defineProps<{ recordMode: boolean }>()
+const emit = defineEmits<{ recordOnce: []; 'update:recordMode': [enabled: boolean] }>()
+</script>
+
+<template>
+  <div class="RecordControl" @pointerdown.stop @pointerup.stop @click.stop>
+    <div class="control left-end">
+      <ToggleIcon
+        icon="record"
+        class="button"
+        :alt="`${props.recordMode ? 'Enable' : 'Disable'} record mode`"
+        :modelValue="props.recordMode"
+        @update:modelValue="emit('update:recordMode', $event)"
+      />
+    </div>
+    <div class="control right-end">
+      <SvgIcon
+        alt="Record once"
+        class="button"
+        name="record_once"
+        draggable="false"
+        @click.stop="() => emit('recordOnce')"
+      />
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.RecordControl {
+  user-select: none;
+  display: flex;
+  place-items: center;
+  gap: 1px;
+}
+
+.control {
+  background: var(--color-frame-bg);
+  backdrop-filter: var(--blur-app-bg);
+  padding: 8px 8px;
+}
+
+.left-end {
+  border-radius: var(--radius-full) 0 0 var(--radius-full);
+}
+
+.right-end {
+  border-radius: 0 var(--radius-full) var(--radius-full) 0;
+}
+
+.toggledOn {
+  color: #ba4c40;
+}
+
+.button:active {
+  color: #ba4c40;
+}
+</style>
diff --git a/app/gui2/src/components/ToggleIcon.vue b/app/gui2/src/components/ToggleIcon.vue
index 5eae549b7fff..2cd0f410907a 100644
--- a/app/gui2/src/components/ToggleIcon.vue
+++ b/app/gui2/src/components/ToggleIcon.vue
@@ -22,6 +22,6 @@ const emit = defineEmits<{
   <SvgIcon
     :name="props.icon"
     :class="{ toggledOn: modelValue }"
-    @pointerdown.stop="emit('update:modelValue', !modelValue)"
+    @click.stop="emit('update:modelValue', !modelValue)"
   />
 </template>
diff --git a/app/gui2/src/components/TopBar.vue b/app/gui2/src/components/TopBar.vue
index 853028964a21..772f6dd090f0 100644
--- a/app/gui2/src/components/TopBar.vue
+++ b/app/gui2/src/components/TopBar.vue
@@ -1,24 +1,27 @@
 <script setup lang="ts">
+import ExtendedMenu from '@/components/ExtendedMenu.vue'
 import NavBar from '@/components/NavBar.vue'
 import type { BreadcrumbItem } from '@/components/NavBreadcrumbs.vue'
-import ProjectTitle from '@/components/ProjectTitle.vue'
+import RecordControl from '@/components/RecordControl.vue'
 import { injectGuiConfig } from '@/providers/guiConfig'
 import { computed } from 'vue'
 
 const props = defineProps<{
-  title: string
   breadcrumbs: BreadcrumbItem[]
-  modes: string[]
-  mode: string
+  recordMode: boolean
   allowNavigationLeft: boolean
   allowNavigationRight: boolean
+  zoomLevel: number
 }>()
 const emit = defineEmits<{
-  execute: []
+  recordOnce: []
   back: []
   forward: []
   breadcrumbClick: [index: number]
-  'update:mode': [mode: string]
+  'update:recordMode': [enabled: boolean]
+  fitToAllClicked: []
+  zoomIn: []
+  zoomOut: []
 }>()
 
 const LEFT_PADDING_PX = 11
@@ -35,12 +38,10 @@ const barStyle = computed(() => {
 
 <template>
   <div class="TopBar" :style="barStyle">
-    <ProjectTitle
-      :title="props.title"
-      :modes="props.modes"
-      :mode="props.mode"
-      @update:mode="emit('update:mode', $event)"
-      @execute="emit('execute')"
+    <RecordControl
+      :recordMode="props.recordMode"
+      @update:recordMode="emit('update:recordMode', $event)"
+      @recordOnce="emit('recordOnce')"
     />
     <NavBar
       :breadcrumbs="props.breadcrumbs"
@@ -50,6 +51,12 @@ const barStyle = computed(() => {
       @forward="emit('forward')"
       @breadcrumbClick="emit('breadcrumbClick', $event)"
     />
+    <ExtendedMenu
+      :zoomLevel="props.zoomLevel"
+      @fitToAllClicked="emit('fitToAllClicked')"
+      @zoomIn="emit('zoomIn')"
+      @zoomOut="emit('zoomOut')"
+    />
   </div>
 </template>
 
@@ -61,5 +68,6 @@ const barStyle = computed(() => {
   top: 9px;
   /* FIXME[sb]: Get correct offset from dashboard. */
   left: 9px;
+  width: 100%;
 }
 </style>
diff --git a/app/gui2/src/components/VisualizationContainer.vue b/app/gui2/src/components/VisualizationContainer.vue
index 1d8ba212d268..92d6618f13c8 100644
--- a/app/gui2/src/components/VisualizationContainer.vue
+++ b/app/gui2/src/components/VisualizationContainer.vue
@@ -105,6 +105,9 @@ const resizeBottomRight = usePointer((pos, _, type) => {
         '--color-visualization-bg': config.background,
         '--node-height': `${config.nodeSize.y}px`,
       }"
+      @pointerdown.stop
+      @pointerup.stop
+      @click.stop
     >
       <div class="resizer-right" v-on="resizeRight.stop.events"></div>
       <div class="resizer-bottom" v-on="resizeBottom.stop.events"></div>
@@ -132,22 +135,18 @@ const resizeBottomRight = usePointer((pos, _, type) => {
             invisible: config.isCircularMenuVisible,
             hidden: config.fullscreen,
           }"
+          @pointerdown.stop
+          @pointerup.stop
+          @click.stop
         >
-          <button
-            class="image-button active"
-            @pointerdown.stop="config.hide()"
-            @click="config.hide()"
-          >
+          <button class="image-button active" @click.stop="config.hide()">
             <SvgIcon class="icon" name="eye" alt="Hide visualization" />
           </button>
         </div>
         <div class="toolbar">
           <button
             class="image-button active"
-            @pointerdown.stop="(config.fullscreen = !config.fullscreen), blur($event)"
-            @click.prevent="
-              isTriggeredByKeyboard($event) && (config.fullscreen = !config.fullscreen)
-            "
+            @click.stop.prevent="(config.fullscreen = !config.fullscreen), blur($event)"
           >
             <SvgIcon
               class="icon"
@@ -158,9 +157,9 @@ const resizeBottomRight = usePointer((pos, _, type) => {
           <div class="icon-container">
             <button
               class="image-button active"
-              @pointerdown.stop="!isSelectorVisible && (isSelectorVisible = !isSelectorVisible)"
-              @click.prevent="
-                isTriggeredByKeyboard($event) && (isSelectorVisible = !isSelectorVisible)
+              @click.stop.prevent="
+                (!isSelectorVisible || isTriggeredByKeyboard($event)) &&
+                  (isSelectorVisible = !isSelectorVisible)
               "
             >
               <SvgIcon
diff --git a/app/gui2/src/components/VisualizationSelector.vue b/app/gui2/src/components/VisualizationSelector.vue
index b6539ba3cb93..7cc43f2825c4 100644
--- a/app/gui2/src/components/VisualizationSelector.vue
+++ b/app/gui2/src/components/VisualizationSelector.vue
@@ -40,6 +40,9 @@ onMounted(() => setTimeout(() => rootNode.value?.querySelector('button')?.focus(
     ref="rootNode"
     class="VisualizationSelector"
     @focusout="$event.relatedTarget == null && emit('hide')"
+    @pointerdown.stop
+    @pointerup.stop
+    @click.stop
   >
     <div class="background"></div>
     <ul>
@@ -47,7 +50,7 @@ onMounted(() => setTimeout(() => rootNode.value?.querySelector('button')?.focus(
         v-for="type_ in props.types"
         :key="visIdKey(type_)"
         :class="{ selected: visIdentifierEquals(props.modelValue, type_) }"
-        @pointerdown.stop="emit('update:modelValue', type_)"
+        @click.stop="emit('update:modelValue', type_)"
       >
         <button>
           <SvgIcon class="icon" :name="visualizationStore.icon(type_) ?? 'columns_increasing'" />
diff --git a/app/gui2/src/components/visualizations/GeoMapVisualization.vue b/app/gui2/src/components/visualizations/GeoMapVisualization.vue
index 5da10be5c678..bf5050bdeb71 100644
--- a/app/gui2/src/components/visualizations/GeoMapVisualization.vue
+++ b/app/gui2/src/components/visualizations/GeoMapVisualization.vue
@@ -336,7 +336,7 @@ function extractVisualizationDataFromFullConfig(parsedData: RegularData | Layer)
 function extractVisualizationDataFromDataFrame(parsedData: DataFrame) {
   const newPoints: Location[] = []
   for (let i = 0; i < parsedData.df_latitude.length; i += 1) {
-    const latitude = parsedData.df_longitude[i]!
+    const latitude = parsedData.df_latitude[i]!
     const longitude = parsedData.df_longitude[i]!
     const label = parsedData.df_label?.[i]
     const color = parsedData.df_color?.[i]
diff --git a/app/gui2/src/components/visualizations/SQLVisualization.vue b/app/gui2/src/components/visualizations/SQLVisualization.vue
index c0d7a6487b18..9a2f0c1a0016 100644
--- a/app/gui2/src/components/visualizations/SQLVisualization.vue
+++ b/app/gui2/src/components/visualizations/SQLVisualization.vue
@@ -2,7 +2,7 @@
 export const name = 'SQL Query'
 export const icon = 'braces'
 export const inputType =
-  'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
+  'Standard.Database.Data.DB_Table.DB_Table | Standard.Database.Data.DB_Column.DB_Column'
 export const defaultPreprocessor = [
   'Standard.Visualization.SQL.Visualization',
   'prepare_visualization',
diff --git a/app/gui2/src/components/visualizations/ScatterplotVisualization.vue b/app/gui2/src/components/visualizations/ScatterplotVisualization.vue
index 00e82cc3c8ac..c268a5a080c7 100644
--- a/app/gui2/src/components/visualizations/ScatterplotVisualization.vue
+++ b/app/gui2/src/components/visualizations/ScatterplotVisualization.vue
@@ -535,10 +535,10 @@ useEvent(document, 'keydown', bindings.handler({ zoomToSelected: () => zoomToSel
   <VisualizationContainer :belowToolbar="true">
     <template #toolbar>
       <button class="image-button active">
-        <SvgIcon name="show_all" alt="Fit all" @pointerdown="zoomToSelected(false)" />
+        <SvgIcon name="show_all" alt="Fit all" @click.stop="zoomToSelected(false)" />
       </button>
       <button class="image-button" :class="{ active: brushExtent != null }">
-        <SvgIcon name="find" alt="Zoom to selected" @pointerdown="zoomToSelected" />
+        <SvgIcon name="find" alt="Zoom to selected" @click.stop="zoomToSelected" />
       </button>
     </template>
     <div ref="containerNode" class="ScatterplotVisualization" @pointerdown.stop>
diff --git a/app/gui2/src/components/widgets/CheckboxWidget.vue b/app/gui2/src/components/widgets/CheckboxWidget.vue
index 3c617e281803..952b83cc4d78 100644
--- a/app/gui2/src/components/widgets/CheckboxWidget.vue
+++ b/app/gui2/src/components/widgets/CheckboxWidget.vue
@@ -4,17 +4,7 @@ const emit = defineEmits<{ 'update:modelValue': [modelValue: boolean] }>()
 </script>
 
 <template>
-  <div
-    class="Checkbox r-24"
-    @pointerdown="
-      !$event.ctrlKey &&
-        !$event.shiftKey &&
-        !$event.altKey &&
-        !$event.metaKey &&
-        $event.stopImmediatePropagation()
-    "
-    @click="emit('update:modelValue', !props.modelValue)"
-  >
+  <div class="Checkbox r-24" @click.stop="emit('update:modelValue', !props.modelValue)">
     <div :class="{ hidden: !props.modelValue }"></div>
   </div>
 </template>
diff --git a/app/gui2/src/components/widgets/DropdownWidget.vue b/app/gui2/src/components/widgets/DropdownWidget.vue
index 21dc4a14a6ff..e2be7d6b0444 100644
--- a/app/gui2/src/components/widgets/DropdownWidget.vue
+++ b/app/gui2/src/components/widgets/DropdownWidget.vue
@@ -10,7 +10,7 @@ enum SortDirection {
 }
 
 const props = defineProps<{ color: string; selectedValue: string | undefined; values: string[] }>()
-const emit = defineEmits<{ click: [index: number] }>()
+const emit = defineEmits<{ click: [index: number, keepOpen: boolean] }>()
 
 const sortDirection = ref<SortDirection>(SortDirection.none)
 
@@ -47,15 +47,15 @@ const NEXT_SORT_DIRECTION: Record<SortDirection, SortDirection> = {
 </script>
 
 <template>
-  <div class="Dropdown">
+  <div class="Dropdown" @pointerdown.stop @pointerup.stop @click.stop>
     <ul class="list" :style="{ background: color }" @wheel.stop>
       <template v-for="[value, index] in sortedValuesAndIndices" :key="value">
         <li v-if="value === selectedValue">
-          <div class="selected-item button" @pointerdown="emit('click', index)">
+          <div class="selected-item button" @click.stop="emit('click', index, $event.altKey)">
             <span v-text="value"></span>
           </div>
         </li>
-        <li v-else class="selectable-item button" @pointerdown="emit('click', index)">
+        <li v-else class="selectable-item button" @click.stop="emit('click', index, $event.altKey)">
           <span v-text="value"></span>
         </li>
       </template>
diff --git a/app/gui2/src/components/widgets/EnsoTextInputWidget.vue b/app/gui2/src/components/widgets/EnsoTextInputWidget.vue
index 3bbf8f330fd7..3dc9ea61a9f5 100644
--- a/app/gui2/src/components/widgets/EnsoTextInputWidget.vue
+++ b/app/gui2/src/components/widgets/EnsoTextInputWidget.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useResizeObserver } from '@/composables/events'
-import { escape, unescape } from '@/util/ast/abstract'
+import { escape, unescape } from '@/util/ast/text'
 import { blurIfNecessary } from '@/util/autoBlur'
 import { getTextWidthByFont } from '@/util/measurement'
 import { computed, ref, watch, type StyleValue } from 'vue'
diff --git a/app/gui2/src/components/widgets/ListWidget.vue b/app/gui2/src/components/widgets/ListWidget.vue
index eee82f9771df..92165f2c8d4a 100644
--- a/app/gui2/src/components/widgets/ListWidget.vue
+++ b/app/gui2/src/components/widgets/ListWidget.vue
@@ -404,14 +404,7 @@ watchPostEffect(() => {
       <SvgIcon
         class="add-item"
         name="vector_add"
-        @pointerdown="
-          !$event.ctrlKey &&
-            !$event.shiftKey &&
-            !$event.altKey &&
-            !$event.metaKey &&
-            $event.stopImmediatePropagation()
-        "
-        @click="emit('update:modelValue', [...props.modelValue, props.default()])"
+        @click.stop="emit('update:modelValue', [...props.modelValue, props.default()])"
       />
       <span class="token">]</span>
     </div>
diff --git a/app/gui2/src/composables/stackNavigator.ts b/app/gui2/src/composables/stackNavigator.ts
index dcfb306e4d5d..0c589f600f01 100644
--- a/app/gui2/src/composables/stackNavigator.ts
+++ b/app/gui2/src/composables/stackNavigator.ts
@@ -3,7 +3,7 @@ import { useGraphStore } from '@/stores/graph'
 import { useProjectStore } from '@/stores/project'
 import type { AstId } from '@/util/ast/abstract.ts'
 import { qnLastSegment, tryQualifiedName } from '@/util/qualifiedName'
-import type { StackItem } from 'shared/languageServerTypes.ts'
+import { methodPointerEquals, type StackItem } from 'shared/languageServerTypes'
 import { computed, onMounted, ref } from 'vue'
 
 export function useStackNavigator() {
@@ -15,7 +15,7 @@ export function useStackNavigator() {
   const breadcrumbLabels = computed(() => {
     const activeStackLength = projectStore.executionContext.desiredStack.length
     return breadcrumbs.value.map((item, index) => {
-      const label = stackItemToLabel(item)
+      const label = stackItemToLabel(item, index === 0)
       const isActive = index < activeStackLength
       return { label, active: isActive } satisfies BreadcrumbItem
     })
@@ -29,8 +29,17 @@ export function useStackNavigator() {
     return projectStore.executionContext.desiredStack.length < breadcrumbs.value.length
   })
 
-  function stackItemToLabel(item: StackItem): string {
-    return graphStore.db.stackItemToMethodName(item) ?? 'unknown'
+  function isProjectEntryPoint(item: StackItem) {
+    return (
+      item.type === 'ExplicitCall' &&
+      methodPointerEquals(item.methodPointer, projectStore.entryPoint)
+    )
+  }
+
+  function stackItemToLabel(item: StackItem, isStackRoot: boolean): string {
+    if (isStackRoot && isProjectEntryPoint(item)) return projectStore.displayName
+    const methodName = graphStore.db.stackItemToMethodName(item)
+    return methodName ?? 'unknown'
   }
 
   function handleBreadcrumbClick(index: number) {
diff --git a/app/gui2/src/providers/widgetTree.ts b/app/gui2/src/providers/widgetTree.ts
index b30ec645d7ed..fccae085a2dc 100644
--- a/app/gui2/src/providers/widgetTree.ts
+++ b/app/gui2/src/providers/widgetTree.ts
@@ -2,14 +2,32 @@ import { createContextStore } from '@/providers'
 import { useGraphStore } from '@/stores/graph'
 import { type NodeId } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
+import type { Icon } from '@/util/iconName'
 import { computed, proxyRefs, type Ref } from 'vue'
 
 export { injectFn as injectWidgetTree, provideFn as provideWidgetTree }
 const { provideFn, injectFn } = createContextStore(
   'Widget tree',
-  (astRoot: Ref<Ast.Ast>, nodeId: Ref<NodeId>, hasActiveAnimations: Ref<boolean>) => {
+  (
+    astRoot: Ref<Ast.Ast>,
+    nodeId: Ref<NodeId>,
+    icon: Ref<Icon>,
+    connectedSelfArgumentId: Ref<Ast.AstId | undefined>,
+    potentialSelfArgumentId: Ref<Ast.AstId | undefined>,
+    hasActiveAnimations: Ref<boolean>,
+    emitOpenFullMenu: () => void,
+  ) => {
     const graph = useGraphStore()
     const nodeSpanStart = computed(() => graph.moduleSource.getSpan(astRoot.value.id)![0])
-    return proxyRefs({ astRoot, nodeId, nodeSpanStart, hasActiveAnimations })
+    return proxyRefs({
+      astRoot,
+      nodeId,
+      icon,
+      connectedSelfArgumentId,
+      potentialSelfArgumentId,
+      nodeSpanStart,
+      hasActiveAnimations,
+      emitOpenFullMenu,
+    })
   },
 )
diff --git a/app/gui2/src/stores/graph/graphDatabase.ts b/app/gui2/src/stores/graph/graphDatabase.ts
index 53060453346d..e060cd0a2de5 100644
--- a/app/gui2/src/stores/graph/graphDatabase.ts
+++ b/app/gui2/src/stores/graph/graphDatabase.ts
@@ -6,7 +6,7 @@ import { Ast, RawAst } from '@/util/ast'
 import type { AstId, NodeMetadata } from '@/util/ast/abstract'
 import { subtrees } from '@/util/ast/abstract'
 import { AliasAnalyzer } from '@/util/ast/aliasAnalysis'
-import { nodeFromAst } from '@/util/ast/node'
+import { nodeFromAst, primaryApplicationSubject } from '@/util/ast/node'
 import { colorFromString } from '@/util/colors'
 import { MappedKeyMap, MappedSet } from '@/util/containers'
 import { arrayEquals, tryGetIndex } from '@/util/data/array'
@@ -140,13 +140,13 @@ export class GraphDb {
 
   private nodeIdToPatternExprIds = new ReactiveIndex(this.nodeIdToNode, (id, entry) => {
     const exprs: AstId[] = []
-    if (entry.pattern) entry.pattern.visitRecursiveAst((ast) => exprs.push(ast.id))
+    if (entry.pattern) entry.pattern.visitRecursiveAst((ast) => void exprs.push(ast.id))
     return Array.from(exprs, (expr) => [id, expr])
   })
 
   private nodeIdToExprIds = new ReactiveIndex(this.nodeIdToNode, (id, entry) => {
     const exprs: AstId[] = []
-    entry.rootSpan.visitRecursiveAst((ast) => exprs.push(ast.id))
+    entry.rootSpan.visitRecursiveAst((ast) => void exprs.push(ast.id))
     return Array.from(exprs, (expr) => [id, expr])
   })
 
@@ -325,6 +325,10 @@ export class GraphDb {
     }
   }
 
+  /**
+   * Note that the `dirtyNodes` are visited and updated in the order that they appear in the module AST, irrespective of
+   * the iteration order of the `dirtyNodes` set.
+   **/
   readFunctionAst(
     functionAst_: Ast.Function,
     rawFunction: RawAst.Tree.Function,
@@ -333,6 +337,8 @@ export class GraphDb {
     dirtyNodes: Set<AstId>,
   ) {
     const functionChanged = functionAst_.id !== this.currentFunction
+    // Note: `subtrees` returns a set that has the iteration order of all `Ast.ID`s in the order they appear in the
+    // module AST. This is important to ensure that nodes are updated in the correct order.
     const knownDirtySubtrees = functionChanged ? null : subtrees(functionAst_.module, dirtyNodes)
     const subtreeDirty = (id: AstId) => !knownDirtySubtrees || knownDirtySubtrees.has(id)
     this.currentFunction = functionAst_.id
@@ -358,7 +364,11 @@ export class GraphDb {
           a?.id !== b?.id || (a && subtreeDirty(a.id))
         if (differentOrDirty(node.pattern, newNode.pattern)) node.pattern = newNode.pattern
         if (node.outerExprId !== newNode.outerExprId) node.outerExprId = newNode.outerExprId
-        if (differentOrDirty(node.rootSpan, newNode.rootSpan)) node.rootSpan = newNode.rootSpan
+        if (differentOrDirty(node.rootSpan, newNode.rootSpan)) {
+          node.rootSpan = newNode.rootSpan
+          const primarySubject = primaryApplicationSubject(newNode.rootSpan)
+          if (node.primarySubject !== primarySubject) node.primarySubject = primarySubject
+        }
       }
     }
     for (const nodeId of this.nodeIdToNode.keys()) {
@@ -426,11 +436,10 @@ export class GraphDb {
   mockNode(binding: string, id: Ast.AstId, code?: string): Node {
     const pattern = Ast.parse(binding)
     const node: Node = {
+      ...baseMockNode,
       outerExprId: id,
       pattern,
       rootSpan: Ast.parse(code ?? '0'),
-      position: Vec2.Zero,
-      vis: undefined,
     }
     const bindingId = pattern.id
     this.nodeIdToNode.set(asNodeId(id), node)
@@ -451,17 +460,24 @@ export interface Node {
   rootSpan: Ast.Ast
   position: Vec2
   vis: Opt<VisualizationMetadata>
+  /** A child AST in a syntactic position to be a self-argument input to the node. */
+  primarySubject: Ast.AstId | undefined
+}
+
+const baseMockNode = {
+  position: Vec2.Zero,
+  vis: undefined,
+  primarySubject: undefined,
 }
 
 /** This should only be used for supplying as initial props when testing.
  * Please do {@link GraphDb.mockNode} with a `useGraphStore().db` after mount. */
 export function mockNode(exprId?: Ast.AstId): Node {
   return {
+    ...baseMockNode,
     outerExprId: exprId ?? (random.uuidv4() as Ast.AstId),
     pattern: undefined,
     rootSpan: Ast.parse('0'),
-    position: Vec2.Zero,
-    vis: undefined,
   }
 }
 
diff --git a/app/gui2/src/stores/graph/imports.ts b/app/gui2/src/stores/graph/imports.ts
index c65c56465598..b1f333021b66 100644
--- a/app/gui2/src/stores/graph/imports.ts
+++ b/app/gui2/src/stores/graph/imports.ts
@@ -455,7 +455,7 @@ if (import.meta.vitest) {
     const db = new SuggestionDb()
     const reexportedModule = makeModule('Standard.AWS.Connections')
     reexportedModule.reexportedIn = unwrap(tryQualifiedName('Standard.Base'))
-    const reexportedType = makeModule('Standard.Database.Table.Table')
+    const reexportedType = makeModule('Standard.Database.DB_Table.DB_Table')
     reexportedType.reexportedIn = unwrap(tryQualifiedName('Standard.Base'))
     const extensionMethod = makeMethod('Standard.Network.URI.fetch')
     extensionMethod.definedIn = unwrap(tryQualifiedName('Standard.Base'))
@@ -508,7 +508,7 @@ if (import.meta.vitest) {
         {
           kind: 'Unqualified',
           from: unwrap(tryQualifiedName('Standard.Base')),
-          import: unwrap(tryIdentifier('Table')),
+          import: unwrap(tryIdentifier('DB_Table')),
         },
       ],
     },
diff --git a/app/gui2/src/stores/graph/index.ts b/app/gui2/src/stores/graph/index.ts
index d84a8b5a0200..023f19b53186 100644
--- a/app/gui2/src/stores/graph/index.ts
+++ b/app/gui2/src/stores/graph/index.ts
@@ -29,15 +29,14 @@ import { iteratorFilter } from 'lib0/iterator'
 import { defineStore } from 'pinia'
 import { SourceDocument } from 'shared/ast/sourceDocument'
 import type { ExpressionUpdate, StackItem } from 'shared/languageServerTypes'
-import {
-  sourceRangeKey,
-  visMetadataEquals,
-  type SourceRangeKey,
-  type VisualizationIdentifier,
-  type VisualizationMetadata,
+import type {
+  LocalOrigin,
+  SourceRangeKey,
+  VisualizationIdentifier,
+  VisualizationMetadata,
 } from 'shared/yjsModel'
+import { defaultLocalOrigin, sourceRangeKey, visMetadataEquals } from 'shared/yjsModel'
 import { computed, markRaw, reactive, ref, toRef, watch, type ShallowRef } from 'vue'
-import * as Y from 'yjs'
 
 export { type Node, type NodeId } from '@/stores/graph/graphDatabase'
 
@@ -112,7 +111,7 @@ export const useGraphStore = defineStore('graph', () => {
       id: AstId
       changes: NodeMetadata
     }[]
-    const dirtyNodeSet = new Set(update.fieldsUpdated.map(({ id }) => id))
+    const dirtyNodeSet = new Set(update.nodesUpdated)
     if (moduleChanged || dirtyNodeSet.size !== 0) {
       db.updateExternalIds(root)
       toRaw = new Map()
@@ -186,18 +185,30 @@ export const useGraphStore = defineStore('graph', () => {
     return edges
   })
 
+  const connectedEdges = computed(() => {
+    return edges.value.filter<ConnectedEdge>(isConnected)
+  })
+
   function createEdgeFromOutput(source: Ast.AstId) {
-    unconnectedEdge.value = { source }
+    unconnectedEdge.value = { source, target: undefined }
   }
 
   function disconnectSource(edge: Edge) {
     if (!edge.target) return
-    unconnectedEdge.value = { target: edge.target, disconnectedEdgeTarget: edge.target }
+    unconnectedEdge.value = {
+      source: undefined,
+      target: edge.target,
+      disconnectedEdgeTarget: edge.target,
+    }
   }
 
   function disconnectTarget(edge: Edge) {
     if (!edge.source || !edge.target) return
-    unconnectedEdge.value = { source: edge.source, disconnectedEdgeTarget: edge.target }
+    unconnectedEdge.value = {
+      source: edge.source,
+      target: undefined,
+      disconnectedEdgeTarget: edge.target,
+    }
   }
 
   function clearUnconnected() {
@@ -210,15 +221,12 @@ export const useGraphStore = defineStore('graph', () => {
     metadata: NodeMetadataFields = {},
     withImports: RequiredImport[] | undefined = undefined,
   ): Opt<NodeId> {
-    const mod = proj.module
-    if (!mod) return
-    const ident = generateUniqueIdent()
-    const currentFunc = 'main'
-    const method = Ast.findModuleMethod(topLevel.value!, currentFunc)
+    const method = syncModule.value ? methodAstInModule(syncModule.value) : undefined
     if (!method) {
       console.error(`BUG: Cannot add node: No current function.`)
       return
     }
+    const ident = generateUniqueIdent()
     metadata.position = { x: position.x, y: position.y }
     return edit((edit) => {
       if (withImports) addMissingImports(edit, withImports)
@@ -249,7 +257,7 @@ export const useGraphStore = defineStore('graph', () => {
         for (const id of ids) {
           const node = db.nodeIdToNode.get(id)
           if (!node) continue
-          const outerExpr = edit.get(node.outerExprId)
+          const outerExpr = edit.tryGet(node.outerExprId)
           if (outerExpr) Ast.deleteFromParentBlock(outerExpr)
           nodeRects.delete(id)
         }
@@ -263,12 +271,12 @@ export const useGraphStore = defineStore('graph', () => {
     const node = db.nodeIdToNode.get(id)
     if (!node) return
     edit((edit) => {
-      edit.getVersion(node.rootSpan).replaceValue(Ast.parse(content, edit))
+      edit.getVersion(node.rootSpan).syncToCode(content)
     })
   }
 
   function transact(fn: () => void) {
-    return proj.module?.transact(fn)
+    syncModule.value!.transact(fn)
   }
 
   function stopCapturingUndo() {
@@ -276,7 +284,7 @@ export const useGraphStore = defineStore('graph', () => {
   }
 
   function setNodePosition(nodeId: NodeId, position: Vec2) {
-    const nodeAst = syncModule.value?.get(nodeId)
+    const nodeAst = syncModule.value?.tryGet(nodeId)
     if (!nodeAst) return
     const oldPos = nodeAst.nodeMetadata.get('position')
     if (oldPos?.x !== position.x || oldPos?.y !== position.y) {
@@ -296,7 +304,7 @@ export const useGraphStore = defineStore('graph', () => {
   }
 
   function setNodeVisualizationId(nodeId: NodeId, vis: Opt<VisualizationIdentifier>) {
-    const nodeAst = syncModule.value?.get(nodeId)
+    const nodeAst = syncModule.value?.tryGet(nodeId)
     if (!nodeAst) return
     editNodeMetadata(nodeAst, (metadata) =>
       metadata.set(
@@ -307,7 +315,7 @@ export const useGraphStore = defineStore('graph', () => {
   }
 
   function setNodeVisualizationVisible(nodeId: NodeId, visible: boolean) {
-    const nodeAst = syncModule.value?.get(nodeId)
+    const nodeAst = syncModule.value?.tryGet(nodeId)
     if (!nodeAst) return
     editNodeMetadata(nodeAst, (metadata) =>
       metadata.set(
@@ -318,7 +326,7 @@ export const useGraphStore = defineStore('graph', () => {
   }
 
   function updateNodeRect(nodeId: NodeId, rect: Rect) {
-    const nodeAst = syncModule.value?.get(nodeId)
+    const nodeAst = syncModule.value?.tryGet(nodeId)
     if (!nodeAst) return
     if (rect.pos.equals(Vec2.Zero) && !nodeAst.nodeMetadata.get('position')) {
       const { position } = nonDictatedPlacement(rect.size, {
@@ -410,16 +418,18 @@ export const useGraphStore = defineStore('graph', () => {
    *  @param skipTreeRepair - If the edit is known not to require any parenthesis insertion, this may be set to `true`
    *  for better performance.
    */
-  function commitEdit(edit: MutableModule, skipTreeRepair?: boolean) {
+  function commitEdit(
+    edit: MutableModule,
+    skipTreeRepair?: boolean,
+    origin: LocalOrigin = defaultLocalOrigin,
+  ) {
     const root = edit.root()
     if (!(root instanceof Ast.BodyBlock)) {
       console.error(`BUG: Cannot commit edit: No module root block.`)
       return
     }
-    const module_ = proj.module
-    if (!module_) return
     if (!skipTreeRepair) Ast.repair(root, edit)
-    Y.applyUpdateV2(syncModule.value!.ydoc, Y.encodeStateAsUpdateV2(edit.ydoc), 'local')
+    syncModule.value!.applyEdit(edit, origin)
   }
 
   /** Edit the AST module.
@@ -435,16 +445,15 @@ export const useGraphStore = defineStore('graph', () => {
     const edit = direct ? syncModule.value : syncModule.value?.edit()
     assert(edit != null)
     let result
-    edit.ydoc.transact(() => {
+    edit.transact(() => {
       result = f(edit)
       if (!skipTreeRepair) {
         const root = edit.root()
         assert(root instanceof Ast.BodyBlock)
         Ast.repair(root, edit)
       }
-    }, 'local')
-    if (!direct)
-      Y.applyUpdateV2(syncModule.value!.ydoc, Y.encodeStateAsUpdateV2(edit.ydoc), 'local')
+      if (!direct) syncModule.value!.applyEdit(edit)
+    })
     return result!
   }
 
@@ -452,6 +461,10 @@ export const useGraphStore = defineStore('graph', () => {
     edit((edit) => f(edit.getVersion(ast).mutableNodeMetadata()), true, true)
   }
 
+  function viewModule(): Module {
+    return syncModule.value!
+  }
+
   function mockExpressionUpdate(
     locator: string | { binding: string; expr: string },
     update: Partial<ExpressionUpdate>,
@@ -538,6 +551,10 @@ export const useGraphStore = defineStore('graph', () => {
     }
   }
 
+  function isConnectedTarget(portId: PortId): boolean {
+    return db.connections.reverseLookup(portId as AstId).size > 0
+  }
+
   return {
     transact,
     db: markRaw(db),
@@ -545,6 +562,7 @@ export const useGraphStore = defineStore('graph', () => {
     editedNodeInfo,
     unconnectedEdge,
     edges,
+    connectedEdges,
     moduleSource,
     nodeRects,
     vizRects,
@@ -577,7 +595,9 @@ export const useGraphStore = defineStore('graph', () => {
     startEdit,
     commitEdit,
     edit,
+    viewModule,
     addMissingImports,
+    isConnectedTarget,
   }
 })
 
@@ -588,14 +608,21 @@ function randomIdent() {
 }
 
 /** An edge, which may be connected or unconnected. */
-export type Edge = {
+export interface Edge {
   source: AstId | undefined
   target: PortId | undefined
 }
 
-export type UnconnectedEdge = {
-  source?: AstId
-  target?: PortId
+export interface ConnectedEdge extends Edge {
+  source: AstId
+  target: PortId
+}
+
+export function isConnected(edge: Edge): edge is ConnectedEdge {
+  return edge.source != null && edge.target != null
+}
+
+interface UnconnectedEdge extends Edge {
   /** If this edge represents an in-progress edit of a connected edge, it is identified by its target expression. */
   disconnectedEdgeTarget?: PortId
 }
diff --git a/app/gui2/src/stores/project/index.ts b/app/gui2/src/stores/project/index.ts
index c71b7da60cdd..65476ae89392 100644
--- a/app/gui2/src/stores/project/index.ts
+++ b/app/gui2/src/stores/project/index.ts
@@ -32,10 +32,11 @@ import type {
   ExplicitCall,
   ExpressionId,
   ExpressionUpdate,
+  MethodPointer,
   StackItem,
   VisualizationConfiguration,
 } from 'shared/languageServerTypes'
-import { DistributedProject, type ExternalId, type Uuid } from 'shared/yjsModel'
+import { DistributedProject, localOrigins, type ExternalId, type Uuid } from 'shared/yjsModel'
 import {
   computed,
   markRaw,
@@ -544,16 +545,19 @@ export const useProjectStore = defineStore('project', () => {
     const moduleName = projectModel.findModuleByDocId(guid)
     if (moduleName == null) return null
     const mod = await projectModel.openModule(moduleName)
-    mod?.undoManager.addTrackedOrigin('local')
+    for (const origin of localOrigins) mod?.undoManager.addTrackedOrigin(origin)
     return mod
   })
 
-  function createExecutionContextForMain(): ExecutionContext {
+  const entryPoint = computed<MethodPointer>(() => {
     const projectName = fullName.value
     const mainModule = `${projectName}.Main`
-    const entryPoint = { module: mainModule, definedOnType: mainModule, name: 'main' }
+    return { module: mainModule, definedOnType: mainModule, name: 'main' }
+  })
+
+  function createExecutionContextForMain(): ExecutionContext {
     return new ExecutionContext(lsRpcConnection, {
-      methodPointer: entryPoint,
+      methodPointer: entryPoint.value,
       positionalArgumentsExpressions: [],
     })
   }
@@ -573,7 +577,7 @@ export const useProjectStore = defineStore('project', () => {
   const visualizationDataRegistry = new VisualizationDataRegistry(executionContext, dataConnection)
   const computedValueRegistry = ComputedValueRegistry.WithExecutionContext(executionContext)
 
-  const diagnostics = ref<Diagnostic[]>([])
+  const diagnostics = shallowRef<Diagnostic[]>([])
   executionContext.on('executionStatus', (newDiagnostics) => {
     diagnostics.value = newDiagnostics
   })
@@ -589,7 +593,9 @@ export const useProjectStore = defineStore('project', () => {
         executionContext.setVisualization(id, config)
         onCleanup(() => executionContext.setVisualization(id, null))
       },
-      { immediate: true },
+      // Make sure to flush this watch in 'post', otherwise it might cause operations on stale
+      // ASTs just before the widget tree renders and cleans up the associated widget instances.
+      { immediate: true, flush: 'post' },
     )
 
     return shallowRef(
@@ -679,6 +685,15 @@ export const useProjectStore = defineStore('project', () => {
     yDocsProvider = undefined
   }
 
+  const recordMode = computed({
+    get() {
+      return executionMode.value === 'live'
+    },
+    set(value) {
+      executionMode.value = value ? 'live' : 'design'
+    },
+  })
+
   return {
     setObservedFileName(name: string) {
       observedFileName.value = name
@@ -691,6 +706,7 @@ export const useProjectStore = defineStore('project', () => {
     diagnostics,
     module,
     modulePath,
+    entryPoint,
     projectModel,
     contentRoots,
     awareness: markRaw(awareness),
@@ -701,6 +717,7 @@ export const useProjectStore = defineStore('project', () => {
     isOutputContextEnabled,
     stopCapturingUndo,
     executionMode,
+    recordMode,
     dataflowErrors,
     executeExpression,
     disposeYDocsProvider,
diff --git a/app/gui2/src/util/ast/__tests__/abstract.test.ts b/app/gui2/src/util/ast/__tests__/abstract.test.ts
index 7eaec91867bc..72b0b44d9d5f 100644
--- a/app/gui2/src/util/ast/__tests__/abstract.test.ts
+++ b/app/gui2/src/util/ast/__tests__/abstract.test.ts
@@ -2,10 +2,20 @@ import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
-import { MutableModule, escape, unescape, type Identifier } from '../abstract'
+import { MutableModule, type Identifier } from '../abstract'
+import { escape, unescape } from '../text'
+import { findExpressions, testCase, tryFindExpressions } from './testCase'
 
 await initializeFFI()
 
+test('Raw block abstracts to Ast.BodyBlock', () => {
+  const code = 'value = 2 + 2'
+  const rawBlock = Ast.parseEnso(code)
+  const edit = MutableModule.Transient()
+  const abstracted = Ast.abstract(edit, rawBlock, code)
+  expect(abstracted.root).toBeInstanceOf(Ast.BodyBlock)
+})
+
 //const disabledCases = [
 //  ' a',
 //  'a ',
@@ -432,10 +442,10 @@ test('Replace subexpression', () => {
   const newValue = Ast.TextLiteral.new('bar', edit)
   expect(newValue.code()).toBe("'bar'")
   edit.replace(assignment.expression!.id, newValue)
-  const assignment_ = edit.get(assignment.id)!
+  const assignment_ = edit.tryGet(assignment.id)!
   assert(assignment_ instanceof Ast.Assignment)
   expect(assignment_.expression!.id).toBe(newValue.id)
-  expect(edit.get(assignment_.expression!.id)?.code()).toBe("'bar'")
+  expect(edit.tryGet(assignment_.expression!.id)?.code()).toBe("'bar'")
   const printed = edit.getVersion(root).code()
   expect(printed).toEqual("main =\n    text1 = 'bar'\n")
 })
@@ -492,27 +502,10 @@ test('Construct app', () => {
   const namedApp = Ast.App.new(
     edit,
     Ast.Ident.new(edit, 'func' as Identifier),
-    'argName' as Identifier,
+    'name' as Identifier,
     Ast.Ident.new(edit, 'arg' as Identifier),
   )
-  expect(namedApp.code()).toBe('func argName=arg')
-})
-
-test.each([
-  ['Hello, World!', 'Hello, World!'],
-  ['Hello\t\tWorld!', 'Hello\\t\\tWorld!'],
-  ['He\nllo, W\rorld!', 'He\\nllo, W\\rorld!'],
-  ['Hello,\vWorld!', 'Hello,\\vWorld!'],
-  ['Hello, \\World!', 'Hello, \\World!'],
-  ['Hello, `World!`', 'Hello, ``World!``'],
-  ["'Hello, World!'", "\\'Hello, World!\\'"],
-  ['"Hello, World!"', '\\"Hello, World!\\"'],
-  ['Hello, \fWorld!', 'Hello, \\fWorld!'],
-  ['Hello, \bWorld!', 'Hello, \\bWorld!'],
-])('Text literals escaping and unescaping', (original, expectedEscaped) => {
-  const escaped = escape(original)
-  expect(escaped).toBe(expectedEscaped)
-  expect(unescape(escaped)).toBe(original)
+  expect(namedApp.code()).toBe('func name=arg')
 })
 
 test('Automatic parenthesis', () => {
@@ -534,34 +527,248 @@ test('Automatic parenthesis', () => {
   expect(block.code()).toBe(correctCode)
 })
 
-test('Resync', () => {
-  const root = Ast.parseBlock('main = func arg1 arg2')
-  const module = root.module
-  module.replaceRoot(root)
-  const arg1 = 'arg1' as Identifier
-  const func = Ast.Function.fromStatements(
-    module,
-    'func' as Identifier,
-    [arg1],
-    [Ast.Ident.new(module, arg1)],
-  )
+test('Tree repair: Non-canonical block line attribution', () => {
+  const beforeCase = testCase({
+    'func a b =': Ast.Function,
+    '    c = a + b': Ast.Assignment,
+    'main =': Ast.Function,
+    '    func arg1 arg2': Ast.App,
+  })
+  const before = beforeCase.statements
+
+  const edit = beforeCase.module.edit()
   // Add a trailing line to the function's block. This is syntactically non-canonical; it should belong to the parent.
-  func.bodyAsBlock().insert(1, undefined)
-  expect(func.bodyAsBlock().lines.length).toBe(2)
-  root.insert(0, func)
-  const codeBeforeRepair = root.code()
-  const rootExternalIdBeforeRepair = root.externalId
-  const funcExternalIdBeforeRepair = func.externalId
-  Ast.repair(root, module)
-  const repairedRoot = module.root()
-  assert(repairedRoot instanceof Ast.BodyBlock)
-  const repairedFunc = repairedRoot.statements().next().value
-  assert(repairedFunc instanceof Ast.Function)
+  edit.getVersion(before['func a b =']).bodyAsBlock().insert(1, undefined)
+  const editedRoot = edit.root()
+  assert(editedRoot instanceof Ast.BodyBlock)
+  const editedCode = editedRoot.code()
+  expect(editedCode).toContain('\n\n')
+
+  const repair = edit.edit()
+  Ast.repair(editedRoot, repair)
+  const afterRepair = findExpressions(repair.root()!, {
+    'func a b =': Ast.Function,
+    'c = a + b': Ast.Assignment,
+    'main =': Ast.Function,
+    'func arg1 arg2': Ast.App,
+  })
+  const repairedFunc = afterRepair['func a b =']
   assert(repairedFunc.body instanceof Ast.BodyBlock)
   // The function's body has been corrected.
   expect(repairedFunc.body.lines.length).toBe(1)
-  expect(repairedRoot.code()).toBe(codeBeforeRepair)
-  expect(repairedRoot.externalId).toBe(rootExternalIdBeforeRepair)
-  // The resync operation loses metadata within the non-canonical subtree.
-  expect(repairedFunc.body?.externalId).not.toBe(funcExternalIdBeforeRepair)
+  expect(repair.root()?.code()).toBe(editedCode)
+  // The repair maintains identities in all nodes.
+  expect(afterRepair['c = a + b'].id).toBe(before['    c = a + b'].id)
+  expect(afterRepair['func arg1 arg2'].id).toBe(before['    func arg1 arg2'].id)
+  // The repair maintains identities of other functions.
+  expect(afterRepair['main ='].id).toBe(before['main ='].id)
+})
+
+test('Code edit: Change argument type', () => {
+  const beforeRoot = Ast.parse('func arg1 arg2')
+  beforeRoot.module.replaceRoot(beforeRoot)
+  const before = findExpressions(beforeRoot, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func arg1': Ast.App,
+    'func arg1 arg2': Ast.App,
+  })
+  const edit = beforeRoot.module.edit()
+  const newCode = 'func 123 arg2'
+  edit.getVersion(beforeRoot).syncToCode(newCode)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe(newCode)
+  // Ensure the identities of all the original nodes were maintained.
+  const after = findExpressions(edit.root()!, {
+    func: Ast.Ident,
+    '123': Ast.NumericLiteral,
+    arg2: Ast.Ident,
+    'func 123': Ast.App,
+    'func 123 arg2': Ast.App,
+  })
+  expect(after.func.id).toBe(before.func.id)
+  expect(after.arg2.id).toBe(before.arg2.id)
+  expect(after['func 123'].id).toBe(before['func arg1'].id)
+  expect(after['func 123 arg2'].id).toBe(before['func arg1 arg2'].id)
+})
+
+test('Code edit: Insert argument names', () => {
+  const beforeRoot = Ast.parse('func arg1 arg2')
+  beforeRoot.module.replaceRoot(beforeRoot)
+  const before = findExpressions(beforeRoot, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func arg1': Ast.App,
+    'func arg1 arg2': Ast.App,
+  })
+  const edit = beforeRoot.module.edit()
+  const newCode = 'func name1=arg1 name2=arg2'
+  edit.getVersion(beforeRoot).syncToCode(newCode)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe(newCode)
+  // Ensure the identities of all the original nodes were maintained.
+  const after = findExpressions(edit.root()!, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func name1=arg1': Ast.App,
+    'func name1=arg1 name2=arg2': Ast.App,
+  })
+  expect(after.func.id).toBe(before.func.id)
+  expect(after.arg1.id).toBe(before.arg1.id)
+  expect(after.arg2.id).toBe(before.arg2.id)
+  expect(after['func name1=arg1'].id).toBe(before['func arg1'].id)
+  expect(after['func name1=arg1 name2=arg2'].id).toBe(before['func arg1 arg2'].id)
+})
+
+test('Code edit: Remove argument names', () => {
+  const beforeRoot = Ast.parse('func name1=arg1 name2=arg2')
+  beforeRoot.module.replaceRoot(beforeRoot)
+  const before = findExpressions(beforeRoot, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func name1=arg1': Ast.App,
+    'func name1=arg1 name2=arg2': Ast.App,
+  })
+  const edit = beforeRoot.module.edit()
+  const newCode = 'func arg1 arg2'
+  edit.getVersion(beforeRoot).syncToCode(newCode)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe(newCode)
+  // Ensure the identities of all the original nodes were maintained.
+  const after = findExpressions(edit.root()!, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func arg1': Ast.App,
+    'func arg1 arg2': Ast.App,
+  })
+  expect(after.func.id).toBe(before.func.id)
+  expect(after.arg1.id).toBe(before.arg1.id)
+  expect(after.arg2.id).toBe(before.arg2.id)
+  expect(after['func arg1'].id).toBe(before['func name1=arg1'].id)
+  expect(after['func arg1 arg2'].id).toBe(before['func name1=arg1 name2=arg2'].id)
+})
+
+test('Code edit: Rearrange block', () => {
+  const beforeCase = testCase({
+    'main =': Ast.Function,
+    '    call_result = func sum 12': Ast.Assignment,
+    '    sum = value + 23': Ast.Assignment,
+    '    value = 42': Ast.Assignment,
+  })
+  const before = beforeCase.statements
+
+  const edit = beforeCase.module.edit()
+  const newCode = [
+    'main =',
+    '\n    value = 42',
+    '\n    sum = value + 23',
+    '\n    call_result = func sum 12',
+  ].join('')
+  edit.root()!.syncToCode(newCode)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe(newCode)
+  // Ensure the identities of all the original nodes were maintained.
+  const after = tryFindExpressions(edit.root()!, {
+    'main =': Ast.Function,
+    'call_result = func sum 12': Ast.Assignment,
+    'sum = value + 23': Ast.Assignment,
+    'value = 42': Ast.Assignment,
+  })
+  expect(after['call_result = func sum 12']?.id).toBe(before['    call_result = func sum 12'].id)
+  expect(after['sum = value + 23']?.id).toBe(before['    sum = value + 23'].id)
+  expect(after['value = 42']?.id).toBe(before['    value = 42'].id)
+})
+
+test('Code edit: Inline expression change', () => {
+  const beforeRoot = Ast.parse('func name1=arg1 name2=arg2')
+  beforeRoot.module.replaceRoot(beforeRoot)
+  const before = findExpressions(beforeRoot, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'func name1=arg1': Ast.App,
+    'func name1=arg1 name2=arg2': Ast.App,
+  })
+  const edit = beforeRoot.module.edit()
+  const newArg1Code = 'arg1+1'
+  edit.getVersion(before['arg1']).syncToCode(newArg1Code)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe('func name1=arg1+1 name2=arg2')
+  // Ensure the identities of all the original nodes were maintained.
+  const after = findExpressions(edit.root()!, {
+    func: Ast.Ident,
+    arg1: Ast.Ident,
+    arg2: Ast.Ident,
+    'arg1+1': Ast.OprApp,
+    'func name1=arg1+1': Ast.App,
+    'func name1=arg1+1 name2=arg2': Ast.App,
+  })
+  expect(after.func.id).toBe(before.func.id)
+  expect(after.arg1.id).toBe(before.arg1.id)
+  expect(after.arg2.id).toBe(before.arg2.id)
+  expect(after['func name1=arg1+1'].id).toBe(before['func name1=arg1'].id)
+  expect(after['func name1=arg1+1 name2=arg2'].id).toBe(before['func name1=arg1 name2=arg2'].id)
+})
+
+test('Code edit: No-op inline expression change', () => {
+  const code = 'a = 1'
+  const expression = Ast.parse(code)
+  const module = expression.module
+  module.replaceRoot(expression)
+  expression.syncToCode(code)
+  expect(module.root()?.code()).toBe(code)
+})
+
+test('Code edit: No-op block change', () => {
+  const code = 'a = 1\nb = 2\n'
+  const block = Ast.parseBlock(code)
+  const module = block.module
+  module.replaceRoot(block)
+  block.syncToCode(code)
+  expect(module.root()?.code()).toBe(code)
+})
+
+test('Code edit: Shifting whitespace ownership', () => {
+  const beforeRoot = Ast.parseBlock('value = 1 +\n')
+  beforeRoot.module.replaceRoot(beforeRoot)
+  const before = findExpressions(beforeRoot, {
+    value: Ast.Ident,
+    '1': Ast.NumericLiteral,
+    'value = 1 +': Ast.Assignment,
+  })
+  const edit = beforeRoot.module.edit()
+  const newCode = 'value = 1 \n'
+  edit.getVersion(beforeRoot).syncToCode(newCode)
+  // Ensure the change was made.
+  expect(edit.root()?.code()).toBe(newCode)
+  // Ensure the identities of all the original nodes were maintained.
+  const after = findExpressions(edit.root()!, {
+    value: Ast.Ident,
+    '1': Ast.NumericLiteral,
+    'value = 1': Ast.Assignment,
+  })
+  expect(after.value.id).toBe(before.value.id)
+  expect(after['1'].id).toBe(before['1'].id)
+  expect(after['value = 1'].id).toBe(before['value = 1 +'].id)
+})
+
+test('Code edit merging', () => {
+  const block = Ast.parseBlock('a = 1\nb = 2')
+  const module = block.module
+  module.replaceRoot(block)
+
+  const editA = module.edit()
+  editA.getVersion(block).syncToCode('a = 10\nb = 2')
+
+  const editB = module.edit()
+  editB.getVersion(block).syncToCode('a = 1\nb = 20')
+
+  module.applyEdit(editA)
+  module.applyEdit(editB)
+  expect(module.root()?.code()).toBe('a = 10\nb = 20')
 })
diff --git a/app/gui2/src/util/ast/__tests__/match.test.ts b/app/gui2/src/util/ast/__tests__/match.test.ts
index 3792b8a8cdc3..99c0f6c293fc 100644
--- a/app/gui2/src/util/ast/__tests__/match.test.ts
+++ b/app/gui2/src/util/ast/__tests__/match.test.ts
@@ -91,7 +91,7 @@ test.each([
     `'${target}' has CST ${extracted != null ? '' : 'not '}matching '${pattern}'`,
   ).toBe(extracted != null)
   expect(
-    patternAst.match(targetAst)?.map((match) => module.get(match)?.code()),
+    patternAst.match(targetAst)?.map((match) => module.tryGet(match)?.code()),
     extracted != null
       ? `'${target}' matches '${pattern}' with '__'s corresponding to ${JSON.stringify(extracted)
           .slice(1, -1)
diff --git a/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts b/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts
new file mode 100644
index 000000000000..ea2d93af2a31
--- /dev/null
+++ b/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts
@@ -0,0 +1,34 @@
+import { Ast } from '@/util/ast'
+import { MutableModule } from 'shared/ast'
+import { initializeFFI } from 'shared/ast/ffi'
+import { SourceDocument } from 'shared/ast/sourceDocument'
+import { applyTextEdits } from 'shared/util/data/text'
+import { expect, test } from 'vitest'
+import * as Y from 'yjs'
+
+await initializeFFI()
+
+test('Test SourceDocument', () => {
+  const syncModule = new MutableModule(new Y.Doc())
+  const sourceDoc = SourceDocument.Empty()
+  syncModule.observe((update) => sourceDoc.applyUpdate(syncModule, update))
+  const code = '1 + 1'
+  const edit1 = syncModule.edit()
+  const root = Ast.parseBlock(code, edit1)
+  edit1.replaceRoot(root)
+  syncModule.applyEdit(edit1)
+  expect(sourceDoc.text).toBe(code)
+
+  let observedText = ''
+  sourceDoc.observe((textEdits) => {
+    observedText = applyTextEdits(observedText, textEdits)
+  })
+  expect(observedText).toBe(code)
+
+  const newCode = '2'
+  const edit2 = syncModule.edit()
+  edit2.getVersion(root).syncToCode(newCode)
+  syncModule.applyEdit(edit2)
+  expect(sourceDoc.text).toBe(newCode)
+  expect(observedText).toBe(newCode)
+})
diff --git a/app/gui2/src/util/ast/__tests__/testCase.ts b/app/gui2/src/util/ast/__tests__/testCase.ts
new file mode 100644
index 000000000000..f21b53b8f7a3
--- /dev/null
+++ b/app/gui2/src/util/ast/__tests__/testCase.ts
@@ -0,0 +1,74 @@
+import { assert, assertDefined } from 'shared/util/assert'
+import { Ast } from '..'
+
+export type StringsWithTypeValues = Record<string, any>
+export type WithValuesInstantiated<Spec extends StringsWithTypeValues> = {
+  [Name in keyof Spec]: InstanceType<Spec[Name]>
+}
+export type TestCase<T extends StringsWithTypeValues> = {
+  statements: WithValuesInstantiated<T>
+  module: Ast.Module
+}
+
+export function testCase<T extends StringsWithTypeValues>(spec: T): TestCase<T> {
+  let code = ''
+  for (const lineCode of Object.keys(spec)) {
+    code += lineCode
+    code += '\n'
+  }
+
+  const statementIndex = new Map<string, Ast.Ast>()
+  const parsed = Ast.parseBlock(code)
+  parsed.module.replaceRoot(parsed)
+  const statements = new Array<Ast.Ast>()
+  parsed.visitRecursiveAst((ast) => {
+    if (ast instanceof Ast.BodyBlock) statements.push(...ast.statements())
+  })
+  for (const statement of statements) {
+    const code = statement.code()
+    const trimmedFirstLine = code.split('\n', 1)[0]!.trim()
+    assert(
+      !statementIndex.has(trimmedFirstLine),
+      'Not implemented: Disambiguating duplicate statements.',
+    )
+    statementIndex.set(trimmedFirstLine, statement)
+  }
+
+  const result: Partial<WithValuesInstantiated<T>> = {}
+  for (const [lineCode, lineType] of Object.entries(spec)) {
+    const trimmed = lineCode.trim()
+    const statement = statementIndex.get(trimmed)
+    assertDefined(statement)
+    assert(statement instanceof lineType)
+    const key: keyof WithValuesInstantiated<T> = lineCode
+    result[key] = statement as any
+  }
+  return { statements: result as any, module: parsed.module }
+}
+
+export function tryFindExpressions<T extends StringsWithTypeValues>(
+  root: Ast.Ast,
+  expressions: T,
+): Partial<WithValuesInstantiated<T>> {
+  const result: Partial<WithValuesInstantiated<T>> = {}
+  const expressionsSought = new Set(Object.keys(expressions))
+  root.visitRecursiveAst((ast) => {
+    const code = ast.code()
+    const trimmedFirstLine = code.split('\n', 1)[0]!.trim()
+    if (!expressionsSought.has(trimmedFirstLine)) return
+    const key: keyof WithValuesInstantiated<T> = trimmedFirstLine
+    if (!(ast instanceof expressions[trimmedFirstLine])) return
+    assert(!(key in result))
+    result[key] = ast as any
+  })
+  return result
+}
+
+export function findExpressions<T extends StringsWithTypeValues>(
+  root: Ast.Ast,
+  expressions: T,
+): WithValuesInstantiated<T> {
+  const result = tryFindExpressions(root, expressions)
+  for (const key of Object.keys(expressions)) assert(key in result)
+  return result as any
+}
diff --git a/app/gui2/src/util/ast/__tests__/text.ts b/app/gui2/src/util/ast/__tests__/text.ts
index 0a67ac6bb5f9..84211b7b176f 100644
--- a/app/gui2/src/util/ast/__tests__/text.ts
+++ b/app/gui2/src/util/ast/__tests__/text.ts
@@ -1,4 +1,5 @@
 import * as astText from '@/util/ast/text'
+import { unescape } from 'querystring'
 import { expect, test } from 'vitest'
 
 test.each([
@@ -6,5 +7,7 @@ test.each([
   { string: '\t\r\n\v"\'`', escaped: '\\t\\r\\n\\v\\"\\\'``' },
   { string: '`foo` `bar` `baz`', escaped: '``foo`` ``bar`` ``baz``' },
 ])('`escape`', ({ string, escaped }) => {
-  expect(astText.escape(string)).toBe(escaped)
+  const result = astText.escape(string)
+  expect(result).toBe(escaped)
+  expect(unescape(escaped)).toBe(string)
 })
diff --git a/app/gui2/src/util/ast/abstract.ts b/app/gui2/src/util/ast/abstract.ts
index 8e9b23939758..3eaf4a58599c 100644
--- a/app/gui2/src/util/ast/abstract.ts
+++ b/app/gui2/src/util/ast/abstract.ts
@@ -1,5 +1,4 @@
 import { parseEnso } from '@/util/ast'
-import { swapKeysAndValues } from '@/util/record'
 import type { AstId, MutableAst, NodeKey, Owned, TokenId, TokenKey } from 'shared/ast'
 import {
   Ast,
@@ -14,31 +13,6 @@ import {
 } from 'shared/ast'
 export * from 'shared/ast'
 
-const mapping: Record<string, string> = {
-  '\b': '\\b',
-  '\f': '\\f',
-  '\n': '\\n',
-  '\r': '\\r',
-  '\t': '\\t',
-  '\v': '\\v',
-  '"': '\\"',
-  "'": "\\'",
-  '`': '``',
-}
-
-const reverseMapping = swapKeysAndValues(mapping)
-
-/** Escape a string so it can be safely spliced into an interpolated (`''`) Enso string.
- * NOT USABLE to insert into raw strings. Does not include quotes. */
-export function escape(string: string) {
-  return string.replace(/[\0\b\f\n\r\t\v"'`]/g, (match) => mapping[match]!)
-}
-
-/** The reverse of `escape`: transform the string into human-readable form, not suitable for interpolation. */
-export function unescape(string: string) {
-  return string.replace(/\\[0bfnrtv"']|``/g, (match) => reverseMapping[match]!)
-}
-
 export function deserialize(serialized: string): Owned {
   const parsed: SerializedPrintedSource = JSON.parse(serialized)
   const module = MutableModule.Transient()
@@ -71,7 +45,7 @@ export function tokenTree(root: Ast): TokenTree {
     if (isTokenId(child.node)) {
       return module.getToken(child.node).code()
     } else {
-      const node = module.get(child.node)
+      const node = module.tryGet(child.node)
       return node ? tokenTree(node) : '<missing>'
     }
   })
@@ -85,7 +59,7 @@ export function tokenTreeWithIds(root: Ast): TokenTree {
       if (isTokenId(child.node)) {
         return module.getToken(child.node).code()
       } else {
-        const node = module.get(child.node)
+        const node = module.tryGet(child.node)
         return node ? tokenTreeWithIds(node) : ['<missing>']
       }
     }),
diff --git a/app/gui2/src/util/ast/extended.ts b/app/gui2/src/util/ast/extended.ts
index a3918648e087..e333c1e52ebe 100644
--- a/app/gui2/src/util/ast/extended.ts
+++ b/app/gui2/src/util/ast/extended.ts
@@ -1,4 +1,4 @@
-import { assert } from '@/util/assert'
+import { assert, assertDefined } from '@/util/assert'
 import {
   childrenAstNodesOrTokens,
   parseEnso,
@@ -14,6 +14,7 @@ import * as sha256 from 'lib0/hash/sha256'
 import * as map from 'lib0/map'
 import * as Ast from 'shared/ast/generated/ast'
 import { Token, Tree } from 'shared/ast/generated/ast'
+import { tryGetSoleValue } from 'shared/util/data/iterable'
 import type { ExternalId, IdMap, SourceRange } from 'shared/yjsModel'
 import { markRaw } from 'vue'
 
@@ -61,12 +62,9 @@ export class AstExtended<T extends Tree | Token = Tree | Token, HasIdMap extends
     const block = AstExtended.parse(code)
     assert(block.isTree(Tree.Type.BodyBlock))
     return block.map((block) => {
-      const statements = block.statements[Symbol.iterator]()
-      const firstLine = statements.next()
-      assert(!firstLine.done)
-      assert(!!statements.next().done)
-      assert(firstLine.value.expression != null)
-      return firstLine.value.expression
+      const soleStatement = tryGetSoleValue(block.statements)
+      assertDefined(soleStatement?.expression)
+      return soleStatement.expression
     })
   }
 
diff --git a/app/gui2/src/util/ast/index.ts b/app/gui2/src/util/ast/index.ts
index f46cb995f3e9..684d7a6c5753 100644
--- a/app/gui2/src/util/ast/index.ts
+++ b/app/gui2/src/util/ast/index.ts
@@ -1,4 +1,4 @@
-import { assert } from '@/util/assert'
+import { assert, assertDefined } from '@/util/assert'
 import * as Ast from '@/util/ast/abstract'
 import { parseEnso } from '@/util/ast/abstract'
 import { AstExtended as RawAstExtended } from '@/util/ast/extended'
@@ -6,6 +6,7 @@ import { isResult, mapOk } from '@/util/data/result'
 import * as map from 'lib0/map'
 import * as RawAst from 'shared/ast/generated/ast'
 import { LazyObject, LazySequence } from 'shared/ast/parserSupport'
+import { tryGetSoleValue } from 'shared/util/data/iterable'
 import type { SourceRange } from 'shared/yjsModel'
 
 export { Ast, RawAst, RawAstExtended, parseEnso }
@@ -19,12 +20,9 @@ export type HasAstRange = SourceRange | RawAst.Tree | RawAst.Token
 export function parseEnsoLine(code: string): RawAst.Tree {
   const block = Ast.parseEnso(code)
   assert(block.type === RawAst.Tree.Type.BodyBlock)
-  const statements = block.statements[Symbol.iterator]()
-  const firstLine = statements.next()
-  assert(!firstLine.done)
-  assert(!!statements.next().done)
-  assert(firstLine.value.expression != null)
-  return firstLine.value.expression
+  const soleExpression = tryGetSoleValue(block.statements)?.expression
+  assertDefined(soleExpression)
+  return soleExpression
 }
 
 /**
diff --git a/app/gui2/src/util/ast/match.ts b/app/gui2/src/util/ast/match.ts
index 755c0ab2fc39..8d719d61fd5d 100644
--- a/app/gui2/src/util/ast/match.ts
+++ b/app/gui2/src/util/ast/match.ts
@@ -36,7 +36,7 @@ export class Pattern {
   /** Create a new concrete example of the pattern, with the placeholders replaced with the given subtrees. */
   instantiate(edit: MutableModule, subtrees: Ast.Owned[]): Ast.Owned {
     const template = edit.copy(this.template)
-    const placeholders = findPlaceholders(template, this.placeholder).map((ast) => edit.get(ast))
+    const placeholders = findPlaceholders(template, this.placeholder).map((ast) => edit.tryGet(ast))
     for (const [placeholder, replacement] of zipLongest(placeholders, subtrees)) {
       assertDefined(placeholder)
       assertDefined(replacement)
diff --git a/app/gui2/src/util/ast/node.ts b/app/gui2/src/util/ast/node.ts
index 5164f4deb761..63e4ef59984c 100644
--- a/app/gui2/src/util/ast/node.ts
+++ b/app/gui2/src/util/ast/node.ts
@@ -5,15 +5,32 @@ import { Vec2 } from '@/util/data/vec2'
 export function nodeFromAst(ast: Ast.Ast): Node | undefined {
   const nodeCode = ast instanceof Ast.Documented ? ast.expression : ast
   if (!nodeCode) return
+  const pattern = nodeCode instanceof Ast.Assignment ? nodeCode.pattern : undefined
+  const rootSpan = nodeCode instanceof Ast.Assignment ? nodeCode.expression : nodeCode
   return {
     outerExprId: ast.id,
-    pattern: nodeCode instanceof Ast.Assignment ? nodeCode.pattern : undefined,
-    rootSpan: nodeCode instanceof Ast.Assignment ? nodeCode.expression : nodeCode,
+    pattern,
+    rootSpan,
     position: Vec2.Zero,
     vis: undefined,
+    primarySubject: primaryApplicationSubject(rootSpan),
   }
 }
 
+/** Given a node root, find a child AST that is the root of the access chain that is the subject of the primary
+ *  application.
+ */
+export function primaryApplicationSubject(ast: Ast.Ast): Ast.AstId | undefined {
+  // Descend into LHS of any sequence of applications.
+  while (ast instanceof Ast.App) ast = ast.function
+  // Require a sequence of at least one property access; descend into LHS.
+  if (!(ast instanceof Ast.PropertyAccess)) return
+  while (ast instanceof Ast.PropertyAccess && ast.lhs) ast = ast.lhs
+  // The leftmost element must be an identifier.
+  if (!(ast instanceof Ast.Ident)) return
+  return ast.id
+}
+
 if (import.meta.vitest) {
   const { test, expect } = await import('vitest')
   const { initializeFFI } = await import('shared/ast/ffi')
diff --git a/app/gui2/src/util/ast/prefixes.ts b/app/gui2/src/util/ast/prefixes.ts
index b6e519816b34..a71b0c6dfae2 100644
--- a/app/gui2/src/util/ast/prefixes.ts
+++ b/app/gui2/src/util/ast/prefixes.ts
@@ -29,7 +29,7 @@ export class Prefixes<T extends Record<keyof T, Pattern>> {
       Object.entries<Pattern>(this.prefixes).map(([name, pattern]) => {
         const matches = pattern.match(expression)
         const lastMatch = matches != null ? matches[matches.length - 1] : undefined
-        if (lastMatch) expression = expression.module.checkedGet(lastMatch)
+        if (lastMatch) expression = expression.module.get(lastMatch)
         return [name, matches]
       }),
     ) as Matches<T>
diff --git a/app/gui2/src/util/ast/text.ts b/app/gui2/src/util/ast/text.ts
index 5d461d34bdb2..87bbce35a02c 100644
--- a/app/gui2/src/util/ast/text.ts
+++ b/app/gui2/src/util/ast/text.ts
@@ -1,3 +1,5 @@
+import { swapKeysAndValues } from '@/util/record'
+
 const mapping: Record<string, string> = {
   '\b': '\\b',
   '\f': '\\f',
@@ -11,8 +13,15 @@ const mapping: Record<string, string> = {
   '`': '``',
 }
 
+const reverseMapping = swapKeysAndValues(mapping)
+
 /** Escape a string so it can be safely spliced into an interpolated (`''`) Enso string.
  * NOT USABLE to insert into raw strings. Does not include quotes. */
 export function escape(string: string) {
   return string.replace(/[\0\b\f\n\r\t\v\\"'`]/g, (match) => mapping[match]!)
 }
+
+/** The reverse of `escape`: transform the string into human-readable form, not suitable for interpolation. */
+export function unescape(string: string) {
+  return string.replace(/\\[0bfnrtv\\"']|``/g, (match) => reverseMapping[match]!)
+}
diff --git a/app/gui2/src/util/data/iterable.ts b/app/gui2/src/util/data/iterable.ts
index a30a6c2fa1cb..6d4e47241558 100644
--- a/app/gui2/src/util/data/iterable.ts
+++ b/app/gui2/src/util/data/iterable.ts
@@ -1,62 +1 @@
-/** @file Functions for manipulating {@link Iterable}s. */
-
-export function* empty(): Generator<never> {}
-
-export function* range(start: number, stop: number, step = start <= stop ? 1 : -1) {
-  if ((step > 0 && start > stop) || (step < 0 && start < stop)) {
-    throw new Error(
-      "The range's step is in the wrong direction - please use Infinity or -Infinity as the endpoint for an infinite range.",
-    )
-  }
-  if (start <= stop) {
-    while (start < stop) {
-      yield start
-      start += step
-    }
-  } else {
-    while (start > stop) {
-      yield start
-      start += step
-    }
-  }
-}
-
-export function* map<T, U>(iter: Iterable<T>, map: (value: T) => U) {
-  for (const value of iter) {
-    yield map(value)
-  }
-}
-
-export function* chain<T>(...iters: Iterable<T>[]) {
-  for (const iter of iters) {
-    yield* iter
-  }
-}
-
-export function* zip<T, U>(left: Iterable<T>, right: Iterable<U>): Generator<[T, U]> {
-  const leftIterator = left[Symbol.iterator]()
-  const rightIterator = right[Symbol.iterator]()
-  while (true) {
-    const leftResult = leftIterator.next()
-    const rightResult = rightIterator.next()
-    if (leftResult.done || rightResult.done) break
-    yield [leftResult.value, rightResult.value]
-  }
-}
-
-export function* zipLongest<T, U>(
-  left: Iterable<T>,
-  right: Iterable<U>,
-): Generator<[T | undefined, U | undefined]> {
-  const leftIterator = left[Symbol.iterator]()
-  const rightIterator = right[Symbol.iterator]()
-  while (true) {
-    const leftResult = leftIterator.next()
-    const rightResult = rightIterator.next()
-    if (leftResult.done && rightResult.done) break
-    yield [
-      leftResult.done ? undefined : leftResult.value,
-      rightResult.done ? undefined : rightResult.value,
-    ]
-  }
-}
+export * from 'shared/util/data/iterable'
diff --git a/app/gui2/src/util/regexp.ts b/app/gui2/src/util/regexp.ts
new file mode 100644
index 000000000000..b245c26f54b7
--- /dev/null
+++ b/app/gui2/src/util/regexp.ts
@@ -0,0 +1,3 @@
+export default function escapeStringRegexp(s: string) {
+  return s.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+}
diff --git a/app/gui2/src/util/shortcuts.ts b/app/gui2/src/util/shortcuts.ts
index cfb0895e9319..198f72a651f0 100644
--- a/app/gui2/src/util/shortcuts.ts
+++ b/app/gui2/src/util/shortcuts.ts
@@ -47,7 +47,7 @@ function modifierFlagsForEvent(event: EventWithModifiers): ModifierFlags {
     (event.metaKey ? RAW_MODIFIER_FLAG.Meta : 0)) as ModifierFlags
 }
 
-/** These values MUST match the flags on `MouseEvent#button`.
+/** These values MUST match the flags on `MouseEvent#buttons`.
  * See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons */
 const POINTER_BUTTON_FLAG = {
   PointerMain: 1 << 0,
@@ -57,6 +57,27 @@ const POINTER_BUTTON_FLAG = {
   PointerForward: 1 << 4,
 } satisfies Record<Pointer, number> as Record<Pointer, PointerButtonFlags>
 
+/**
+ * Mapping from the MouseEvent's `button` field to PointerButtonFlags.
+ *
+ * No, it is not as simple as (1 << event.button) as PointerButtonFlags; compare
+ * https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons with
+ * https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button
+ */
+const flagsOfButtonField = [
+  POINTER_BUTTON_FLAG.PointerMain,
+  POINTER_BUTTON_FLAG.PointerAux,
+  POINTER_BUTTON_FLAG.PointerSecondary,
+  POINTER_BUTTON_FLAG.PointerBack,
+  POINTER_BUTTON_FLAG.PointerForward,
+]
+
+function buttonFlagsForEvent(event: MouseEvent): PointerButtonFlags {
+  // event.buttons keeps information about buttons being pressed, but in case of `click` or
+  // `pointerup` events we also want to know what buttons were just released.
+  return (event.buttons | (flagsOfButtonField[event.button] ?? 0)) as PointerButtonFlags
+}
+
 // ==========================
 // === Autocomplete types ===
 // ==========================
@@ -333,7 +354,7 @@ export function defineKeybinds<
       const keybinds =
         event instanceof KeyboardEvent
           ? keyboardShortcuts[event.key.toLowerCase() as Key_]?.[eventModifierFlags]
-          : mouseShortcuts[event.buttons as PointerButtonFlags]?.[eventModifierFlags]
+          : mouseShortcuts[buttonFlagsForEvent(event)]?.[eventModifierFlags]
       let handle = handlers[DefaultHandler]
       if (keybinds != null) {
         for (const bindingName in handlers) {
diff --git a/app/gui2/stories/TopBar.story.vue b/app/gui2/stories/TopBar.story.vue
index c5acfaa8848c..5418110066f7 100644
--- a/app/gui2/stories/TopBar.story.vue
+++ b/app/gui2/stories/TopBar.story.vue
@@ -5,8 +5,7 @@ import { ref } from 'vue'
 import TopBar from '@/components/TopBar.vue'
 
 const title = ref('Mock Project')
-const modes = ref(['design', 'live'])
-const mode = ref('live')
+const recordMode = ref(true)
 const breadcrumbs = ref(['main', 'ad_analytics'])
 </script>
 
@@ -15,21 +14,19 @@ const breadcrumbs = ref(['main', 'ad_analytics'])
     <div style="height: 48px">
       <TopBar
         :title="title"
-        :mode="mode"
-        :modes="modes"
+        :recordMode="recordMode"
         :breadcrumbs="breadcrumbs"
         @back="logEvent('back', [])"
         @forward="logEvent('forward', [])"
-        @execute="logEvent('execute', [])"
+        @recordOnce="logEvent('recordOnce', [])"
         @breadcrumbClick="logEvent('breadcrumbClick', [$event])"
-        @update:mode="logEvent('update:mode', [$event]), (mode = $event)"
+        @update:recordMode="logEvent('update:recordMode', [$event]), (recordMode = $event)"
       />
     </div>
 
     <template #controls>
       <HstText v-model="title" title="title" />
-      <HstSelect v-model="mode" title="mode" :options="modes" />
-      <HstJson v-model="modes" title="modes" />
+      <HstJson v-model="recordMode" title="recordMode" />
       <HstJson v-model="breadcrumbs" title="breadcrumbs" />
     </template>
   </Story>
diff --git a/app/gui2/ydoc-server/edits.ts b/app/gui2/ydoc-server/edits.ts
index 024ac04e28a2..d07f1c8a5cb5 100644
--- a/app/gui2/ydoc-server/edits.ts
+++ b/app/gui2/ydoc-server/edits.ts
@@ -23,7 +23,7 @@ export function applyDocumentUpdates(
   synced: EnsoFileParts,
   update: ModuleUpdate,
 ): AppliedUpdates {
-  const codeChanged = update.fieldsUpdated.length !== 0
+  const codeChanged = update.nodesUpdated.size !== 0
   let idsChanged = false
   let metadataChanged = false
   for (const { changes } of update.metadataUpdated) {
diff --git a/app/gui2/ydoc-server/languageServerSession.ts b/app/gui2/ydoc-server/languageServerSession.ts
index cf61ea210481..ee7be21cf121 100644
--- a/app/gui2/ydoc-server/languageServerSession.ts
+++ b/app/gui2/ydoc-server/languageServerSession.ts
@@ -4,14 +4,8 @@ import * as map from 'lib0/map'
 import { ObservableV2 } from 'lib0/observable'
 import * as random from 'lib0/random'
 import * as Y from 'yjs'
-import {
-  Ast,
-  MutableModule,
-  parseBlockWithSpans,
-  setExternalIds,
-  spanMapToIdMap,
-} from '../shared/ast'
-import { print } from '../shared/ast/parse'
+import * as Ast from '../shared/ast'
+import { astCount } from '../shared/ast'
 import { EnsoFileParts, combineFileParts, splitFileContents } from '../shared/ensoFile'
 import { LanguageServer, computeTextChecksum } from '../shared/languageServer'
 import { Checksum, FileEdit, Path, TextEdit, response } from '../shared/languageServerTypes'
@@ -416,7 +410,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
     const update = this.updateToApply
     this.updateToApply = null
 
-    const syncModule = new MutableModule(this.doc.ydoc)
+    const syncModule = new Ast.MutableModule(this.doc.ydoc)
     const moduleUpdate = syncModule.applyUpdate(update, 'remote')
     if (moduleUpdate && this.syncedContent) {
       const synced = splitFileContents(this.syncedContent)
@@ -511,24 +505,35 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
       const nodeMeta = Object.entries(metadata.ide.node)
 
       let parsedSpans
-      const syncModule = new MutableModule(this.doc.ydoc)
+      const syncModule = new Ast.MutableModule(this.doc.ydoc)
       if (code !== this.syncedCode) {
-        const { root, spans } = parseBlockWithSpans(code, syncModule)
-        syncModule.syncRoot(root)
-        parsedSpans = spans
+        const syncRoot = syncModule.root()
+        if (syncRoot) {
+          const edit = syncModule.edit()
+          edit.getVersion(syncRoot).syncToCode(code)
+          const editedRoot = edit.root()
+          if (editedRoot instanceof Ast.BodyBlock) Ast.repair(editedRoot, edit)
+          syncModule.applyEdit(edit)
+        } else {
+          const { root, spans } = Ast.parseBlockWithSpans(code, syncModule)
+          syncModule.syncRoot(root)
+          parsedSpans = spans
+        }
       }
       const astRoot = syncModule.root()
       if (!astRoot) return
       if ((code !== this.syncedCode || idMapJson !== this.syncedIdMap) && idMapJson) {
         const idMap = deserializeIdMap(idMapJson)
-        const spans = parsedSpans ?? print(astRoot).info
-        const newExternalIds = setExternalIds(syncModule, spans, idMap)
-        if (newExternalIds !== 0) {
+        const spans = parsedSpans ?? Ast.print(astRoot).info
+        const idsAssigned = Ast.setExternalIds(syncModule, spans, idMap)
+        const numberOfAsts = astCount(astRoot)
+        const idsNotSetByMap = numberOfAsts - idsAssigned
+        if (idsNotSetByMap > 0) {
           if (code !== this.syncedCode) {
-            unsyncedIdMap = spanMapToIdMap(spans)
+            unsyncedIdMap = Ast.spanMapToIdMap(spans)
           } else {
             console.warn(
-              `The LS sent an IdMap-only edit that is missing ${newExternalIds} of our expected ASTs.`,
+              `The LS sent an IdMap-only edit that is missing ${idsNotSetByMap} of our expected ASTs.`,
             )
           }
         }
@@ -539,7 +544,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
           metadataJson !== this.syncedMetaJson) &&
         nodeMeta.length !== 0
       ) {
-        const externalIdToAst = new Map<ExternalId, Ast>()
+        const externalIdToAst = new Map<ExternalId, Ast.Ast>()
         astRoot.visitRecursiveAst((ast) => {
           if (!externalIdToAst.has(ast.externalId)) externalIdToAst.set(ast.externalId, ast)
         })
diff --git a/app/ide-desktop/lib/client/src/security.ts b/app/ide-desktop/lib/client/src/security.ts
index 317fdd515c55..3084be1583de 100644
--- a/app/ide-desktop/lib/client/src/security.ts
+++ b/app/ide-desktop/lib/client/src/security.ts
@@ -66,6 +66,37 @@ function rejectPermissionRequests() {
     })
 }
 
+/** This Electron app is configured with extra CORS headers. Those headers are added because they
+ * increase security and enable higher resolution for `performance.now()` timers. However, one of
+ * these headers (i.e., `Cross-Origin-Embedder-Policy: require-corp`), breaks the Stripe.js library.
+ * This is because Stripe.js does not provide a `Cross-Origin-Resource-Policy` header or
+ * `Cross-Origin-Embedder-Policy` header on resources hosted at `https://js.stripe.com`. Without
+ * these headers, the browser will not load the resources. To fix this without compromising security
+ * or profiling capabilities, add the missing headers to the Stripe.js resources by intercepting the
+ * response headers.
+ *
+ * At the time of writing, these are the Stripe.js resources in question:
+ *
+ * - https://js.stripe.com/v3/m-outer-3437aaddcdf6922d623e172c2d6f9278.html
+ * - https://js.stripe.com/v3/fingerprinted/js/embedded-checkout-outer-d5c7fe9d44281b88cdffdf803de759f1.js
+ * - https://js.stripe.com/v3/controller-a8f00e403bc9538a7c1880ae6b6a2dc3.html
+ *
+ * The missing headers are added more generally to all resources hosted at `https://js.stripe.com`.
+ * This is because the resources are fingerprinted and the fingerprint changes every time the
+ * resources are updated. Additionally, Stripe.js may choose to add more resources in the future. */
+function addMissingCorsHeaders() {
+    void electron.app.whenReady().then(() => {
+        electron.session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
+            details.responseHeaders = details.responseHeaders ?? {}
+            if (details.url.includes('https://js.stripe.com/v3/')) {
+                details.responseHeaders['Cross-Origin-Resource-Policy'] = ['cross-origin']
+                details.responseHeaders['Cross-Origin-Embedder-Policy'] = ['require-corp']
+            }
+            callback({ responseHeaders: details.responseHeaders })
+        })
+    })
+}
+
 /** A WebView created in a renderer process that does not have Node.js integration enabled will not
  * be able to enable integration itself. However, a WebView will always create an independent
  * renderer process with its own webPreferences. It is a good idea to control the creation of new
@@ -131,6 +162,7 @@ function disableNewWindowsCreation() {
 export function enableAll() {
     enableGlobalSandbox()
     rejectPermissionRequests()
+    addMissingCorsHeaders()
     limitWebViewCreation()
     preventNavigation()
     disableNewWindowsCreation()
diff --git a/app/ide-desktop/lib/client/tasks/signArchivesMacOs.ts b/app/ide-desktop/lib/client/tasks/signArchivesMacOs.ts
index fde09ced251f..ba5ee566cc24 100644
--- a/app/ide-desktop/lib/client/tasks/signArchivesMacOs.ts
+++ b/app/ide-desktop/lib/client/tasks/signArchivesMacOs.ts
@@ -81,18 +81,18 @@ async function ensoPackageSignables(resourcesDir: string): Promise<Signable[]> {
             ],
         ],
         [
-            'component/python-resources-23.1.0.jar',
+            'component/python-resources-*.jar',
             [
                 'META-INF/resources/darwin/*/lib/graalpy23.1/*.dylib',
                 'META-INF/resources/darwin/*/lib/graalpy23.1/modules/*.so',
             ],
         ],
         [
-            `component/truffle-nfi-libffi-23.1.0.jar`,
+            `component/truffle-nfi-libffi-*.jar`,
             ['META-INF/resources/nfi-native/libnfi/darwin/*/bin/libtrufflenfi.dylib'],
         ],
         [
-            `component/truffle-runtime-23.1.0.jar`,
+            `component/truffle-runtime-*.jar`,
             [
                 'META-INF/resources/engine/libtruffleattach/darwin/amd64/bin/libtruffleattach.dylib',
                 'META-INF/resources/engine/libtruffleattach/darwin/aarch64/bin/libtruffleattach.dylib',
diff --git a/app/ide-desktop/lib/content/src/index.html b/app/ide-desktop/lib/content/src/index.html
index 27c168af9ddd..08121c25e72b 100644
--- a/app/ide-desktop/lib/content/src/index.html
+++ b/app/ide-desktop/lib/content/src/index.html
@@ -12,10 +12,12 @@
     <!-- FIXME https://github.com/validator/validator/issues/917 -->
     <!-- FIXME Security Vulnerabilities: https://github.com/enso-org/ide/issues/226 -->
     <!-- NOTE `frame-src` section of `http-equiv` required only for authorization -->
+    <!-- NOTE [NP]: https://stripe.com/docs/security/guide#content-security-policy for Stripe.js -->
     <meta
       http-equiv="Content-Security-Policy"
       content="
             default-src 'self';
+            frame-src   'self' data: https://js.stripe.com;
             script-src  'self' 'unsafe-eval' data: https://*;
             style-src   'self' 'unsafe-inline' data: https://*;
             connect-src 'self' data: ws://localhost:* ws://127.0.0.1:* http://localhost:* https://* wss://*;
diff --git a/app/ide-desktop/lib/dashboard/e2e/actions.ts b/app/ide-desktop/lib/dashboard/e2e/actions.ts
index de232ef41145..64537f14697e 100644
--- a/app/ide-desktop/lib/dashboard/e2e/actions.ts
+++ b/app/ide-desktop/lib/dashboard/e2e/actions.ts
@@ -576,6 +576,17 @@ export function getAssetRowLeftPx(locator: test.Locator) {
   return locator.evaluate(el => el.children[0]?.children[0]?.getBoundingClientRect().left ?? 0)
 }
 
+// ===================================
+// === expect functions for themes ===
+// ===================================
+
+/** A test assertion to confirm that the element has the class `selected`. */
+export async function expectClassSelected(locator: test.Locator) {
+  await test.test.step('Expect `selected`', async () => {
+    await test.expect(locator).toHaveClass(/(?:^| )selected(?: |$)/)
+  })
+}
+
 // ============================
 // === expectPlaceholderRow ===
 // ============================
diff --git a/app/ide-desktop/lib/dashboard/e2e/copy.spec.ts b/app/ide-desktop/lib/dashboard/e2e/copy.spec.ts
index fd75b27d7047..bc1e1c89164a 100644
--- a/app/ide-desktop/lib/dashboard/e2e/copy.spec.ts
+++ b/app/ide-desktop/lib/dashboard/e2e/copy.spec.ts
@@ -137,9 +137,14 @@ test.test('cut (keyboard)', async ({ page }) => {
   await actions.locateNewFolderIcon(page).click()
   await assetRows.nth(0).click()
   await actions.press(page, 'Mod+X')
-  test
-    .expect(await assetRows.nth(0).evaluate(el => Number(getComputedStyle(el).opacity)))
-    .toBeLessThan(1)
+  // This action is not a builtin `expect` action, so it needs to be manually retried.
+  await test
+    .expect(async () => {
+      test
+        .expect(await assetRows.nth(0).evaluate(el => Number(getComputedStyle(el).opacity)))
+        .toBeLessThan(1)
+    })
+    .toPass()
 })
 
 test.test('duplicate', async ({ page }) => {
diff --git a/app/ide-desktop/lib/dashboard/index.html b/app/ide-desktop/lib/dashboard/index.html
index 70124ad0829d..584985d3a87b 100644
--- a/app/ide-desktop/lib/dashboard/index.html
+++ b/app/ide-desktop/lib/dashboard/index.html
@@ -12,11 +12,12 @@
     <!-- FIXME https://github.com/validator/validator/issues/917 -->
     <!-- FIXME Security Vulnerabilities: https://github.com/enso-org/ide/issues/226 -->
     <!-- NOTE `frame-src` section of `http-equiv` required only for authorization -->
+    <!-- NOTE [NP]: https://stripe.com/docs/security/guide#content-security-policy for Stripe.js -->
     <meta
       http-equiv="Content-Security-Policy"
       content="
             default-src 'self';
-            frame-src   'self' data: https://accounts.google.com https://enso-org.firebaseapp.com;
+            frame-src   'self' data: https://js.stripe.com;
             script-src  'self' 'unsafe-eval' data: https://*;
             style-src   'self' 'unsafe-inline' data: https://*;
             connect-src 'self' data: ws://localhost:* ws://127.0.0.1:* http://localhost:* https://* wss://*;
diff --git a/app/ide-desktop/lib/dashboard/playwright.config.ts b/app/ide-desktop/lib/dashboard/playwright.config.ts
index be1ff8f514f0..1f178585b799 100644
--- a/app/ide-desktop/lib/dashboard/playwright.config.ts
+++ b/app/ide-desktop/lib/dashboard/playwright.config.ts
@@ -18,6 +18,7 @@ export default test.defineConfig({
     toHaveScreenshot: { threshold: 0 },
     timeout: 30_000,
   },
+  timeout: 30_000,
   use: {
     baseURL: 'http://localhost:8080',
     launchOptions: {
diff --git a/app/ide-desktop/lib/dashboard/src/App.tsx b/app/ide-desktop/lib/dashboard/src/App.tsx
index 77b129b8a423..139411eb1b54 100644
--- a/app/ide-desktop/lib/dashboard/src/App.tsx
+++ b/app/ide-desktop/lib/dashboard/src/App.tsx
@@ -61,6 +61,7 @@ import Registration from '#/pages/authentication/Registration'
 import ResetPassword from '#/pages/authentication/ResetPassword'
 import SetUsername from '#/pages/authentication/SetUsername'
 import Dashboard from '#/pages/dashboard/Dashboard'
+import Subscribe from '#/pages/subscribe/Subscribe'
 
 import type Backend from '#/services/Backend'
 import LocalBackend from '#/services/LocalBackend'
@@ -226,6 +227,7 @@ function AppRouter(props: AppProps) {
             path={appUtils.DASHBOARD_PATH}
             element={shouldShowDashboard && <Dashboard {...props} />}
           />
+          <router.Route path={appUtils.SUBSCRIBE_PATH} element={<Subscribe />} />
         </router.Route>
         {/* Semi-protected pages are visible to users currently registering. */}
         <router.Route element={<authProvider.SemiProtectedLayout />}>
diff --git a/app/ide-desktop/lib/dashboard/src/appUtils.tsx b/app/ide-desktop/lib/dashboard/src/appUtils.tsx
index b9113842488f..216bb34bd7f0 100644
--- a/app/ide-desktop/lib/dashboard/src/appUtils.tsx
+++ b/app/ide-desktop/lib/dashboard/src/appUtils.tsx
@@ -20,8 +20,11 @@ export const RESET_PASSWORD_PATH = '/password-reset'
 export const SET_USERNAME_PATH = '/set-username'
 /** Path to the offline mode entrypoint. */
 export const ENTER_OFFLINE_MODE_PATH = '/offline'
+/** Path to page in which the currently active payment plan can be managed. */
+export const SUBSCRIBE_PATH = '/subscribe'
 /** A {@link RegExp} matching all paths. */
 export const ALL_PATHS_REGEX = new RegExp(
   `(?:${DASHBOARD_PATH}|${LOGIN_PATH}|${REGISTRATION_PATH}|${CONFIRM_REGISTRATION_PATH}|` +
-    `${FORGOT_PASSWORD_PATH}|${RESET_PASSWORD_PATH}|${SET_USERNAME_PATH})$`
+    `${FORGOT_PASSWORD_PATH}|${RESET_PASSWORD_PATH}|${SET_USERNAME_PATH}|` +
+    `${ENTER_OFFLINE_MODE_PATH}|${SUBSCRIBE_PATH})$`
 )
diff --git a/app/ide-desktop/lib/dashboard/src/authentication/service.ts b/app/ide-desktop/lib/dashboard/src/authentication/service.ts
index e0954a055494..007ae4011456 100644
--- a/app/ide-desktop/lib/dashboard/src/authentication/service.ts
+++ b/app/ide-desktop/lib/dashboard/src/authentication/service.ts
@@ -65,11 +65,18 @@ const BASE_AMPLIFY_CONFIG = {
 const AMPLIFY_CONFIGS = {
   /** Configuration for @indiv0's Cognito user pool. */
   npekin: {
-    userPoolId: auth.UserPoolId('eu-west-1_7yB1Lr0fS'),
-    userPoolWebClientId: auth.UserPoolWebClientId('ulc9knbbf0anduetrq9nnrlg2'),
+    userPoolId: auth.UserPoolId('eu-west-1_xdBLmpah9'),
+    userPoolWebClientId: auth.UserPoolWebClientId('1a7bner2d5ured09anh39sqhho'),
     domain: auth.OAuthDomain('npekin-enso-domain.auth.eu-west-1.amazoncognito.com'),
     ...BASE_AMPLIFY_CONFIG,
   } satisfies Partial<auth.AmplifyConfig>,
+  /** Configuration for @indiv0's Cognito user pool. */
+  npekin2: {
+    userPoolId: auth.UserPoolId('eu-west-1_FWbSTq3fV'),
+    userPoolWebClientId: auth.UserPoolWebClientId('1e54ioss6ct6qfuek44g8hi1p0'),
+    domain: auth.OAuthDomain('npekin2-enso-domain.auth.eu-west-1.amazoncognito.com'),
+    ...BASE_AMPLIFY_CONFIG,
+  } satisfies Partial<auth.AmplifyConfig>,
   /** Configuration for @pbuchu's Cognito user pool. */
   pbuchu: {
     userPoolId: auth.UserPoolId('eu-west-1_jSF1RbgPK'),
diff --git a/app/ide-desktop/lib/dashboard/src/components/DragModal.tsx b/app/ide-desktop/lib/dashboard/src/components/DragModal.tsx
index c6bacb843575..1aebc87e97b3 100644
--- a/app/ide-desktop/lib/dashboard/src/components/DragModal.tsx
+++ b/app/ide-desktop/lib/dashboard/src/components/DragModal.tsx
@@ -56,14 +56,14 @@ export default function DragModal(props: DragModalProps) {
       unsetModal()
     }
     // Update position (non-FF)
-    document.addEventListener('drag', onDrag)
+    document.addEventListener('drag', onDrag, { capture: true })
     // Update position (FF)
-    document.addEventListener('dragover', onDrag)
-    document.addEventListener('dragend', onDragEnd)
+    document.addEventListener('dragover', onDrag, { capture: true })
+    document.addEventListener('dragend', onDragEnd, { capture: true })
     return () => {
-      document.removeEventListener('drag', onDrag)
-      document.removeEventListener('dragover', onDrag)
-      document.removeEventListener('dragend', onDragEnd)
+      document.removeEventListener('drag', onDrag, { capture: true })
+      document.removeEventListener('dragover', onDrag, { capture: true })
+      document.removeEventListener('dragend', onDragEnd, { capture: true })
     }
     // `doCleanup` is a callback, not a dependency.
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/app/ide-desktop/lib/dashboard/src/components/dashboard/DirectoryNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
index 1eff5412f2e5..d02bf7f3b758 100644
--- a/app/ide-desktop/lib/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
@@ -39,7 +39,7 @@ export interface DirectoryNameColumnProps extends column.AssetColumnProps {}
  * This should never happen. */
 export default function DirectoryNameColumn(props: DirectoryNameColumnProps) {
   const { item, setItem, selected, state, rowState, setRowState } = props
-  const { numberOfSelectedItems, assetEvents, dispatchAssetListEvent, nodeMap } = state
+  const { selectedKeys, assetEvents, dispatchAssetListEvent, nodeMap } = state
   const { doToggleDirectoryExpansion } = state
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const { backend } = backendProvider.useBackend()
@@ -137,7 +137,7 @@ export default function DirectoryNameColumn(props: DirectoryNameColumnProps) {
       onClick={event => {
         if (
           eventModule.isSingleClick(event) &&
-          ((selected && numberOfSelectedItems === 1) ||
+          ((selected && selectedKeys.current.size === 1) ||
             shortcutManager.matchesMouseAction(shortcutManagerModule.MouseAction.editName, event))
         ) {
           event.stopPropagation()
diff --git a/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx b/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx
index 91fca2699819..76b4f9554bb4 100644
--- a/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx
+++ b/app/ide-desktop/lib/dashboard/src/components/dashboard/ProjectNameColumn.tsx
@@ -42,7 +42,7 @@ export interface ProjectNameColumnProps extends column.AssetColumnProps {}
  * This should never happen. */
 export default function ProjectNameColumn(props: ProjectNameColumnProps) {
   const { item, setItem, selected, rowState, setRowState, state } = props
-  const { numberOfSelectedItems, assetEvents, dispatchAssetEvent, dispatchAssetListEvent } = state
+  const { selectedKeys, assetEvents, dispatchAssetEvent, dispatchAssetListEvent } = state
   const { nodeMap, doOpenManually, doOpenIde, doCloseIde } = state
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const { backend } = backendProvider.useBackend()
@@ -277,7 +277,7 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
         } else if (
           !isRunning &&
           eventModule.isSingleClick(event) &&
-          ((selected && numberOfSelectedItems === 1) ||
+          ((selected && selectedKeys.current.size === 1) ||
             shortcutManager.matchesMouseAction(shortcutManagerModule.MouseAction.editName, event))
         ) {
           setRowState(object.merger({ isEditingName: true }))
diff --git a/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts b/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts
index cf4be27eb43f..b9d8a706692f 100644
--- a/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts
+++ b/app/ide-desktop/lib/dashboard/src/events/assetEvent.ts
@@ -73,12 +73,12 @@ export interface AssetNewFolderEvent extends AssetBaseEvent<AssetEventType.newFo
 
 /** A signal to upload files. */
 export interface AssetUploadFilesEvent extends AssetBaseEvent<AssetEventType.uploadFiles> {
-  readonly files: Map<backendModule.AssetId, File>
+  readonly files: ReadonlyMap<backendModule.AssetId, File>
 }
 
 /** A signal to update files with new versions. */
 export interface AssetUpdateFilesEvent extends AssetBaseEvent<AssetEventType.updateFiles> {
-  readonly files: Map<backendModule.AssetId, File>
+  readonly files: ReadonlyMap<backendModule.AssetId, File>
 }
 
 /** A signal to create a Data Link. */
@@ -112,41 +112,41 @@ export interface AssetCancelOpeningAllProjectsEvent
 /** A signal that multiple assets should be copied. `ids` are the `Id`s of the newly created
  * placeholder items. */
 export interface AssetCopyEvent extends AssetBaseEvent<AssetEventType.copy> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly newParentKey: backendModule.AssetId
   readonly newParentId: backendModule.DirectoryId
 }
 
 /** A signal to cut multiple assets. */
 export interface AssetCutEvent extends AssetBaseEvent<AssetEventType.cut> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
 }
 
 /** A signal that a cut operation has been cancelled. */
 export interface AssetCancelCutEvent extends AssetBaseEvent<AssetEventType.cancelCut> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
 }
 
 /** A signal to move multiple assets. */
 export interface AssetMoveEvent extends AssetBaseEvent<AssetEventType.move> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly newParentKey: backendModule.AssetId
   readonly newParentId: backendModule.DirectoryId
 }
 
 /** A signal to delete assets. */
 export interface AssetDeleteEvent extends AssetBaseEvent<AssetEventType.delete> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
 }
 
 /** A signal to restore assets from trash. */
 export interface AssetRestoreEvent extends AssetBaseEvent<AssetEventType.restore> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
 }
 
 /** A signal to download assets. */
 export interface AssetDownloadEvent extends AssetBaseEvent<AssetEventType.download> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
 }
 
 /** A signal to download the currently selected assets. */
@@ -161,26 +161,26 @@ export interface AssetRemoveSelfEvent extends AssetBaseEvent<AssetEventType.remo
 /** A signal to temporarily add labels to the selected assetss. */
 export interface AssetTemporarilyAddLabelsEvent
   extends AssetBaseEvent<AssetEventType.temporarilyAddLabels> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly labelNames: ReadonlySet<backendModule.LabelName>
 }
 
 /** A signal to temporarily remove labels from the selected assetss. */
 export interface AssetTemporarilyRemoveLabelsEvent
   extends AssetBaseEvent<AssetEventType.temporarilyRemoveLabels> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly labelNames: ReadonlySet<backendModule.LabelName>
 }
 
 /** A signal to add labels to the selected assetss. */
 export interface AssetAddLabelsEvent extends AssetBaseEvent<AssetEventType.addLabels> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly labelNames: ReadonlySet<backendModule.LabelName>
 }
 
 /** A signal to remove labels from the selected assetss. */
 export interface AssetRemoveLabelsEvent extends AssetBaseEvent<AssetEventType.removeLabels> {
-  readonly ids: Set<backendModule.AssetId>
+  readonly ids: ReadonlySet<backendModule.AssetId>
   readonly labelNames: ReadonlySet<backendModule.LabelName>
 }
 
diff --git a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTable.tsx b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTable.tsx
index 9e8869b9714d..f7eda5c97675 100644
--- a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTable.tsx
+++ b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTable.tsx
@@ -250,7 +250,7 @@ const CATEGORY_TO_FILTER_BY: Readonly<Record<Category, backendModule.FilterBy |
 
 /** State passed through from a {@link AssetsTable} to every cell. */
 export interface AssetsTableState {
-  readonly numberOfSelectedItems: number
+  readonly selectedKeys: React.MutableRefObject<ReadonlySet<backendModule.AssetId>>
   readonly visibilities: ReadonlyMap<backendModule.AssetId, Visibility>
   readonly category: Category
   readonly labels: Map<backendModule.LabelName, backendModule.Label>
@@ -352,9 +352,12 @@ export default function AssetsTable(props: AssetsTableProps) {
   const [extraColumns, setExtraColumns] = React.useState(() => new Set<columnUtils.ExtraColumn>())
   const [sortColumn, setSortColumn] = React.useState<columnUtils.SortableColumn | null>(null)
   const [sortDirection, setSortDirection] = React.useState<SortDirection | null>(null)
-  const [selectedKeys, setSelectedKeys] = React.useState(() => new Set<backendModule.AssetId>())
+  const [selectedKeys, setSelectedKeysRaw] = React.useState<ReadonlySet<backendModule.AssetId>>(
+    () => new Set()
+  )
+  const selectedKeysRef = React.useRef(selectedKeys)
   const [pasteData, setPasteData] = React.useState<pasteDataModule.PasteData<
-    Set<backendModule.AssetId>
+    ReadonlySet<backendModule.AssetId>
   > | null>(null)
   const [, setQueuedAssetEvents] = React.useState<assetEvent.AssetEvent[]>([])
   const [, setNameOfProjectToImmediatelyOpen] = React.useState(initialProjectName)
@@ -381,9 +384,9 @@ export default function AssetsTable(props: AssetsTableProps) {
   const scrollContainerRef = React.useRef<HTMLDivElement>(null)
   const headerRowRef = React.useRef<HTMLTableRowElement>(null)
   const assetTreeRef = React.useRef<AssetTreeNode>(assetTree)
-  const pasteDataRef = React.useRef<pasteDataModule.PasteData<Set<backendModule.AssetId>> | null>(
-    null
-  )
+  const pasteDataRef = React.useRef<pasteDataModule.PasteData<
+    ReadonlySet<backendModule.AssetId>
+  > | null>(null)
   const nodeMapRef = React.useRef<ReadonlyMap<backendModule.AssetId, AssetTreeNode>>(
     new Map<backendModule.AssetId, AssetTreeNode>()
   )
@@ -575,17 +578,17 @@ export default function AssetsTable(props: AssetsTableProps) {
     if (category === Category.trash) {
       setCanDownloadFiles(false)
     } else if (!isCloud) {
-      setCanDownloadFiles(selectedKeys.size !== 0)
+      setCanDownloadFiles(selectedKeysRef.current.size !== 0)
     } else {
       setCanDownloadFiles(
-        selectedKeys.size !== 0 &&
-          Array.from(selectedKeys).every(key => {
+        selectedKeysRef.current.size !== 0 &&
+          Array.from(selectedKeysRef.current).every(key => {
             const node = nodeMapRef.current.get(key)
             return node?.item.type === backendModule.AssetType.file
           })
       )
     }
-  }, [category, selectedKeys, isCloud, /* should never change */ setCanDownloadFiles])
+  }, [category, isCloud, /* should never change */ setCanDownloadFiles])
 
   React.useEffect(() => {
     const nodeToSuggestion = (
@@ -792,10 +795,7 @@ export default function AssetsTable(props: AssetsTableProps) {
         if (pasteDataRef.current == null) {
           return false
         } else {
-          dispatchAssetEvent({
-            type: AssetEventType.cancelCut,
-            ids: pasteDataRef.current.data,
-          })
+          dispatchAssetEvent({ type: AssetEventType.cancelCut, ids: pasteDataRef.current.data })
           setPasteData(null)
           return
         }
@@ -833,6 +833,18 @@ export default function AssetsTable(props: AssetsTableProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [initialProjectName])
 
+  const setSelectedKeys = React.useCallback(
+    (newSelectedKeys: ReadonlySet<backendModule.AssetId>) => {
+      selectedKeysRef.current = newSelectedKeys
+      setSelectedKeysRaw(newSelectedKeys)
+    },
+    []
+  )
+
+  const clearSelectedKeys = React.useCallback(() => {
+    setSelectedKeys(new Set())
+  }, [/* should never change */ setSelectedKeys])
+
   const overwriteNodes = React.useCallback(
     (newAssets: backendModule.AnyAsset[]) => {
       // This is required, otherwise we are using an outdated
@@ -1057,10 +1069,10 @@ export default function AssetsTable(props: AssetsTableProps) {
   }, [extraColumns, initialized, /* should never change */ localStorage])
 
   React.useEffect(() => {
-    if (selectedKeys.size !== 1) {
+    if (selectedKeysRef.current.size !== 1) {
       setAssetPanelProps(null)
     }
-  }, [selectedKeys.size, /* should never change */ setAssetPanelProps])
+  }, [selectedKeysRef.current.size, /* should never change */ setAssetPanelProps])
 
   const directoryListAbortControllersRef = React.useRef(
     new Map<backendModule.DirectoryId, AbortController>()
@@ -1474,12 +1486,10 @@ export default function AssetsTable(props: AssetsTableProps) {
         break
       }
       case AssetListEventType.willDelete: {
-        if (selectedKeys.has(event.key)) {
-          setSelectedKeys(oldSelectedKeys => {
-            const newSelectedKeys = new Set(oldSelectedKeys)
-            newSelectedKeys.delete(event.key)
-            return newSelectedKeys
-          })
+        if (selectedKeysRef.current.has(event.key)) {
+          const newSelectedKeys = new Set(selectedKeysRef.current)
+          newSelectedKeys.delete(event.key)
+          setSelectedKeys(newSelectedKeys)
         }
         break
       }
@@ -1548,34 +1558,20 @@ export default function AssetsTable(props: AssetsTableProps) {
 
   const doCopy = React.useCallback(() => {
     unsetModal()
-    setSelectedKeys(oldSelectedKeys => {
-      queueMicrotask(() => {
-        setPasteData({ type: PasteType.copy, data: oldSelectedKeys })
-      })
-      return oldSelectedKeys
-    })
+    setPasteData({ type: PasteType.copy, data: selectedKeysRef.current })
   }, [/* should never change */ unsetModal])
 
   const doCut = React.useCallback(() => {
     unsetModal()
-    setSelectedKeys(oldSelectedKeys => {
-      queueMicrotask(() => {
-        if (pasteData != null) {
-          dispatchAssetEvent({
-            type: AssetEventType.cancelCut,
-            ids: pasteData.data,
-          })
-        }
-        setPasteData({ type: PasteType.move, data: oldSelectedKeys })
-        dispatchAssetEvent({
-          type: AssetEventType.cut,
-          ids: oldSelectedKeys,
-        })
-      })
-      return new Set()
-    })
+    if (pasteData != null) {
+      dispatchAssetEvent({ type: AssetEventType.cancelCut, ids: pasteData.data })
+    }
+    setPasteData({ type: PasteType.move, data: selectedKeysRef.current })
+    dispatchAssetEvent({ type: AssetEventType.cut, ids: selectedKeysRef.current })
+    setSelectedKeys(new Set())
   }, [
     pasteData,
+    /* should never change */ setSelectedKeys,
     /* should never change */ unsetModal,
     /* should never change */ dispatchAssetEvent,
   ])
@@ -1626,9 +1622,9 @@ export default function AssetsTable(props: AssetsTableProps) {
         category={category}
         pasteData={pasteData}
         selectedKeys={selectedKeys}
+        clearSelectedKeys={clearSelectedKeys}
         nodeMapRef={nodeMapRef}
         event={{ pageX: 0, pageY: 0 }}
-        setSelectedKeys={setSelectedKeys}
         dispatchAssetEvent={dispatchAssetEvent}
         dispatchAssetListEvent={dispatchAssetListEvent}
         doCopy={doCopy}
@@ -1638,11 +1634,12 @@ export default function AssetsTable(props: AssetsTableProps) {
     ),
     [
       category,
-      pasteData,
       selectedKeys,
+      pasteData,
       doCopy,
       doCut,
       doPaste,
+      /* should never change */ clearSelectedKeys,
       /* should never change */ dispatchAssetEvent,
       /* should never change */ dispatchAssetListEvent,
     ]
@@ -1660,7 +1657,7 @@ export default function AssetsTable(props: AssetsTableProps) {
     // The type MUST be here to trigger excess property errors at typecheck time.
     (): AssetsTableState => ({
       visibilities,
-      numberOfSelectedItems: selectedKeys.size,
+      selectedKeys: selectedKeysRef,
       category,
       labels: allLabels,
       deletedLabelNames,
@@ -1688,7 +1685,6 @@ export default function AssetsTable(props: AssetsTableProps) {
     }),
     [
       visibilities,
-      selectedKeys.size,
       category,
       allLabels,
       deletedLabelNames,
@@ -1755,7 +1751,7 @@ export default function AssetsTable(props: AssetsTableProps) {
           shortcutManagerModule.MouseAction.selectAdditionalRange,
           event
         ) &&
-        selectedKeys.size !== 0
+        selectedKeysRef.current.size !== 0
       ) {
         setSelectedKeys(new Set())
       }
@@ -1764,7 +1760,7 @@ export default function AssetsTable(props: AssetsTableProps) {
     return () => {
       document.removeEventListener('click', onDocumentClick)
     }
-  }, [selectedKeys, /* should never change */ setSelectedKeys, shortcutManager])
+  }, [shortcutManager, /* should never change */ setSelectedKeys])
 
   React.useEffect(() => {
     if (isLoading) {
@@ -1809,24 +1805,20 @@ export default function AssetsTable(props: AssetsTableProps) {
           event
         )
       ) {
-        setSelectedKeys(
-          oldSelectedItems => new Set([...oldSelectedItems, ...getNewlySelectedKeys()])
-        )
+        setSelectedKeys(new Set([...selectedKeysRef.current, ...getNewlySelectedKeys()]))
       } else if (
         shortcutManager.matchesMouseAction(
           shortcutManagerModule.MouseAction.selectAdditional,
           event
         )
       ) {
-        setSelectedKeys(oldSelectedItems => {
-          const newItems = new Set(oldSelectedItems)
-          if (oldSelectedItems.has(key)) {
-            newItems.delete(key)
-          } else {
-            newItems.add(key)
-          }
-          return newItems
-        })
+        const newSelectedKeys = new Set(selectedKeysRef.current)
+        if (selectedKeysRef.current.has(key)) {
+          newSelectedKeys.delete(key)
+        } else {
+          newSelectedKeys.add(key)
+        }
+        setSelectedKeys(newSelectedKeys)
       } else {
         setSelectedKeys(new Set([key]))
       }
@@ -1882,10 +1874,10 @@ export default function AssetsTable(props: AssetsTableProps) {
           hidden={visibilities.get(item.key) === Visibility.hidden}
           selected={isSelected}
           setSelected={selected => {
-            setSelectedKeys(oldSelectedKeys => set.withPresence(oldSelectedKeys, key, selected))
+            setSelectedKeys(set.withPresence(selectedKeysRef.current, key, selected))
           }}
           isSoleSelectedItem={isSoleSelectedItem}
-          allowContextMenu={selectedKeys.size === 0 || !isSelected || isSoleSelectedItem}
+          allowContextMenu={selectedKeysRef.current.size === 0 || !isSelected || isSoleSelectedItem}
           onClick={onRowClick}
           onContextMenu={(_innerProps, event) => {
             if (!isSelected) {
@@ -1896,148 +1888,132 @@ export default function AssetsTable(props: AssetsTableProps) {
             }
           }}
           onDragStart={event => {
-            if (!selectedKeys.has(key)) {
+            let newSelectedKeys = selectedKeysRef.current
+            if (!selectedKeysRef.current.has(key)) {
               setPreviouslySelectedKey(key)
-              setSelectedKeys(new Set([key]))
+              newSelectedKeys = new Set([key])
+              setSelectedKeys(newSelectedKeys)
             }
-            setSelectedKeys(oldSelectedKeys => {
-              const nodes = assetTree
-                .preorderTraversal()
-                .filter(node => oldSelectedKeys.has(node.key))
-              const payload: drag.AssetRowsDragPayload = nodes.map(node => ({
-                key: node.key,
-                asset: node.item,
-              }))
-              drag.setDragImageToBlank(event)
-              drag.ASSET_ROWS.bind(event, payload)
-              queueMicrotask(() => {
-                setModal(
-                  <DragModal
-                    event={event}
-                    className="flex flex-col rounded-2xl bg-frame-selected backdrop-blur-3xl"
-                    doCleanup={() => {
-                      drag.ASSET_ROWS.unbind(payload)
-                    }}
-                  >
-                    {nodes.map(node => (
-                      <NameColumn
-                        key={node.key}
-                        keyProp={node.key}
-                        item={node.with({ depth: 0 })}
-                        state={state}
-                        // Default states.
-                        isSoleSelectedItem={false}
-                        selected={false}
-                        rowState={assetRowUtils.INITIAL_ROW_STATE}
-                        // The drag placeholder cannot be interacted with.
-                        setSelected={() => {}}
-                        setItem={() => {}}
-                        setRowState={() => {}}
-                      />
-                    ))}
-                  </DragModal>
-                )
-              })
-              return oldSelectedKeys
-            })
+            const nodes = assetTree
+              .preorderTraversal()
+              .filter(node => newSelectedKeys.has(node.key))
+            const payload: drag.AssetRowsDragPayload = nodes.map(node => ({
+              key: node.key,
+              asset: node.item,
+            }))
+            drag.setDragImageToBlank(event)
+            drag.ASSET_ROWS.bind(event, payload)
+            setModal(
+              <DragModal
+                event={event}
+                className="flex flex-col rounded-2xl bg-frame-selected backdrop-blur-3xl"
+                doCleanup={() => {
+                  drag.ASSET_ROWS.unbind(payload)
+                }}
+              >
+                {nodes.map(node => (
+                  <NameColumn
+                    key={node.key}
+                    keyProp={node.key}
+                    item={node.with({ depth: 0 })}
+                    state={state}
+                    // Default states.
+                    isSoleSelectedItem={false}
+                    selected={false}
+                    rowState={assetRowUtils.INITIAL_ROW_STATE}
+                    // The drag placeholder cannot be interacted with.
+                    setSelected={() => {}}
+                    setItem={() => {}}
+                    setRowState={() => {}}
+                  />
+                ))}
+              </DragModal>
+            )
           }}
           onDragOver={event => {
-            setSelectedKeys(oldSelectedKeys => {
-              const payload = drag.LABELS.lookup(event)
-              if (payload != null) {
-                event.preventDefault()
-                event.stopPropagation()
-                const ids = oldSelectedKeys.has(key) ? oldSelectedKeys : new Set([key])
-                // Expand ids to include ids of children as well.
-                for (const node of assetTree.preorderTraversal()) {
-                  if (ids.has(node.key) && node.children != null) {
-                    for (const child of node.children) {
-                      ids.add(child.key)
-                    }
+            const payload = drag.LABELS.lookup(event)
+            if (payload != null) {
+              event.preventDefault()
+              event.stopPropagation()
+              const ids = new Set(
+                selectedKeysRef.current.has(key) ? selectedKeysRef.current : [key]
+              )
+              // Expand ids to include ids of children as well.
+              for (const node of assetTree.preorderTraversal()) {
+                if (ids.has(node.key) && node.children != null) {
+                  for (const child of node.children) {
+                    ids.add(child.key)
                   }
                 }
-                let labelsPresent = 0
-                for (const selectedKey of ids) {
-                  const labels = nodeMapRef.current.get(selectedKey)?.item.labels
-                  if (labels != null) {
-                    for (const label of labels) {
-                      if (payload.has(label)) {
-                        labelsPresent += 1
-                      }
+              }
+              let labelsPresent = 0
+              for (const selectedKey of ids) {
+                const labels = nodeMapRef.current.get(selectedKey)?.item.labels
+                if (labels != null) {
+                  for (const label of labels) {
+                    if (payload.has(label)) {
+                      labelsPresent += 1
                     }
                   }
                 }
-                const shouldAdd = labelsPresent * 2 < ids.size * payload.size
-                window.setTimeout(() => {
-                  dispatchAssetEvent({
-                    type: shouldAdd
-                      ? AssetEventType.temporarilyAddLabels
-                      : AssetEventType.temporarilyRemoveLabels,
-                    ids,
-                    labelNames: payload,
-                  })
-                })
               }
-              return oldSelectedKeys
-            })
-          }}
-          onDragEnd={() => {
-            setSelectedKeys(oldSelectedKeys => {
+              const shouldAdd = labelsPresent * 2 < ids.size * payload.size
               window.setTimeout(() => {
                 dispatchAssetEvent({
-                  type: AssetEventType.temporarilyAddLabels,
-                  ids: oldSelectedKeys,
-                  labelNames: set.EMPTY,
+                  type: shouldAdd
+                    ? AssetEventType.temporarilyAddLabels
+                    : AssetEventType.temporarilyRemoveLabels,
+                  ids,
+                  labelNames: payload,
                 })
               })
-              return oldSelectedKeys
+            }
+          }}
+          onDragEnd={() => {
+            dispatchAssetEvent({
+              type: AssetEventType.temporarilyAddLabels,
+              ids: selectedKeysRef.current,
+              labelNames: set.EMPTY,
             })
           }}
           onDrop={event => {
-            setSelectedKeys(oldSelectedKeys => {
-              const ids = oldSelectedKeys.has(key) ? new Set(oldSelectedKeys) : new Set([key])
-              // Expand ids to include ids of children as well.
-              for (const node of assetTree.preorderTraversal()) {
-                if (ids.has(node.key) && node.children != null) {
-                  for (const child of node.children) {
-                    ids.add(child.key)
-                  }
+            const ids = new Set(selectedKeysRef.current.has(key) ? selectedKeysRef.current : [key])
+            // Expand ids to include ids of descendants as well.
+            for (const node of assetTree.preorderTraversal()) {
+              if (ids.has(node.key) && node.children != null) {
+                for (const child of node.children) {
+                  ids.add(child.key)
                 }
               }
-              const payload = drag.LABELS.lookup(event)
-              if (payload != null) {
-                event.preventDefault()
-                event.stopPropagation()
-                let labelsPresent = 0
-                for (const selectedKey of ids) {
-                  const labels = nodeMapRef.current.get(selectedKey)?.item.labels
-                  if (labels != null) {
-                    for (const label of labels) {
-                      if (payload.has(label)) {
-                        labelsPresent += 1
-                      }
+            }
+            const payload = drag.LABELS.lookup(event)
+            if (payload != null) {
+              event.preventDefault()
+              event.stopPropagation()
+              let labelsPresent = 0
+              for (const selectedKey of ids) {
+                const labels = nodeMapRef.current.get(selectedKey)?.item.labels
+                if (labels != null) {
+                  for (const label of labels) {
+                    if (payload.has(label)) {
+                      labelsPresent += 1
                     }
                   }
                 }
-                const shouldAdd = labelsPresent * 2 < ids.size * payload.size
-                window.setTimeout(() => {
-                  dispatchAssetEvent({
-                    type: shouldAdd ? AssetEventType.addLabels : AssetEventType.removeLabels,
-                    ids,
-                    labelNames: payload,
-                  })
-                })
-              } else {
-                window.setTimeout(() => {
-                  dispatchAssetEvent({
-                    type: AssetEventType.temporarilyAddLabels,
-                    ids,
-                    labelNames: set.EMPTY,
-                  })
-                })
               }
-              return oldSelectedKeys
-            })
+              const shouldAdd = labelsPresent * 2 < ids.size * payload.size
+              dispatchAssetEvent({
+                type: shouldAdd ? AssetEventType.addLabels : AssetEventType.removeLabels,
+                ids,
+                labelNames: payload,
+              })
+            } else {
+              dispatchAssetEvent({
+                type: AssetEventType.temporarilyAddLabels,
+                ids,
+                labelNames: set.EMPTY,
+              })
+            }
           }}
         />
       )
@@ -2057,7 +2033,7 @@ export default function AssetsTable(props: AssetsTableProps) {
             selectedKeys={selectedKeys}
             nodeMapRef={nodeMapRef}
             event={event}
-            setSelectedKeys={setSelectedKeys}
+            clearSelectedKeys={clearSelectedKeys}
             dispatchAssetEvent={dispatchAssetEvent}
             dispatchAssetListEvent={dispatchAssetListEvent}
             doCopy={doCopy}
@@ -2073,15 +2049,10 @@ export default function AssetsTable(props: AssetsTableProps) {
           event.relatedTarget instanceof Node &&
           !event.currentTarget.contains(event.relatedTarget)
         ) {
-          setSelectedKeys(oldSelectedKeys => {
-            window.setTimeout(() => {
-              dispatchAssetEvent({
-                type: AssetEventType.temporarilyAddLabels,
-                ids: oldSelectedKeys,
-                labelNames: set.EMPTY,
-              })
-            })
-            return oldSelectedKeys
+          dispatchAssetEvent({
+            type: AssetEventType.temporarilyAddLabels,
+            ids: selectedKeysRef.current,
+            labelNames: set.EMPTY,
           })
         }
       }}
@@ -2100,6 +2071,9 @@ export default function AssetsTable(props: AssetsTableProps) {
 
       <div
         className="grow"
+        onClick={() => {
+          setSelectedKeys(new Set())
+        }}
         onDragEnter={onDragOver}
         onDragOver={onDragOver}
         onDrop={event => {
diff --git a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTableContextMenu.tsx b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTableContextMenu.tsx
index 1e9b3cd54aed..5b5a26dd50e5 100644
--- a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTableContextMenu.tsx
+++ b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/AssetsTableContextMenu.tsx
@@ -43,9 +43,9 @@ const pluralize = string.makePluralize('item', 'items')
 export interface AssetsTableContextMenuProps {
   readonly hidden?: boolean
   readonly category: Category
-  readonly pasteData: pasteDataModule.PasteData<Set<backendModule.AssetId>> | null
-  readonly selectedKeys: Set<backendModule.AssetId>
-  readonly setSelectedKeys: (items: Set<backendModule.AssetId>) => void
+  readonly pasteData: pasteDataModule.PasteData<ReadonlySet<backendModule.AssetId>> | null
+  readonly selectedKeys: ReadonlySet<backendModule.AssetId>
+  readonly clearSelectedKeys: () => void
   readonly nodeMapRef: React.MutableRefObject<ReadonlyMap<backendModule.AssetId, AssetTreeNode>>
   readonly event: Pick<React.MouseEvent<Element, MouseEvent>, 'pageX' | 'pageY'>
   readonly dispatchAssetEvent: (event: assetEvent.AssetEvent) => void
@@ -61,7 +61,7 @@ export interface AssetsTableContextMenuProps {
 /** A context menu for an `AssetsTable`, when no row is selected, or multiple rows
  * are selected. */
 export default function AssetsTableContextMenu(props: AssetsTableContextMenuProps) {
-  const { category, pasteData, selectedKeys, setSelectedKeys, nodeMapRef, event } = props
+  const { category, pasteData, selectedKeys, clearSelectedKeys, nodeMapRef, event } = props
   const { dispatchAssetEvent, dispatchAssetListEvent, hidden = false } = props
   const { doCopy, doCut, doPaste } = props
   const { backend } = backendProvider.useBackend()
@@ -91,20 +91,14 @@ export default function AssetsTableContextMenu(props: AssetsTableContextMenuProp
   const doDeleteAll = () => {
     if (isCloud) {
       unsetModal()
-      dispatchAssetEvent({
-        type: AssetEventType.delete,
-        ids: selectedKeys,
-      })
+      dispatchAssetEvent({ type: AssetEventType.delete, ids: selectedKeys })
     } else {
       setModal(
         <ConfirmDeleteModal
           description={`${selectedKeys.size} selected ${pluralized}`}
           doDelete={() => {
-            setSelectedKeys(new Set())
-            dispatchAssetEvent({
-              type: AssetEventType.delete,
-              ids: selectedKeys,
-            })
+            clearSelectedKeys()
+            dispatchAssetEvent({ type: AssetEventType.delete, ids: selectedKeys })
           }}
         />
       )
diff --git a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/Chat.tsx b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/Chat.tsx
index cf0a98affc97..69831b49cfa8 100644
--- a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/Chat.tsx
+++ b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/Chat.tsx
@@ -748,7 +748,6 @@ export default function Chat(props: ChatProps) {
           <textarea
             ref={messageInputRef}
             rows={1}
-            autoFocus
             required
             placeholder="Type your message ..."
             className="w-full rounded-lg bg-transparent resize-none p-1"
diff --git a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/UserBar.tsx b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/UserBar.tsx
index e59a140da9ef..bfdf2cee09be 100644
--- a/app/ide-desktop/lib/dashboard/src/layouts/dashboard/UserBar.tsx
+++ b/app/ide-desktop/lib/dashboard/src/layouts/dashboard/UserBar.tsx
@@ -55,8 +55,14 @@ export default function UserBar(props: UserBarProps) {
     self != null
   const shouldShowInviteButton =
     sessionType === authProvider.UserSessionType.full && !shouldShowShareButton
+  const shouldMakeSpaceForExtendedEditorMenu = page === pageSwitcher.Page.editor
   return (
-    <div className="flex shrink-0 items-center bg-frame backdrop-blur-3xl rounded-full gap-3 h-8 pl-2 pr-0.75 cursor-default pointer-events-auto">
+    <div
+      className={
+        'flex shrink-0 items-center bg-frame backdrop-blur-3xl rounded-full gap-3 h-8 pl-2 pr-0.75 cursor-default pointer-events-auto' +
+        (shouldMakeSpaceForExtendedEditorMenu ? ' mr-10' : '')
+      }
+    >
       <Button
         active={isHelpChatOpen}
         image={ChatIcon}
diff --git a/app/ide-desktop/lib/dashboard/src/pages/subscribe/Subscribe.tsx b/app/ide-desktop/lib/dashboard/src/pages/subscribe/Subscribe.tsx
new file mode 100644
index 000000000000..c0e85024936d
--- /dev/null
+++ b/app/ide-desktop/lib/dashboard/src/pages/subscribe/Subscribe.tsx
@@ -0,0 +1,164 @@
+/** @file A page in which the currently active payment plan can be changed. */
+import * as React from 'react'
+
+import * as stripeReact from '@stripe/react-stripe-js'
+import type * as stripeTypes from '@stripe/stripe-js'
+import * as stripe from '@stripe/stripe-js/pure'
+import * as toast from 'react-toastify'
+
+import * as appUtils from '#/appUtils'
+
+import * as navigateHooks from '#/hooks/navigateHooks'
+import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
+
+import * as backendProvider from '#/providers/BackendProvider'
+
+import Modal from '#/components/Modal'
+
+import * as backendModule from '#/services/Backend'
+
+import * as config from '#/utilities/config'
+import * as load from '#/utilities/load'
+import * as string from '#/utilities/string'
+
+// =================
+// === Constants ===
+// =================
+
+let stripePromise: Promise<stripeTypes.Stripe | null> | null = null
+
+/** The delay in milliseconds before redirecting back to the main page. */
+const REDIRECT_DELAY_MS = 1_500
+
+// =================
+// === Subscribe ===
+// =================
+
+/** A page in which the currently active payment plan can be changed.
+ *
+ * This page can be in one of several states:
+ *
+ * 1. Initial (i.e. `plan = null, clientSecret = '', sessionStatus = null`),
+ * 2. Plan selected (e.g. `plan = 'solo', clientSecret = '', sessionStatus = null`),
+ * 3. Session created (e.g. `plan = 'solo', clientSecret = 'cs_foo',
+ * sessionStatus.status = { status: 'open' || 'complete' || 'expired',
+ * paymentStatus: 'no_payment_required' || 'paid' || 'unpaid' }`),
+ * 4. Session complete (e.g. `plan = 'solo', clientSecret = 'cs_foo',
+ * sessionStatus.status = { status: 'complete',
+ * paymentStatus: 'no_payment_required' || 'paid' || 'unpaid' }`). */
+export default function Subscribe() {
+  const stripeKey = config.ACTIVE_CONFIG.stripeKey
+  const navigate = navigateHooks.useNavigate()
+  // Plan that the user has currently selected, if any (e.g., 'solo', 'team', etc.).
+  const [plan, setPlan] = React.useState(() => {
+    const initialPlan = new URLSearchParams(location.search).get('plan')
+    return backendModule.isPlan(initialPlan) ? initialPlan : backendModule.Plan.solo
+  })
+  // A client secret used to access details about a Checkout Session on the Stripe API. A Checkout
+  // Session represents a customer's session as they are in the process of paying for a
+  // subscription. The client secret is provided by Stripe when the Checkout Session is created.
+  const [clientSecret, setClientSecret] = React.useState('')
+  // The ID of a Checkout Session on the Stripe API. This is the same as the client secret, minus
+  // the secret part. Without the secret part, the session ID can be safely stored in the URL
+  // query.
+  const [sessionId, setSessionId] = React.useState<backendModule.CheckoutSessionId | null>(null)
+  // The status of a Checkout Session on the Stripe API. This stores whether or not the Checkout
+  // Session is complete (i.e., the user has provided payment information), and if so, whether
+  // payment has been confirmed.
+  const [sessionStatus, setSessionStatus] =
+    React.useState<backendModule.CheckoutSessionStatus | null>(null)
+  const { backend } = backendProvider.useBackend()
+  const toastAndLog = toastAndLogHooks.useToastAndLog()
+
+  if (stripePromise == null) {
+    stripePromise = load.loadScript('https://js.stripe.com/v3/').then(async script => {
+      const innerStripe = await stripe.loadStripe(stripeKey)
+      script.remove()
+      return innerStripe
+    })
+  }
+
+  React.useEffect(() => {
+    void (async () => {
+      try {
+        const checkoutSession = await backend.createCheckoutSession(plan)
+        setClientSecret(checkoutSession.clientSecret)
+        setSessionId(checkoutSession.id)
+      } catch (error) {
+        toastAndLog(null, error)
+      }
+    })()
+  }, [backend, plan, /* should never change */ toastAndLog])
+
+  React.useEffect(() => {
+    if (sessionStatus?.status === 'complete') {
+      toast.toast.success('Your plan has successfully been upgraded!')
+      window.setTimeout(() => {
+        navigate(appUtils.DASHBOARD_PATH)
+      }, REDIRECT_DELAY_MS)
+    }
+  }, [sessionStatus?.status, navigate])
+
+  const onComplete = React.useCallback(() => {
+    if (sessionId != null) {
+      void (async () => {
+        try {
+          setSessionStatus(await backend.getCheckoutSession(sessionId))
+        } catch (error) {
+          toastAndLog(null, error)
+        }
+      })()
+    }
+    // Stripe does not allow this callback to change.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sessionId])
+
+  return (
+    <Modal centered className="bg-black/10 text-primary text-xs">
+      <div
+        data-testid="subscribe-modal"
+        className="flex flex-col gap-2 bg-frame-selected backdrop-blur-3xl rounded-2xl p-8 w-full max-w-md max-h-[100vh]"
+        onClick={event => {
+          event.stopPropagation()
+        }}
+      >
+        <div className="self-center text-xl">Upgrade to {string.capitalizeFirst(plan)}</div>
+        <div className="flex items-stretch rounded-full bg-gray-500/30 text-base h-8">
+          {backendModule.PLANS.map(newPlan => (
+            <button
+              key={newPlan}
+              disabled={plan === newPlan}
+              type="button"
+              className="flex-1 grow rounded-full disabled:bg-frame"
+              onClick={event => {
+                event.stopPropagation()
+                setPlan(newPlan)
+              }}
+            >
+              {string.capitalizeFirst(newPlan)}
+            </button>
+          ))}
+        </div>
+        {sessionId && clientSecret ? (
+          <div className="overflow-auto">
+            <stripeReact.EmbeddedCheckoutProvider
+              key={sessionId}
+              stripe={stripePromise}
+              // Above, `sessionId` is updated when the `checkoutSession` is created.
+              // This triggers a fetch of the session's `status`.
+              // The `status` is not going to be `complete` at that point
+              // (unless the user completes the checkout process before the fetch is complete).
+              // So the `status` needs to be fetched again when the `checkoutSession` is updated.
+              // This is done by passing a function to `onComplete`.
+              options={{ clientSecret, onComplete }}
+            >
+              <stripeReact.EmbeddedCheckout />
+            </stripeReact.EmbeddedCheckoutProvider>
+          </div>
+        ) : (
+          <div className="h-155 transition-all"></div>
+        )}
+      </div>
+    </Modal>
+  )
+}
diff --git a/app/ide-desktop/lib/dashboard/src/services/Backend.ts b/app/ide-desktop/lib/dashboard/src/services/Backend.ts
index f9a472b2d8a0..7c4bacd1c190 100644
--- a/app/ide-desktop/lib/dashboard/src/services/Backend.ts
+++ b/app/ide-desktop/lib/dashboard/src/services/Backend.ts
@@ -1,6 +1,7 @@
 /** @file Type definitions common between all backends. */
 import type * as React from 'react'
 
+import * as array from '#/utilities/array'
 import * as dateTime from '#/utilities/dateTime'
 import * as newtype from '#/utilities/newtype'
 import * as permissions from '#/utilities/permissions'
@@ -49,6 +50,10 @@ export const ConnectorId = newtype.newtypeConstructor<ConnectorId>()
 /** Unique identifier for an arbitrary asset. */
 export type AssetId = IdType[keyof IdType]
 
+/** Unique identifier for a payment checkout session. */
+export type CheckoutSessionId = newtype.Newtype<string, 'CheckoutSessionId'>
+export const CheckoutSessionId = newtype.newtypeConstructor<CheckoutSessionId>()
+
 /** The name of an asset label. */
 export type LabelName = newtype.Newtype<string, 'LabelName'>
 export const LabelName = newtype.newtypeConstructor<LabelName>()
@@ -310,6 +315,34 @@ export interface Version {
   readonly version_type: VersionType
 }
 
+/** Subscription plans. */
+export enum Plan {
+  solo = 'solo',
+  team = 'team',
+}
+
+export const PLANS = Object.values(Plan)
+
+// This is a function, even though it does not look like one.
+// eslint-disable-next-line no-restricted-syntax
+export const isPlan = array.includesPredicate(PLANS)
+
+/** Metadata uniquely describing a payment checkout session. */
+export interface CheckoutSession {
+  /** ID of the checkout session, suffixed with a secret value. */
+  readonly clientSecret: string
+  /** ID of the checkout session. */
+  readonly id: CheckoutSessionId
+}
+
+/** Metadata describing the status of a payment checkout session. */
+export interface CheckoutSessionStatus {
+  /** Status of the payment for the checkout session. */
+  readonly paymentStatus: string
+  /** Status of the checkout session. */
+  readonly status: string
+}
+
 /** Resource usage of a VM. */
 export interface ResourceUsage {
   /** Percentage of memory used. */
@@ -859,6 +892,11 @@ export interface CreateTagRequestBody {
   readonly color: LChColor
 }
 
+/** HTTP request body for the "create checkout session" endpoint. */
+export interface CreateCheckoutSessionRequestBody {
+  plan: Plan
+}
+
 /** URL query string parameters for the "list directory" endpoint. */
 export interface ListDirectoryRequestParams {
   readonly parentId: string | null
@@ -1086,4 +1124,8 @@ export default abstract class Backend {
   abstract deleteTag(tagId: TagId, value: LabelName): Promise<void>
   /** Return a list of backend or IDE versions. */
   abstract listVersions(params: ListVersionsRequestParams): Promise<Version[]>
+  /** Create a payment checkout session. */
+  abstract createCheckoutSession(plan: Plan): Promise<CheckoutSession>
+  /** Get the status of a payment checkout session. */
+  abstract getCheckoutSession(sessionId: CheckoutSessionId): Promise<CheckoutSessionStatus>
 }
diff --git a/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts b/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts
index b332adbe6bed..bf74e42e09ca 100644
--- a/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts
+++ b/app/ide-desktop/lib/dashboard/src/services/LocalBackend.ts
@@ -475,4 +475,14 @@ export default class LocalBackend extends Backend {
   override deleteTag() {
     return Promise.resolve()
   }
+
+  /** Invalid operation. */
+  override createCheckoutSession() {
+    return this.invalidOperation()
+  }
+
+  /** Invalid operation. */
+  override getCheckoutSession() {
+    return this.invalidOperation()
+  }
 }
diff --git a/app/ide-desktop/lib/dashboard/src/services/RemoteBackend.ts b/app/ide-desktop/lib/dashboard/src/services/RemoteBackend.ts
index f81318e99acb..6c4929393626 100644
--- a/app/ide-desktop/lib/dashboard/src/services/RemoteBackend.ts
+++ b/app/ide-desktop/lib/dashboard/src/services/RemoteBackend.ts
@@ -856,6 +856,36 @@ export default class RemoteBackend extends Backend {
     }
   }
 
+  /** Create a payment checkout session.
+   * @throws An error if a non-successful status code (not 200-299) was received. */
+  override async createCheckoutSession(
+    plan: backendModule.Plan
+  ): Promise<backendModule.CheckoutSession> {
+    const response = await this.post<backendModule.CheckoutSession>(
+      remoteBackendPaths.CREATE_CHECKOUT_SESSION_PATH,
+      { plan } satisfies backendModule.CreateCheckoutSessionRequestBody
+    )
+    if (!responseIsSuccessful(response)) {
+      return this.throw(`Could not create checkout session for plan '${plan}'.`)
+    } else {
+      return await response.json()
+    }
+  }
+
+  /** Gets the status of a payment checkout session.
+   * @throws An error if a non-successful status code (not 200-299) was received. */
+  override async getCheckoutSession(
+    sessionId: backendModule.CheckoutSessionId
+  ): Promise<backendModule.CheckoutSessionStatus> {
+    const path = remoteBackendPaths.getCheckoutSessionPath(sessionId)
+    const response = await this.get<backendModule.CheckoutSessionStatus>(path)
+    if (!responseIsSuccessful(response)) {
+      return this.throw(`Could not get checkout session for session ID '${sessionId}'.`)
+    } else {
+      return await response.json()
+    }
+  }
+
   /** Get the default version given the type of version (IDE or backend). */
   protected async getDefaultVersion(versionType: backendModule.VersionType) {
     const cached = this.defaultVersions[versionType]
diff --git a/app/ide-desktop/lib/dashboard/src/services/remoteBackendPaths.ts b/app/ide-desktop/lib/dashboard/src/services/remoteBackendPaths.ts
index a1d7153030a2..e12fd2229ba6 100644
--- a/app/ide-desktop/lib/dashboard/src/services/remoteBackendPaths.ts
+++ b/app/ide-desktop/lib/dashboard/src/services/remoteBackendPaths.ts
@@ -55,6 +55,10 @@ export const CREATE_TAG_PATH = 'tags'
 export const LIST_TAGS_PATH = 'tags'
 /** Relative HTTP path to the "list versions" endpoint of the Cloud backend API. */
 export const LIST_VERSIONS_PATH = 'versions'
+/** Relative HTTP path to the "create checkout session" endpoint of the Cloud backend API. */
+export const CREATE_CHECKOUT_SESSION_PATH = 'payments/checkout-sessions'
+/** Relative HTTP path to the "get checkout session" endpoint of the Cloud backend API. */
+export const GET_CHECKOUT_SESSION_PATH = 'payments/checkout-sessions'
 /** Relative HTTP path to the "list asset versions" endpoint of the Cloud backend API. */
 export function listAssetVersionsPath(assetId: backend.AssetId) {
   return `assets/${assetId}/versions`
@@ -119,3 +123,7 @@ export function associateTagPath(assetId: backend.AssetId) {
 export function deleteTagPath(tagId: backend.TagId) {
   return `tags/${tagId}`
 }
+/** Relative HTTP path to the "get checkout session" endpoint of the Cloud backend API. */
+export function getCheckoutSessionPath(checkoutSessionId: backend.CheckoutSessionId) {
+  return `payments/checkout-sessions/${checkoutSessionId}`
+}
diff --git a/app/ide-desktop/lib/dashboard/src/utilities/__tests__/jsonSchema.test.ts b/app/ide-desktop/lib/dashboard/src/utilities/__tests__/jsonSchema.test.ts
index 945402f85fec..c15025793a6a 100644
--- a/app/ide-desktop/lib/dashboard/src/utilities/__tests__/jsonSchema.test.ts
+++ b/app/ide-desktop/lib/dashboard/src/utilities/__tests__/jsonSchema.test.ts
@@ -9,7 +9,7 @@ import * as jsonSchema from '#/utilities/jsonSchema'
 // =============
 
 fc.test.prop({
-  value: fc.fc.anything(),
+  value: fc.fc.anything({ withNullPrototype: true }),
 })('converting between constant value and schema', ({ value }) => {
   const schema = jsonSchema.constantValueToSchema(value)
   if (schema != null) {
@@ -25,6 +25,25 @@ fc.test.prop({
   }
 })
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+v.test.each([{ value: JSON.parse('{"__proto__":{}}') }])(
+  'converting between constant value and schema',
+  ({ value }) => {
+    const schema = jsonSchema.constantValueToSchema(value)
+    if (schema != null) {
+      const extractedValue = jsonSchema.constantValue({}, schema)[0]
+      v.expect(
+        extractedValue,
+        `\`${JSON.stringify(value)}\` should round trip to schema and back`
+      ).toEqual(value)
+      v.expect(
+        jsonSchema.isMatch({}, schema, value),
+        `\`${JSON.stringify(value)}\` should match its converted schema`
+      ).toBe(true)
+    }
+  }
+)
+
 const STRING_SCHEMA = { type: 'string' } as const
 fc.test.prop({ value: fc.fc.string() })('string schema', ({ value }) => {
   const constSchema = { const: value, type: 'string' }
diff --git a/app/ide-desktop/lib/dashboard/src/utilities/config.ts b/app/ide-desktop/lib/dashboard/src/utilities/config.ts
index a184882e2aeb..afea9bf09e07 100644
--- a/app/ide-desktop/lib/dashboard/src/utilities/config.ts
+++ b/app/ide-desktop/lib/dashboard/src/utilities/config.ts
@@ -46,7 +46,8 @@ const CLOUD_REDIRECTS = {
 /** All possible API URLs, sorted by environment. */
 const API_URLS = {
   pbuchu: ApiUrl('https://xw0g8j3tsb.execute-api.eu-west-1.amazonaws.com'),
-  npekin: ApiUrl('https://lkxuay3ha1.execute-api.eu-west-1.amazonaws.com'),
+  npekin: ApiUrl('https://opk1cxpwec.execute-api.eu-west-1.amazonaws.com'),
+  npekin2: ApiUrl('https://8rf1a7iy49.execute-api.eu-west-1.amazonaws.com'),
   production: ApiUrl('https://7aqkn3tnbc.execute-api.eu-west-1.amazonaws.com'),
 }
 
@@ -60,22 +61,41 @@ const CHAT_URLS = {
   production: ChatUrl('wss://chat.cloud.enso.org'),
 }
 
+/** All possible Stripe API public keys, sorted by environment. */
+const STRIPE_KEYS = {
+  npekin:
+    'pk_test_51O8REgAjUAkYBrsQooU5iMWumr7D4Vf9H2A671A8zXV87VwDOTenDbJx5g3PN9IjgkbK6omxlp01bGfghA3qZSIu00lYsytprU',
+  development:
+    'pk_test_51Iv1a0FpIovSdxvQBRpzZpfikr7CD6DFWFF8g2ycjut3d9PXD2Jc9I2j3G1DWWgMfaNzzHyXtvUr2GaNkuQayEzu00YHYfKtGC',
+  production:
+    'pk_test_51Iv3YNB30SZwisesLWKD1KCUmkkOy2Bbq0zwYO56zgSjdIf00Bw39BC1Zvn4PPjq6GHZd8Q8oaR6M0JlC1K9b1f1007cjnwi4e',
+} as const
+
 /** All possible configuration options, sorted by environment. */
 const CONFIGS = {
   npekin: {
     cloudRedirect: CLOUD_REDIRECTS.development,
     apiUrl: API_URLS.npekin,
     chatUrl: CHAT_URLS.development,
+    stripeKey: STRIPE_KEYS.npekin,
+  } satisfies Config,
+  npekin2: {
+    cloudRedirect: CLOUD_REDIRECTS.development,
+    apiUrl: API_URLS.npekin2,
+    chatUrl: CHAT_URLS.development,
+    stripeKey: STRIPE_KEYS.npekin,
   } satisfies Config,
   pbuchu: {
     cloudRedirect: CLOUD_REDIRECTS.development,
     apiUrl: API_URLS.pbuchu,
     chatUrl: CHAT_URLS.development,
+    stripeKey: STRIPE_KEYS.development,
   } satisfies Config,
   production: {
     cloudRedirect: CLOUD_REDIRECTS.production,
     apiUrl: API_URLS.production,
     chatUrl: CHAT_URLS.production,
+    stripeKey: STRIPE_KEYS.production,
   } satisfies Config,
 }
 /** Export the configuration that is currently in use. */
@@ -95,6 +115,10 @@ export interface Config {
   readonly apiUrl: ApiUrl
   /** URL to the websocket endpoint of the Help Chat. */
   readonly chatUrl: ChatUrl
+  /** Key used to authenticate with the Stripe API. Must point at the same Stripe account that the
+   * backend is configured to use (though the backend will use a secret key, while this component
+   * uses a public key). */
+  readonly stripeKey: string
 }
 
 // ===================
@@ -103,4 +127,4 @@ export interface Config {
 
 /** Possible values for the environment/user we're running for and whose infrastructure we're
  * testing against. */
-export type Environment = 'npekin' | 'pbuchu' | 'production'
+export type Environment = 'npekin' | 'npekin2' | 'pbuchu' | 'production'
diff --git a/app/ide-desktop/lib/dashboard/src/utilities/jsonSchema.ts b/app/ide-desktop/lib/dashboard/src/utilities/jsonSchema.ts
index 4689eb7b5c68..3e6fc8060b20 100644
--- a/app/ide-desktop/lib/dashboard/src/utilities/jsonSchema.ts
+++ b/app/ide-desktop/lib/dashboard/src/utilities/jsonSchema.ts
@@ -56,7 +56,7 @@ export function constantValueToSchema(value: unknown): object | null {
             result = null
             break
           }
-          properties[key] = schema
+          Object.defineProperty(properties, key, { value: schema, enumerable: true })
         }
       }
       break
@@ -144,7 +144,7 @@ function constantValueHelper(
             result = []
             break
           } else {
-            object[key] = value[0] ?? null
+            Object.defineProperty(object, key, { value: value[0] ?? null, enumerable: true })
           }
         }
         break
diff --git a/app/ide-desktop/lib/dashboard/src/utilities/set.ts b/app/ide-desktop/lib/dashboard/src/utilities/set.ts
index f525a5002c78..a89623b514e8 100644
--- a/app/ide-desktop/lib/dashboard/src/utilities/set.ts
+++ b/app/ide-desktop/lib/dashboard/src/utilities/set.ts
@@ -23,7 +23,7 @@ export function setPresence<T>(set: Set<T>, value: T, presence: boolean) {
  *
  * This is an immutable version of {@link setPresence}, so it returns a new set if the old set
  * would have been mutated, and returns the original set if it would not have been mutated. */
-export function withPresence<T>(set: Set<T>, value: T, presence: boolean) {
+export function withPresence<T>(set: ReadonlySet<T>, value: T, presence: boolean) {
   if (presence === set.has(value)) {
     return set
   } else {
diff --git a/app/ide-desktop/lib/dashboard/tailwind.config.js b/app/ide-desktop/lib/dashboard/tailwind.config.js
index 43c2159c1e03..ed2ca5663c06 100644
--- a/app/ide-desktop/lib/dashboard/tailwind.config.js
+++ b/app/ide-desktop/lib/dashboard/tailwind.config.js
@@ -103,6 +103,7 @@ export default /** @satisfies {import('tailwindcss').Config} */ ({
         115.25: '28.8125rem',
         120: '30rem',
         140: '35rem',
+        155: '38.75rem',
         '10lh': '10lh',
       },
       minHeight: {
diff --git a/app/ide-desktop/lib/dashboard/vite.config.ts b/app/ide-desktop/lib/dashboard/vite.config.ts
index d9b9c87ac0cf..b9ad9f4bb88e 100644
--- a/app/ide-desktop/lib/dashboard/vite.config.ts
+++ b/app/ide-desktop/lib/dashboard/vite.config.ts
@@ -5,8 +5,6 @@ import vitePluginYaml from '@modyfi/vite-plugin-yaml'
 import vitePluginReact from '@vitejs/plugin-react'
 import * as vite from 'vite'
 
-import * as common from 'enso-common'
-
 // =================
 // === Constants ===
 // =================
@@ -20,7 +18,7 @@ const SERVER_PORT = 8080
 /* eslint-disable @typescript-eslint/naming-convention */
 
 export default vite.defineConfig({
-  server: { port: SERVER_PORT, headers: Object.fromEntries(common.COOP_COEP_CORP_HEADERS) },
+  server: { port: SERVER_PORT },
   plugins: [
     vitePluginReact({
       include: '**/*.tsx',
diff --git a/app/ide-desktop/package.json b/app/ide-desktop/package.json
index cc09ca060334..2b708228481a 100644
--- a/app/ide-desktop/package.json
+++ b/app/ide-desktop/package.json
@@ -32,6 +32,8 @@
     "lint": "npm run --workspace=enso-gui2 compile-server && npm run lint-only"
   },
   "dependencies": {
+    "@stripe/react-stripe-js": "^2.3.1",
+    "@stripe/stripe-js": "^2.1.10",
     "esbuild-plugin-inline-image": "^0.0.9",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0"
diff --git a/build.sbt b/build.sbt
index f01c0a96f761..92bd4f1ed074 100644
--- a/build.sbt
+++ b/build.sbt
@@ -27,11 +27,11 @@ val scalacVersion = "2.13.11"
 // source version of the Java language
 val javaVersion = "21"
 // version of the GraalVM JDK
-val graalVersion = "21.0.1"
+val graalVersion = "21.0.2"
 // Version used for the Graal/Truffle related Maven packages
 // Keep in sync with GraalVM.version. Do not change the name of this variable,
 // it is used by the Rust build script via regex matching.
-val graalMavenPackagesVersion = "23.1.0"
+val graalMavenPackagesVersion = "23.1.2"
 val targetJavaVersion         = "17"
 val defaultDevEnsoVersion     = "0.0.0-dev"
 val ensoVersion = sys.env.getOrElse(
@@ -47,9 +47,24 @@ val currentEdition = sys.env.getOrElse(
 val stdLibVersion       = defaultDevEnsoVersion
 val targetStdlibVersion = ensoVersion
 
-Global / onLoad := GraalVM.addVersionCheck(
-  graalMavenPackagesVersion
-)((Global / onLoad).value)
+lazy val graalVMVersionCheck = taskKey[Unit]("Check GraalVM and Java versions")
+graalVMVersionCheck := {
+  GraalVM.versionCheck(
+    graalVersion,
+    graalMavenPackagesVersion,
+    javaVersion,
+    state.value.log
+  )
+}
+
+// Inspired by https://www.scala-sbt.org/1.x/docs/Howto-Startup.html#How+to+take+an+action+on+startup
+lazy val startupStateTransition: State => State = { s: State =>
+  "graalVMVersionCheck" :: s
+}
+Global / onLoad := {
+  val old = (Global / onLoad).value
+  startupStateTransition compose old
+}
 
 /* Note [Engine And Launcher Version]
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -303,12 +318,14 @@ lazy val enso = (project in file("."))
     `runtime-version-manager`,
     `runtime-version-manager-test`,
     editions,
+    semver,
     `distribution-manager`,
     `edition-updater`,
     `edition-uploader`,
     `library-manager`,
     `library-manager-test`,
     `connected-lock-manager`,
+    `connected-lock-manager-server`,
     syntax,
     testkit,
     `common-polyglot-core-utils`,
@@ -470,7 +487,6 @@ val zio = Seq(
 // === Other ==================================================================
 
 val bcpkixJdk15Version      = "1.70"
-val bumpVersion             = "0.1.3"
 val declineVersion          = "2.4.1"
 val directoryWatcherVersion = "0.18.0"
 val flatbuffersVersion      = "1.12.0"
@@ -734,8 +750,7 @@ lazy val `logging-service` = project
     libraryDependencies ++= Seq(
       "org.slf4j"      % "slf4j-api" % slf4jVersion,
       "com.typesafe"   % "config"    % typesafeConfigVersion,
-      "org.scalatest" %% "scalatest" % scalatestVersion % Test,
-      akkaHttp
+      "org.scalatest" %% "scalatest" % scalatestVersion % Test
     )
   )
   .dependsOn(`logging-utils`)
@@ -1383,7 +1398,7 @@ lazy val `language-server` = (project in file("engine/language-server"))
   .dependsOn(`json-rpc-server`)
   .dependsOn(`task-progress-notifications`)
   .dependsOn(`library-manager`)
-  .dependsOn(`connected-lock-manager`)
+  .dependsOn(`connected-lock-manager-server`)
   .dependsOn(`edition-updater`)
   .dependsOn(`logging-utils-akka`)
   .dependsOn(`logging-service`)
@@ -1800,6 +1815,7 @@ lazy val `runtime-integration-tests` =
     .dependsOn(`runtime-test-instruments`)
     .dependsOn(`logging-service-logback` % "test->test")
     .dependsOn(testkit % Test)
+    .dependsOn(`connected-lock-manager-server`)
 
 /** A project that holds only benchmarks for `runtime`. Unlike `runtime-integration-tests`, its execution requires
   * the whole `runtime-fat-jar` assembly, as we want to be as close to the enso distribution as possible.
@@ -2222,7 +2238,6 @@ lazy val launcher = project
     libraryDependencies ++= Seq(
       "com.typesafe.scala-logging" %% "scala-logging"    % scalaLoggingVersion,
       "org.typelevel"              %% "cats-core"        % catsVersion,
-      "nl.gn0s1s"                  %% "bump"             % bumpVersion,
       "org.apache.commons"          % "commons-compress" % commonsCompressVersion,
       "org.scalatest"              %% "scalatest"        % scalatestVersion % Test,
       akkaSLF4J
@@ -2452,10 +2467,8 @@ lazy val editions = project
   .configs(Test)
   .settings(
     frgaalJavaCompilerSetting,
-    resolvers += Resolver.bintrayRepo("gn0s1s", "releases"),
     libraryDependencies ++= Seq(
       "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
-      "nl.gn0s1s"                  %% "bump"          % bumpVersion,
       "io.circe"                   %% "circe-yaml"    % circeYamlVersion,
       "org.scalatest"              %% "scalatest"     % scalatestVersion % Test
     )
@@ -2476,24 +2489,60 @@ lazy val editions = project
       .value,
     cleanFiles += baseDirectory.value / ".." / ".." / "distribution" / "editions"
   )
+  .dependsOn(semver)
+  .dependsOn(testkit % Test)
+
+lazy val semver = project
+  .in(file("lib/scala/semver"))
+  .configs(Test)
+  .settings(
+    frgaalJavaCompilerSetting,
+    libraryDependencies ++= Seq(
+      "com.typesafe.scala-logging" %% "scala-logging"   % scalaLoggingVersion,
+      "io.circe"                   %% "circe-yaml"      % circeYamlVersion,
+      "org.scalatest"              %% "scalatest"       % scalatestVersion % Test,
+      "junit"                       % "junit"           % junitVersion     % Test,
+      "com.github.sbt"              % "junit-interface" % junitIfVersion   % Test
+    )
+  )
+  .settings(
+    (Compile / compile) := (Compile / compile)
+      .dependsOn(
+        Def.task {
+          Editions.writeEditionConfig(
+            editionsRoot   = file("distribution") / "editions",
+            ensoVersion    = ensoVersion,
+            editionName    = currentEdition,
+            libraryVersion = stdLibVersion,
+            log            = streams.value.log
+          )
+        }
+      )
+      .value,
+    cleanFiles += baseDirectory.value / ".." / ".." / "distribution" / "editions"
+  )
   .dependsOn(testkit % Test)
 
 lazy val downloader = (project in file("lib/scala/downloader"))
   .settings(
     frgaalJavaCompilerSetting,
+    // Fork the tests to make sure that the withDebug command works (we can
+    // attach debugger to the subprocess)
+    (Test / fork) := true,
+    commands += WithDebugCommand.withDebug,
     version := "0.1",
     libraryDependencies ++= circe ++ Seq(
       "com.typesafe.scala-logging" %% "scala-logging"    % scalaLoggingVersion,
       "commons-io"                  % "commons-io"       % commonsIoVersion,
       "org.apache.commons"          % "commons-compress" % commonsCompressVersion,
       "org.scalatest"              %% "scalatest"        % scalatestVersion % Test,
-      akkaActor,
-      akkaStream,
-      akkaHttp,
-      akkaSLF4J
+      "junit"                       % "junit"            % junitVersion     % Test,
+      "com.github.sbt"              % "junit-interface"  % junitIfVersion   % Test,
+      "org.hamcrest"                % "hamcrest-all"     % hamcrestVersion  % Test
     )
   )
   .dependsOn(cli)
+  .dependsOn(`http-test-helper`)
 
 lazy val `edition-updater` = project
   .in(file("lib/scala/edition-updater"))
@@ -2542,6 +2591,7 @@ lazy val `library-manager-test` = project
   .settings(
     frgaalJavaCompilerSetting,
     Test / fork := true,
+    commands += WithDebugCommand.withDebug,
     Test / javaOptions ++= testLogProviderOptions,
     Test / test := (Test / test).tag(simpleLibraryServerTag).value,
     libraryDependencies ++= Seq(
@@ -2557,6 +2607,22 @@ lazy val `library-manager-test` = project
 lazy val `connected-lock-manager` = project
   .in(file("lib/scala/connected-lock-manager"))
   .configs(Test)
+  .settings(
+    frgaalJavaCompilerSetting,
+    libraryDependencies ++= Seq(
+      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+      "org.scalatest"              %% "scalatest"     % scalatestVersion % Test
+    )
+  )
+  .dependsOn(`distribution-manager`)
+  .dependsOn(`connected-lock-manager-server` % "test->test")
+  .dependsOn(`polyglot-api`)
+
+/** Unlike `connected-lock-manager` project, has a dependency on akka.
+  */
+lazy val `connected-lock-manager-server` = project
+  .in(file("lib/scala/connected-lock-manager-server"))
+  .configs(Test)
   .settings(
     frgaalJavaCompilerSetting,
     libraryDependencies ++= Seq(
@@ -2579,7 +2645,6 @@ lazy val `runtime-version-manager` = project
     libraryDependencies ++= Seq(
       "com.typesafe.scala-logging" %% "scala-logging"    % scalaLoggingVersion,
       "org.typelevel"              %% "cats-core"        % catsVersion,
-      "nl.gn0s1s"                  %% "bump"             % bumpVersion,
       "org.apache.commons"          % "commons-compress" % commonsCompressVersion,
       "org.scalatest"              %% "scalatest"        % scalatestVersion % Test,
       akkaHttp
diff --git a/build/build/release-body.md b/build/build/release-body.md
index c4dee497c360..58bc65b6184e 100644
--- a/build/build/release-body.md
+++ b/build/build/release-body.md
@@ -15,10 +15,10 @@ Enso IDE is the main product of the Enso project. The packages are stand-alone,
 
 Download links:
 
-- [Linux]({{download_prefix}}/enso-linux-x86_64-{{version}}.AppImage) (AppImage);
-- [macOS (x64)]({{download_prefix}}/enso-mac-x64-{{version}}.dmg) (DMG);
-- [macOS (arm64)]({{download_prefix}}/enso-mac-arm64-{{version}}.dmg) (DMG);
-- [Windows]({{download_prefix}}/enso-win-x64-{{version}}.exe) (Installer Executable).
+- [Linux]({{download_prefix}}/ide2-enso-linux-x86_64-{{version}}.AppImage) (AppImage);
+- [macOS (x64)]({{download_prefix}}/ide2-enso-mac-x64-{{version}}.dmg) (DMG);
+- [macOS (arm64)]({{download_prefix}}/ide2-enso-mac-arm64-{{version}}.dmg) (DMG);
+- [Windows]({{download_prefix}}/ide2-enso-win-x64-{{version}}.exe) (Installer Executable).
 
 This is the recommended download for most users.
 
diff --git a/build/build/src/engine/sbt.rs b/build/build/src/engine/sbt.rs
index a628d4e6248a..90eae0ce8bf5 100644
--- a/build/build/src/engine/sbt.rs
+++ b/build/build/src/engine/sbt.rs
@@ -41,6 +41,10 @@ impl CommandProvider for Context {
         }
         // This prevents https://github.com/sbt/sbt-assembly/issues/496
         cmd.env(ide_ci::env::known::LC_ALL, ide_ci::env::known::C_UTF8);
+        // This prevents https://github.com/sbt/sbt/issues/6777#issuecomment-1613316167
+        cmd.set_env(ide_ci::programs::sbt::SBT_SERVER_FORCESTART, &true)?;
+        // Again. Preferably there should be no sbt server spawned at all.
+        cmd.apply(&sbt::ServerAutostart(false));
         Ok(cmd)
     }
 }
diff --git a/build/ci_utils/src/programs/sbt.rs b/build/ci_utils/src/programs/sbt.rs
index 7e7d5537f93c..0b90ea025dca 100644
--- a/build/ci_utils/src/programs/sbt.rs
+++ b/build/ci_utils/src/programs/sbt.rs
@@ -1,7 +1,26 @@
 use crate::prelude::*;
 
+use crate::define_env_var;
+use crate::program::command::Manipulator;
 
 
+
+define_env_var! {
+    /// Force the SBT server to start, avoiding `ServerAlreadyBootingException`.
+    /// See: https://github.com/sbt/sbt/issues/6777#issuecomment-1613316167
+    SBT_SERVER_FORCESTART, bool;
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct ServerAutostart(pub bool);
+impl Manipulator for ServerAutostart {
+    fn apply<C: IsCommandWrapper + ?Sized>(&self, command: &mut C) {
+        let arg = "sbt.server.autostart";
+        let arg = format!("-D{arg}={}", self.0);
+        command.arg(arg);
+    }
+}
+
 macro_rules! strong_string {
     ($name:ident($inner_ty:ty)) => {
         paste::paste! {
diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE
index 2ceedaf9c694..f96a2e61ae7d 100644
--- a/distribution/engine/THIRD-PARTY/NOTICE
+++ b/distribution/engine/THIRD-PARTY/NOTICE
@@ -181,11 +181,21 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `commons-codec.commons-codec-1.16.0`.
 
 
+'commons-codec', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-codec.commons-codec-1.9`.
+
+
 'commons-io', licensed under the Apache-2.0, is distributed with the engine.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `commons-io.commons-io-2.12.0`.
 
 
+'commons-logging', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-logging.commons-logging-1.2`.
+
+
 'izumi-reflect-thirdparty-boopickle-shaded_2.13', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `dev.zio.izumi-reflect-thirdparty-boopickle-shaded_2.13-2.3.8`.
@@ -266,11 +276,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `net.java.dev.jna.jna-5.12.1`.
 
 
-'bump_2.13', licensed under the MIT, is distributed with the engine.
-The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
-
-
 'commons-compress', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-compress-1.23.0`.
@@ -281,6 +286,21 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-lang3-3.12.0`.
 
 
+'commons-text', licensed under the Apache License, Version 2.0, is distributed with the engine.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-text-1.10.0`.
+
+
+'httpclient', licensed under the Apache License, Version 2.0, is distributed with the engine.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpclient-4.4.1`.
+
+
+'httpcore', licensed under the Apache License, Version 2.0, is distributed with the engine.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpcore-4.4.1`.
+
+
 'tika-core', licensed under the Apache License, Version 2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.apache.tika.tika-core-2.4.1`.
@@ -313,77 +333,77 @@ Copyright notices related to this dependency can be found in the directory `org.
 
 'js-language', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.js.js-language-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.js.js-language-23.1.2`.
 
 
 'llvm-api', licensed under the New BSD License (3-clause BSD license), is distributed with the engine.
 The license file can be found at `licenses/BSD-3-Clause`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.llvm.llvm-api-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.llvm.llvm-api-23.1.2`.
 
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
 
 
 'python-language', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-language-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-language-23.1.2`.
 
 
 'python-resources', licensed under the MIT License, is distributed with the engine.
 The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-resources-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.python.python-resources-23.1.2`.
 
 
 'regex', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.regex.regex-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.regex.regex-23.1.2`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
 
 
 'icu4j', licensed under the Unicode/ICU License, is distributed with the engine.
 The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.icu4j-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.icu4j-23.1.2`.
 
 
 'json', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.json-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.json-23.1.2`.
 
 
 'profiler-tool', licensed under the GNU General Public License, version 2, with the Classpath Exception, is distributed with the engine.
 The license file can be found at `licenses/GNU_General_Public_License__version_2__with_the_Classpath_Exception`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.profiler-tool-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.profiler-tool-23.1.2`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
 
 
 'truffle-nfi', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-23.1.2`.
 
 
 'truffle-nfi-libffi', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-libffi-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-libffi-23.1.2`.
 
 
 'jline', licensed under the The BSD License, is distributed with the engine.
@@ -401,11 +421,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.netbeans.api.org-openide-util-lookup-RELEASE180`.
 
 
-'reactive-streams', licensed under the CC0, is distributed with the engine.
-The license file can be found at `licenses/CC0`.
-Copyright notices related to this dependency can be found in the directory `org.reactivestreams.reactive-streams-1.0.3`.
-
-
 'reactive-streams', licensed under the MIT-0, is distributed with the engine.
 The license file can be found at `licenses/MIT-0`.
 Copyright notices related to this dependency can be found in the directory `org.reactivestreams.reactive-streams-1.0.4`.
diff --git a/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
new file mode 100644
index 000000000000..75b52484ea47
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
new file mode 100644
index 000000000000..147f78a298e5
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
@@ -0,0 +1,9 @@
+Apache Commons Codec
+Copyright 2002-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+contains test data from http://aspell.net/test/orig/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
diff --git a/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
new file mode 100644
index 000000000000..556bd03951d4
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/engine/THIRD-PARTY/licenses/CC0 b/distribution/engine/THIRD-PARTY/licenses/CC0
deleted file mode 100644
index 0e259d42c996..000000000000
--- a/distribution/engine/THIRD-PARTY/licenses/CC0
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
diff --git a/distribution/engine/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md b/distribution/engine/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
deleted file mode 100644
index 59eab77058a2..000000000000
--- a/distribution/engine/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018-2021 Philippus Baalman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
new file mode 100644
index 000000000000..4e1f8dbb8dec
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
@@ -0,0 +1,5 @@
+Apache Commons Text
+Copyright 2014-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/LICENSE b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
similarity index 97%
rename from distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/LICENSE
rename to distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
index c7d5a563ccb2..d64569567334 100644
--- a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/LICENSE
+++ b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,14 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
----------------
-
-Licenses for dependency projects can be found here:
-[http://akka.io/docs/akka/snapshot/project/licenses.html]
-
----------------
-
-akka-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
-moved into the source package `akka.protobuf` so as to avoid version conflicts.
-For license information see COPYING.protobuf
diff --git a/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
new file mode 100644
index 000000000000..c05d4e6e933f
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
@@ -0,0 +1,8 @@
+
+Apache HttpClient
+Copyright 1999-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
new file mode 100644
index 000000000000..54e4285f2d6a
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
@@ -0,0 +1,266 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+=========================================================================
+
+This project contains annotations in the package org.apache.http.annotation
+which are derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License
+(http://creativecommons.org/licenses/by/2.5)
+Full text: http://creativecommons.org/licenses/by/2.5/legalcode
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+    "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
+    "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
+    "Licensor" means the individual or entity that offers the Work under the terms of this License.
+    "Original Author" means the individual or entity who created the Work.
+    "Work" means the copyrightable work of authorship offered under the terms of this License.
+    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+    to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
+    to create and reproduce Derivative Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
+
+    For the avoidance of doubt, where the work is a musical composition:
+        Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
+        Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
+    Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+    You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
+    If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+    Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+    Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
diff --git a/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
new file mode 100644
index 000000000000..976db53ee327
--- /dev/null
+++ b/distribution/engine/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
@@ -0,0 +1,10 @@
+
+Apache HttpCore
+Copyright 2005-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.js.js-language-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.llvm.llvm-api-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.python.python-language-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.python.python-resources-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.regex.regex-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.0/LICENSE b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/LICENSE
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.0/LICENSE
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/LICENSE
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.0/NOTICE b/distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.2/NOTICE
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.0/NOTICE
rename to distribution/engine/THIRD-PARTY/org.graalvm.shadowed.json-23.1.2/NOTICE
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.tools.profiler-tool-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/NOTICES b/distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/NOTICES
similarity index 100%
rename from distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/NOTICES
rename to distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/NOTICES
diff --git a/distribution/engine/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES b/distribution/engine/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES
deleted file mode 100644
index bd0a85c0c769..000000000000
--- a/distribution/engine/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES
+++ /dev/null
@@ -1,10 +0,0 @@
-/************************************************************************
- * Licensed under Public Domain (CC0)                                    *
- *                                                                       *
- * To the extent possible under law, the person who associated CC0 with  *
- * this code has waived all copyright and related or neighboring         *
- * rights to this code.                                                  *
- *                                                                       *
- * You should have received a copy of the CC0 legalcode along with this  *
- * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
- ************************************************************************/
diff --git a/distribution/launcher/THIRD-PARTY/NOTICE b/distribution/launcher/THIRD-PARTY/NOTICE
index 0584a5a5f8a0..1e6a96b0bd32 100644
--- a/distribution/launcher/THIRD-PARTY/NOTICE
+++ b/distribution/launcher/THIRD-PARTY/NOTICE
@@ -21,6 +21,21 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.chuusai.shapeless_2.13-2.3.10`.
 
 
+'jackson-annotations', licensed under the The Apache Software License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-annotations-2.15.2`.
+
+
+'jackson-core', licensed under the The Apache Software License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-core-2.15.2`.
+
+
+'jackson-databind', licensed under the The Apache Software License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-databind-2.15.2`.
+
+
 'akka-actor_2.13', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor_2.13-2.6.20`.
@@ -41,21 +56,11 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-parsing_2.13-10.2.10`.
 
 
-'akka-protobuf-v3_2.13', licensed under the Apache-2.0, is distributed with the launcher.
-The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20`.
-
-
 'akka-slf4j_2.13', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-slf4j_2.13-2.6.20`.
 
 
-'akka-stream_2.13', licensed under the Apache-2.0, is distributed with the launcher.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-stream_2.13-2.6.20`.
-
-
 'config', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.config-1.4.2`.
@@ -66,9 +71,9 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.scala-logging.scala-logging_2.13-3.9.4`.
 
 
-'ssl-config-core_2.13', licensed under the Apache-2.0, is distributed with the launcher.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `com.typesafe.ssl-config-core_2.13-0.4.3`.
+'commons-codec', licensed under the The Apache Software License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-codec.commons-codec-1.9`.
 
 
 'commons-io', licensed under the Apache-2.0, is distributed with the launcher.
@@ -76,6 +81,11 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `commons-io.commons-io-2.12.0`.
 
 
+'commons-logging', licensed under the The Apache Software License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-logging.commons-logging-1.2`.
+
+
 'circe-core_2.13', licensed under the Apache 2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-core_2.13-0.14.5`.
@@ -106,44 +116,54 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-yaml_2.13-0.14.2`.
 
 
-'bump_2.13', licensed under the MIT, is distributed with the launcher.
-The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
-
-
 'commons-compress', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-compress-1.23.0`.
 
 
+'commons-lang3', licensed under the Apache License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-lang3-3.12.0`.
+
+
+'commons-text', licensed under the Apache License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-text-1.10.0`.
+
+
+'httpclient', licensed under the Apache License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpclient-4.4.1`.
+
+
+'httpcore', licensed under the Apache License, Version 2.0, is distributed with the launcher.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpcore-4.4.1`.
+
+
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the launcher.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.0`.
-
-
-'reactive-streams', licensed under the CC0, is distributed with the launcher.
-The license file can be found at `licenses/CC0`.
-Copyright notices related to this dependency can be found in the directory `org.reactivestreams.reactive-streams-1.0.3`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
 
 
 'scala-java8-compat_2.13', licensed under the Apache-2.0, is distributed with the launcher.
@@ -151,11 +171,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.scala-lang.modules.scala-java8-compat_2.13-1.0.0`.
 
 
-'scala-parser-combinators_2.13', licensed under the Apache-2.0, is distributed with the launcher.
-The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2`.
-
-
 'scala-library', licensed under the Apache-2.0, is distributed with the launcher.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.11`.
diff --git a/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/LICENSE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/LICENSE
similarity index 97%
rename from tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/LICENSE
rename to distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/LICENSE
index c7d5a563ccb2..d64569567334 100644
--- a/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/LICENSE
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/LICENSE
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,14 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
----------------
-
-Licenses for dependency projects can be found here:
-[http://akka.io/docs/akka/snapshot/project/licenses.html]
-
----------------
-
-akka-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
-moved into the source package `akka.protobuf` so as to avoid version conflicts.
-For license information see COPYING.protobuf
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/NOTICE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/NOTICE
new file mode 100644
index 000000000000..738b11fda42c
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-annotations-2.15.2/NOTICE
@@ -0,0 +1,21 @@
+# Jackson JSON processor
+
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers.
+
+## Copyright
+
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+
+## Licensing
+
+Jackson 2.x core and extension components are licensed under Apache License 2.0
+To find the details that apply to this artifact see the accompanying LICENSE file.
+
+## Credits
+
+A list of contributors may be found from CREDITS(-2.x) file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/LICENSE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/LICENSE
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/NOTICES b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/NOTICES
new file mode 100644
index 000000000000..3dd0b88fd7d6
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/NOTICES
@@ -0,0 +1,3 @@
+Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
+
+Copyright 2018-2020 Raffaello Giulietti
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-LICENSE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-LICENSE
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-NOTICE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-NOTICE
new file mode 100644
index 000000000000..e30a4782d710
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-core-2.15.2/jackson-core-NOTICE
@@ -0,0 +1,32 @@
+# Jackson JSON processor
+
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers.
+
+## Copyright
+
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+
+## Licensing
+
+Jackson 2.x core and extension components are licensed under Apache License 2.0
+To find the details that apply to this artifact see the accompanying LICENSE file.
+
+## Credits
+
+A list of contributors may be found from CREDITS(-2.x) file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
+
+## FastDoubleParser
+
+jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
+That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
+under the following copyright.
+
+Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
+
+See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
+and the licenses and copyrights that apply to that code.
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/LICENSE b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/LICENSE
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/NOTICES b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/NOTICES
new file mode 100644
index 000000000000..a7601ec67aaf
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/com.fasterxml.jackson.core.jackson-databind-2.15.2/NOTICES
@@ -0,0 +1,3 @@
+Copyright 2010 Google Inc. All Rights Reserved.
+
+Copyright 2011 Google Inc. All Rights Reserved.
diff --git a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/COPYING.protobuf b/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/COPYING.protobuf
deleted file mode 100644
index 705db579c94f..000000000000
--- a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/COPYING.protobuf
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
diff --git a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-stream_2.13-2.6.20/NOTICES b/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-stream_2.13-2.6.20/NOTICES
deleted file mode 100644
index 524d999be2a0..000000000000
--- a/distribution/launcher/THIRD-PARTY/com.typesafe.akka.akka-stream_2.13-2.6.20/NOTICES
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
diff --git a/distribution/launcher/THIRD-PARTY/com.typesafe.ssl-config-core_2.13-0.4.3/NOTICES b/distribution/launcher/THIRD-PARTY/com.typesafe.ssl-config-core_2.13-0.4.3/NOTICES
deleted file mode 100644
index cb8bfecd482c..000000000000
--- a/distribution/launcher/THIRD-PARTY/com.typesafe.ssl-config-core_2.13-0.4.3/NOTICES
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (C) 2015 - 2020 Lightbend Inc. <https://www.lightbend.com>
diff --git a/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
new file mode 100644
index 000000000000..75b52484ea47
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
new file mode 100644
index 000000000000..147f78a298e5
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
@@ -0,0 +1,9 @@
+Apache Commons Codec
+Copyright 2002-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+contains test data from http://aspell.net/test/orig/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
diff --git a/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
new file mode 100644
index 000000000000..556bd03951d4
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/launcher/THIRD-PARTY/licenses/CC0 b/distribution/launcher/THIRD-PARTY/licenses/CC0
deleted file mode 100644
index 0e259d42c996..000000000000
--- a/distribution/launcher/THIRD-PARTY/licenses/CC0
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
diff --git a/distribution/launcher/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md b/distribution/launcher/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
deleted file mode 100644
index 59eab77058a2..000000000000
--- a/distribution/launcher/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018-2021 Philippus Baalman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/LICENSE.txt b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-lang3-3.12.0/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
new file mode 100644
index 000000000000..4e1f8dbb8dec
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
@@ -0,0 +1,5 @@
+Apache Commons Text
+Copyright 2014-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
new file mode 100644
index 000000000000..c05d4e6e933f
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
@@ -0,0 +1,8 @@
+
+Apache HttpClient
+Copyright 1999-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
new file mode 100644
index 000000000000..54e4285f2d6a
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
@@ -0,0 +1,266 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+=========================================================================
+
+This project contains annotations in the package org.apache.http.annotation
+which are derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License
+(http://creativecommons.org/licenses/by/2.5)
+Full text: http://creativecommons.org/licenses/by/2.5/legalcode
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+    "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
+    "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
+    "Licensor" means the individual or entity that offers the Work under the terms of this License.
+    "Original Author" means the individual or entity who created the Work.
+    "Work" means the copyrightable work of authorship offered under the terms of this License.
+    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+    to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
+    to create and reproduce Derivative Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
+
+    For the avoidance of doubt, where the work is a musical composition:
+        Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
+        Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
+    Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+    You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
+    If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+    Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+    Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
new file mode 100644
index 000000000000..976db53ee327
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
@@ -0,0 +1,10 @@
+
+Apache HttpCore
+Copyright 2005-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
diff --git a/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/distribution/launcher/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES b/distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
similarity index 100%
rename from distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES
rename to distribution/launcher/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
diff --git a/distribution/launcher/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES b/distribution/launcher/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES
deleted file mode 100644
index bd0a85c0c769..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.reactivestreams.reactive-streams-1.0.3/NOTICES
+++ /dev/null
@@ -1,10 +0,0 @@
-/************************************************************************
- * Licensed under Public Domain (CC0)                                    *
- *                                                                       *
- * To the extent possible under law, the person who associated CC0 with  *
- * this code has waived all copyright and related or neighboring         *
- * rights to this code.                                                  *
- *                                                                       *
- * You should have received a copy of the CC0 legalcode along with this  *
- * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.*
- ************************************************************************/
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICE b/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICE
deleted file mode 100644
index 779e510da785..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-Scala parser combinators
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICES b/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICES
deleted file mode 100644
index 454e8a4f617c..000000000000
--- a/distribution/launcher/THIRD-PARTY/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/NOTICES
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Scala (https://www.scala-lang.org)
- *
- * Copyright EPFL and Lightbend, Inc.
- *
- * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
- *
- * See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- */
-
-See org.scala-lang.scala-library-2.13 for notices related to this module.
-
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/AWS_Credential.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/AWS_Credential.enso
index 05d47537a9b9..dd4510df98d4 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/AWS_Credential.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/AWS_Credential.enso
@@ -1,5 +1,5 @@
 from Standard.Base import all
-from Standard.Base.Data.Enso_Cloud.Enso_Secret import as_hideable_value
+from Standard.Base.Enso_Cloud.Enso_Secret import as_hideable_value
 from Standard.Base.Metadata import make_single_choice, Widget
 
 polyglot java import org.enso.aws.AwsCredential
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
index 2a87ac08db25..9011f28791ec 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
@@ -7,7 +7,6 @@ import Standard.Database.Data.DB_Column.DB_Column
 import Standard.Database.Data.Dialect
 import Standard.Database.Data.SQL_Statement.SQL_Statement
 import Standard.Database.Data.SQL_Type.SQL_Type
-import Standard.Database.Data.Table.Table
 import Standard.Database.Internal.Base_Generator
 import Standard.Database.Internal.Column_Fetcher as Column_Fetcher_Module
 import Standard.Database.Internal.Column_Fetcher.Column_Fetcher
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/Request_Body.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/Request_Body.enso
index d48ceb335284..c22d998f8ed1 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/Request_Body.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/Request_Body.enso
@@ -1,10 +1,12 @@
 private
+
 from Standard.Base import all
 from Standard.Base.System.File import file_as_java
+import Standard.Base.Errors.File_Error.File_Error
 
 polyglot java import software.amazon.awssdk.core.sync.RequestBody
 
 ## PRIVATE
-from_local_file (file : File) =
+from_local_file (file : File) = File_Error.handle_java_exceptions file <|
     java_file = file_as_java file
     RequestBody.fromFile java_file
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_File_Write_Strategy.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_File_Write_Strategy.enso
index eb739f92a9f3..dc320b09f227 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_File_Write_Strategy.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_File_Write_Strategy.enso
@@ -6,10 +6,12 @@ import Standard.Base.Errors.File_Error.File_Error
 from Standard.Base.System.File.Generic.File_Write_Strategy import File_Write_Strategy, default_overwrite, default_append, default_raise_error, generic_remote_write_with_local_file
 
 import project.Errors.S3_Error
+import project.S3.S3
+import project.S3.S3_File.S3_File
 
 ## PRIVATE
 instance =
-    File_Write_Strategy.Value default_overwrite default_append default_raise_error s3_backup create_dry_run_file remote_write_with_local_file
+    File_Write_Strategy.Value default_overwrite default_append default_raise_error s3_backup create_dry_run_file remote_write_with_local_file copy_from_local
 
 ## PRIVATE
 create_dry_run_file file copy_original =
@@ -47,6 +49,12 @@ s3_backup file action = recover_errors <|
     with_failure_handler revert_backup <|
         file.with_output_stream [File_Access.Write, File_Access.Truncate_Existing] action
 
+## PRIVATE
+copy_from_local (source : File) (destination : S3_File) (replace_existing : Boolean) =
+    if replace_existing.not && destination.exists then Error.throw (File_Error.Already_Exists destination) else
+        S3.upload_file source destination.s3_path.bucket destination.s3_path.key destination.credentials . if_not_error <|
+            destination
+
 ## PRIVATE
 with_failure_handler ~failure_action ~action =
     panic_handler caught_panic =
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_Path.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_Path.enso
new file mode 100644
index 000000000000..4b9054f30bff
--- /dev/null
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Internal/S3_Path.enso
@@ -0,0 +1,161 @@
+from Standard.Base import all
+import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
+
+import project.Errors.S3_Error
+import project.S3.S3
+
+## PRIVATE
+   An abstraction for S3 paths, holding the bucket name and the key.
+
+   This helper implements resolving paths in a folder-like structure as
+   described at https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-folders.html
+type S3_Path
+    ## PRIVATE
+    Value (bucket : Text) (key : Text)
+
+    ## PRIVATE
+    parse (uri : Text) -> S3_Path ! Illegal_Argument =
+        if uri.starts_with S3.uri_prefix . not then Error.throw (Illegal_Argument.Error "An S3 path must start with `"+S3.uri_prefix+"`.") else
+            without_prefix = uri.drop S3.uri_prefix.length
+            first_slash_index = without_prefix.index_of S3_Path.delimiter
+            if first_slash_index == 0 then Error.throw (Illegal_Argument.Error "Invalid S3 path: empty bucket name.") else
+                if first_slash_index.is_nothing then S3_Path.Value without_prefix "" else
+                    bucket = (without_prefix.take first_slash_index)
+                    key = (without_prefix.drop first_slash_index+1)
+                    normalized = Decomposed_S3_Path.parse key . normalize . key
+                    S3_Path.Value bucket normalized
+
+    ## PRIVATE
+    to_text self -> Text =
+        S3.uri_prefix + self.bucket + S3_Path.delimiter + self.key
+
+    ## PRIVATE
+    to_display_text self -> Text = self.to_text.to_display_text
+
+    ## PRIVATE
+       Checks if this path represents the root directory of a bucket.
+    is_root self -> Boolean = self.key.is_empty
+
+    ## PRIVATE
+       Checks if this path represents a directory.
+    is_directory self -> Boolean = self.is_root || (self.key.ends_with S3_Path.delimiter)
+
+    ## PRIVATE
+       Resolves a subdirectory entry.
+       This only makes logical sense for paths for which `path.is_directory == True`,
+       but it is not forbidden to call it on other types of paths.
+
+       Note that the newly returned path will be a directory or not depending on
+       if `subpath` ends with the delimiter.
+    resolve self (subpath : Text) -> S3_Path =
+        joined = Decomposed_S3_Path.join [Decomposed_S3_Path.parse self.key, Decomposed_S3_Path.parse subpath]
+        new_key = joined.normalize.key
+        S3_Path.Value self.bucket new_key
+
+    ## PRIVATE
+    join self (subpaths : Vector) -> S3_Path =
+        joined = Decomposed_S3_Path.join (([self.key]+subpaths).map Decomposed_S3_Path.parse)
+        new_key = joined.normalize.key
+        S3_Path.Value self.bucket new_key
+
+
+    ## PRIVATE
+       Returns the parent directory.
+       It will return `Nothing` for the root directory.
+    parent self -> S3_Path | Nothing =
+        if self.is_root then Nothing else
+            decomposed = Decomposed_S3_Path.parse self.key
+            S3_Path.Value self.bucket decomposed.parent.key
+
+    ## PRIVATE
+       Returns the 'file name' of this path.
+       If the path is a regular file, it will be its name.
+       If the path is a directory, it will be the name of that directory,
+       without the trailing delimiter.
+    file_name self -> Text =
+        if self.is_root then S3_Path.delimiter else
+            trimmed = if self.key.ends_with S3_Path.delimiter then self.key.drop (Last 1) else self.key
+            last_index = trimmed.last_index_of S3_Path.delimiter
+            if last_index == Nothing then trimmed else trimmed.drop (First last_index+1)
+
+    ## PRIVATE
+       Checks if the given other path is inside of this path.
+       A directory is not a descendant of itself.
+    is_descendant_of self (other : S3_Path) -> Boolean =
+        (self != other) && other.is_directory && self.to_text.starts_with other.to_text
+
+    ## PRIVATE
+       The delimiter used for path emulation.
+
+       S3 does not treat `/` in any special way, it allows using any character as a
+       path delimiter. In the future we could allow customizing it.
+    delimiter -> Text = "/"
+
+## PRIVATE
+type Path_Entry
+    ## PRIVATE
+    Directory (name : Text)
+
+    ## PRIVATE
+    File (name : Text)
+
+    ## PRIVATE
+    is_directory self -> Boolean = case self of
+        Path_Entry.Directory _ -> True
+        Path_Entry.File _      -> False
+
+## PRIVATE
+type Decomposed_S3_Path
+    ## PRIVATE
+    Value (parts : Vector Path_Entry) (go_to_root : Boolean)
+
+    ## PRIVATE
+       Reconstructs the original path.
+    key self -> Text =
+        add_directory_suffix = self.parts.not_empty && self.parts.last.is_directory
+        suffix = if add_directory_suffix then S3_Path.delimiter else ""
+        self.parts.map .name . join separator=S3_Path.delimiter suffix=suffix
+
+    ## PRIVATE
+    parse (key : Text) -> Decomposed_S3_Path =
+        has_directory_suffix = key.ends_with S3_Path.delimiter
+        has_root_prefix = key.starts_with S3_Path.delimiter
+        parts = key.split S3_Path.delimiter . filter (p-> p.is_empty.not)
+        entries = case has_directory_suffix of
+            True -> parts.map Path_Entry.Directory
+            False ->
+                if parts.is_empty then [] else
+                    (parts.drop (Last 1) . map Path_Entry.Directory) + [Path_Entry.File parts.last]
+        Decomposed_S3_Path.Value entries has_root_prefix
+
+    ## PRIVATE
+    join (paths : Vector Decomposed_S3_Path) -> Decomposed_S3_Path =
+        if paths.is_empty then Error.throw (Illegal_Argument.Error "Cannot join an empty list of paths.") else
+            last_root_ix = paths.last_index_of (.go_to_root)
+            without_ignored_paths = if last_root_ix.is_nothing then paths else
+                paths.drop last_root_ix
+            flattened = without_ignored_paths.flat_map .parts
+            # Any `File` parts from the middle are now transformed to `Directory`:
+            aligned = flattened.map_with_index ix-> part-> case part of
+                Path_Entry.Directory _ -> part
+                Path_Entry.File name ->
+                    is_last = ix == flattened.length-1
+                    if is_last then part else Path_Entry.Directory name
+            Decomposed_S3_Path.Value aligned (last_root_ix.is_nothing.not)
+
+    ## PRIVATE
+    normalize self -> Decomposed_S3_Path ! S3_Error =
+        new_stack = self.parts.fold List.Nil stack-> part-> case part.name of
+            "." -> stack
+            ".." -> case stack of
+                List.Nil -> Error.throw (S3_Error.Error "Cannot move above root folder." Nothing)
+                List.Cons _ tail -> tail
+            _ -> List.Cons part stack
+        new_parts = new_stack.to_vector.reverse
+        Decomposed_S3_Path.Value new_parts self.go_to_root
+
+    ## PRIVATE
+    parent self -> Decomposed_S3_Path | Nothing =
+        if self.parts.is_empty then Nothing else
+            new_parts = self.parts.drop (Last 1)
+            Decomposed_S3_Path.Value new_parts self.go_to_root
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3.enso
index d0ee87d9ef87..2ad77f9ed4ab 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3.enso
@@ -10,6 +10,7 @@ import project.Errors.More_Records_Available
 import project.Errors.S3_Bucket_Not_Found
 import project.Errors.S3_Key_Not_Found
 import project.Errors.S3_Error
+import project.Internal.Request_Body
 
 polyglot java import java.io.IOException
 polyglot java import org.enso.aws.ClientBuilder
@@ -55,6 +56,12 @@ list_objects bucket prefix="" credentials:(AWS_Credential | Nothing)=Nothing max
 ## PRIVATE
    Reads an S3 bucket returning a pair of vectors, one with common prefixes and
    one with object keys.
+
+   Arguments:
+   - bucket: The name of the bucket.
+   - prefix: The prefix to use when searching for keys to return.
+   - credentials: The credentials for the AWS resource.
+   - delimiter: The delimiter used to deduce common prefixes.
 @credentials AWS_Credential.default_widget
 read_bucket : Text -> Text -> AWS_Credential | Nothing -> Integer -> Text -> Pair Vector Vector ! S3_Error
 read_bucket bucket prefix="" credentials:(AWS_Credential | Nothing)=Nothing delimiter="/" max_count=1000 = handle_s3_errors bucket=bucket <|
@@ -121,8 +128,9 @@ raw_head bucket key credentials =
    - key: the key of the object.
    - credentials: AWS credentials. If not provided, the default credentials will
      be used.
+   - delimiter: The delimiter to use for deducing the filename from the path.
 get_object : Text -> Text -> AWS_Credential | Nothing -> Response_Body ! S3_Error
-get_object bucket key credentials:(AWS_Credential | Nothing)=Nothing = handle_s3_errors bucket=bucket key=key <|
+get_object bucket key credentials:(AWS_Credential | Nothing)=Nothing delimiter="/" = handle_s3_errors bucket=bucket key=key <|
     request = GetObjectRequest.builder.bucket bucket . key key . build
 
     client = make_client credentials
@@ -132,7 +140,7 @@ get_object bucket key credentials:(AWS_Credential | Nothing)=Nothing = handle_s3
     s3_uri = URI.parse (uri_prefix + bucket + "/") / key
     content_type = inner_response.contentType
     name = filename_from_content_disposition inner_response.contentDisposition . if_nothing <|
-        key.split "/" . last
+        key.split delimiter . last
     metadata = File_Format_Metadata.Value path=key name=name content_type=content_type
 
     input_stream = Input_Stream.new response (handle_io_errors s3_uri)
@@ -142,15 +150,20 @@ get_object bucket key credentials:(AWS_Credential | Nothing)=Nothing = handle_s3
 put_object (bucket : Text) (key : Text) credentials:(AWS_Credential | Nothing)=Nothing request_body = handle_s3_errors bucket=bucket key=key <|
     client = make_client credentials
     request = PutObjectRequest.builder.bucket bucket . key key . build
-    client.putObject request request_body
-    Nothing
+    client.putObject request request_body . if_not_error Nothing
+
+## PRIVATE
+upload_file (local_file : File) (bucket : Text) (key : Text) credentials:(AWS_Credential | Nothing)=Nothing = handle_s3_errors bucket=bucket key=key <|
+    request_body = Request_Body.from_local_file local_file
+    put_object bucket key credentials request_body
 
 ## PRIVATE
+   Deletes the object.
+   It will not raise any errors if the object does not exist.
 delete_object (bucket : Text) (key : Text) credentials:(AWS_Credential | Nothing)=Nothing = handle_s3_errors bucket=bucket key=key <|
     client = make_client credentials
     request = DeleteObjectRequest.builder . bucket bucket . key key . build
-    client.deleteObject request
-    Nothing
+    client.deleteObject request . if_not_error Nothing
 
 ## PRIVATE
 copy_object (source_bucket : Text) (source_key : Text) (target_bucket : Text) (target_key : Text) credentials:(AWS_Credential | Nothing)=Nothing = handle_s3_errors bucket=source_bucket key=source_key <|
@@ -161,19 +174,7 @@ copy_object (source_bucket : Text) (source_key : Text) (target_bucket : Text) (t
         . sourceBucket source_bucket
         . sourceKey source_key
         . build
-    client.copyObject request
-    Nothing
-
-## PRIVATE
-   Splits a S3 URI into bucket and key.
-parse_uri : Text -> Pair Text Text | Nothing
-parse_uri uri =
-    if uri.starts_with uri_prefix . not then Nothing else
-        no_prefix = uri.drop uri_prefix.length
-        index_of = no_prefix.index_of "/"
-        if index_of == 0 then Nothing else
-            if index_of.is_nothing then Pair.new no_prefix "" else
-                Pair.new (no_prefix.take index_of) (no_prefix.drop index_of+1)
+    client.copyObject request . if_not_error Nothing
 
 ## PRIVATE
 handle_s3_errors : Any -> Text -> Text -> Any ! S3_Error | AWS_SDK_Error
diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3_File.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3_File.enso
index 0adcf9e23434..d896afc97dcc 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3_File.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/S3/S3_File.enso
@@ -1,5 +1,4 @@
 from Standard.Base import all
-import Standard.Base.Errors.Common.Forbidden_Operation
 import Standard.Base.Errors.Common.Syntax_Error
 import Standard.Base.Errors.File_Error.File_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
@@ -11,12 +10,13 @@ import Standard.Base.System.File.Generic.Writable_File.Writable_File
 import Standard.Base.System.Input_Stream.Input_Stream
 import Standard.Base.System.Output_Stream.Output_Stream
 from Standard.Base.System.File import find_extension_from_name
+from Standard.Base.System.File.Generic.File_Write_Strategy import generic_copy
 
 import project.AWS_Credential.AWS_Credential
 import project.Errors.S3_Error
 import project.Errors.S3_Key_Not_Found
-import project.Internal.Request_Body
 import project.Internal.S3_File_Write_Strategy
+import project.Internal.S3_Path.S3_Path
 import project.S3.S3
 
 ## Represents an S3 file or folder
@@ -27,34 +27,33 @@ type S3_File
        Arguments:
        - uri: The URI of the file.
          The URI must be in the form `s3://bucket/path/to/file`.
+         If the path contains `.` or `..` segments, they will be normalized.
        - credentials: The credentials to use when accessing the file.
          If not specified, the default credentials are used.
-    new : Text -> AWS_Credential | Nothing -> S3_File
-    new uri=S3.uri_prefix credentials=Nothing =
-        parts = S3.parse_uri uri
-        if parts.is_nothing then Error.throw (Syntax_Error.Error "Invalid S3 URI.") else
-            S3_File.Value parts.first parts.second credentials
+    new : Text -> AWS_Credential | Nothing -> S3_File ! Illegal_Argument
+    new (uri : Text = S3.uri_prefix) (credentials : AWS_Credential | Nothing = Nothing) =
+        S3_File.Value (S3_Path.parse uri) credentials
 
     ## PRIVATE
-    Value bucket:Text prefix:Text credentials:(AWS_Credential | Nothing)
+    Value (s3_path : S3_Path) (credentials : AWS_Credential | Nothing)
 
     ## GROUP Standard.Base.Metadata
        Gets the URI of this file
     uri : Text
-    uri self = S3.uri_prefix + self.bucket + "/" + self.prefix
+    uri self -> Text = self.s3_path.to_text
 
     ## GROUP Standard.Base.Metadata
        Checks if the folder or file exists
     exists : Boolean
-    exists self = if self.bucket == "" then True else
-        if self.prefix == "" then translate_file_errors self <| S3.head self.bucket "" self.credentials . is_error . not else
-            pair = translate_file_errors self <| S3.read_bucket self.bucket self.prefix self.credentials max_count=1
-            pair.second.length > 0
+    exists self = if self.s3_path.bucket == "" then True else
+        if self.s3_path.is_root then translate_file_errors self <| S3.head self.s3_path.bucket "" self.credentials . is_error . not else
+            pair = translate_file_errors self <| S3.read_bucket self.s3_path.bucket self.s3_path.key self.credentials delimiter=S3_Path.delimiter max_count=1
+            pair.second.contains self.s3_path.key
 
     ## GROUP Standard.Base.Metadata
        Checks if this is a folder.
     is_directory : Boolean
-    is_directory self = (self.prefix == "") || (self.prefix.ends_with "/")
+    is_directory self = self.s3_path.is_directory
 
     ## GROUP Standard.Base.Metadata
        Checks if this is a regular file.
@@ -66,7 +65,7 @@ type S3_File
     size : Integer
     size self =
         if self.is_directory then Error.throw (S3_Error.Error "size can only be called on files." self.uri) else
-            content_length = translate_file_errors self <| S3.raw_head self.bucket self.prefix self.credentials . contentLength
+            content_length = translate_file_errors self <| S3.raw_head self.s3_path.bucket self.s3_path.key self.credentials . contentLength
             if content_length.is_nothing then Error.throw (S3_Error.Error "ContentLength header is missing." self.uri) else content_length
 
     ## PRIVATE
@@ -84,7 +83,7 @@ type S3_File
          value. The value is returned from this method.
     with_output_stream : Vector File_Access -> (Output_Stream -> Any ! File_Error) -> Any ! File_Error
     with_output_stream self (open_options : Vector) action = if self.is_directory then Error.throw (S3_Error.Error "S3 directory cannot be opened as a stream." self.uri) else
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Writing to an S3_File is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="Writing to an S3_File is forbidden as the Output context is disabled." panic=False <|
             if open_options.contains File_Access.Append then Error.throw (S3_Error.Error "S3 does not support appending to a file. Instead you may read it, modify and then write the new contents." self.uri) else
                 # The exists check is not atomic, but it is the best we can do with S3
                 check_exists = open_options.contains File_Access.Create_New
@@ -98,8 +97,7 @@ type S3_File
                             result = tmp_file.with_output_stream [File_Access.Write] action
                             # Only proceed if the write succeeded
                             result.if_not_error <|
-                                request_body = Request_Body.from_local_file tmp_file
-                                (translate_file_errors self <| S3.put_object self.bucket self.prefix self.credentials request_body) . if_not_error <|
+                                (translate_file_errors self <| S3.upload_file tmp_file self.s3_path.bucket self.s3_path.key self.credentials) . if_not_error <|
                                     result
 
 
@@ -119,7 +117,7 @@ type S3_File
     with_input_stream : Vector File_Access -> (Input_Stream -> Any ! File_Error) -> Any ! S3_Error | Illegal_Argument
     with_input_stream self (open_options : Vector) action = if self.is_directory then Error.throw (Illegal_Argument.Error "S3 folders cannot be opened as a stream." self.uri) else
         if (open_options != [File_Access.Read]) then Error.throw (S3_Error.Error "S3 files can only be opened for reading." self.uri) else
-            response_body = translate_file_errors self <| S3.get_object self.bucket self.prefix self.credentials
+            response_body = translate_file_errors self <| S3.get_object self.s3_path.bucket self.s3_path.key self.credentials delimiter=S3_Path.delimiter
             response_body.with_stream action
 
     ## ALIAS load, open
@@ -143,7 +141,7 @@ type S3_File
         _ = on_problems
         case format of
             Auto_Detect -> if self.is_directory then format.read self on_problems else
-                response = translate_file_errors self <| S3.get_object self.bucket self.prefix self.credentials
+                response = translate_file_errors self <| S3.get_object self.s3_path.bucket self.s3_path.key self.credentials delimiter=S3_Path.delimiter
                 response.decode Auto_Detect
             _ ->
                 metadata = File_Format_Metadata.Value path=self.path name=self.name
@@ -172,12 +170,17 @@ type S3_File
     read_text self (encoding=Encoding.utf_8) (on_problems=Problem_Behavior.Report_Warning) =
         self.read (Plain_Text encoding) on_problems
 
-    ## UNSTABLE
-       Deletes the object.
+    ## Deletes the object.
     delete : Nothing
     delete self = if self.is_directory then Error.throw (S3_Error.Error "Deleting S3 folders is currently not implemented." self.uri) else
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Deleting an S3_File is forbidden as the Output context is disabled.") else
-            translate_file_errors self <| S3.delete_object self.bucket self.prefix self.credentials . if_not_error <| Nothing
+        if self.exists.not then Error.throw (File_Error.Not_Found self) else
+            self.delete_if_exists
+
+    ## Deletes the file if it had existed.
+    delete_if_exists : Nothing
+    delete_if_exists self = if self.is_directory then Error.throw (S3_Error.Error "Deleting S3 folders is currently not implemented." self.uri) else
+        Context.Output.if_enabled disabled_message="Deleting an S3_File is forbidden as the Output context is disabled." panic=False <|
+            translate_file_errors self <| S3.delete_object self.s3_path.bucket self.s3_path.key self.credentials . if_not_error Nothing
 
     ## Copies the file to the specified destination.
 
@@ -185,94 +188,98 @@ type S3_File
        - destination: the destination to move the file to.
        - replace_existing: specifies if the operation should proceed if the
          destination file already exists. Defaults to `False`.
-    copy_to : S3_File -> Boolean -> Any ! File_Error
-    copy_to self (destination : Writable_File) replace_existing=False =
+    copy_to : Writable_File -> Boolean -> Any ! File_Error
+    copy_to self (destination : Writable_File) (replace_existing : Boolean = False) =
         if self.is_directory then Error.throw (S3_Error.Error "Copying S3 folders is currently not implemented." self.uri) else
-            if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Copying an S3_File is forbidden as the Output context is disabled.") else
+            Context.Output.if_enabled disabled_message="Copying an S3_File is forbidden as the Output context is disabled." panic=False <|
                 case destination.file of
                     # Special shortcut for more efficient handling of S3 file copying (no need to move the data to our machine)
                     s3_destination : S3_File ->
                         if replace_existing.not && s3_destination.exists then Error.throw (File_Error.Already_Exists destination) else
-                            translate_file_errors self <| S3.copy_object self.bucket self.prefix s3_destination.bucket s3_destination.prefix self.credentials . if_not_error <| s3_destination
+                            destination_path = s3_destination.s3_path
+                            translate_file_errors self <| S3.copy_object self.s3_path.bucket self.s3_path.key destination_path.bucket destination_path.key self.credentials . if_not_error <| s3_destination
+                    _ -> generic_copy self destination.file replace_existing
+
+    ## Moves the file to the specified destination.
+
+       ! S3 Move is a Copy and Delete
+
+         Since S3 does not support moving files, this operation is implemented
+         as a copy followed by delete. Keep in mind that the space usage of the
+         file will briefly be doubled and that the operation may not be as fast
+         as a local move often is.
 
-                    # Generic implementation using streams
-                    _ ->
-                        self.with_input_stream [File_Access.Read] input_stream->
-                            open_settings = if replace_existing then [File_Access.Write, File_Access.Create, File_Access.Truncate_Existing] else [File_Access.Write, File_Access.Create_New]
-                            destination.with_output_stream open_settings output_stream->
-                                output_stream.write_stream input_stream
+       Arguments:
+       - destination: the destination to move the file to.
+       - replace_existing: specifies if the operation should proceed if the
+         destination file already exists. Defaults to `False`.
+    move_to : Writable_File -> Boolean -> Nothing ! File_Error
+    move_to self (destination : Writable_File) (replace_existing : Boolean = False) =
+        Context.Output.if_enabled disabled_message="File moving is forbidden as the Output context is disabled." panic=False <|
+            r = self.copy_to destination replace_existing=replace_existing
+            r.if_not_error <|
+                self.delete.if_not_error r
 
     ## GROUP Standard.Base.Operators
-       Join two path segments together.
+       Join two path segments together, normalizing the `..` and `.` subpaths.
 
        Arguments:
        - subpath: The path to join to the path of `self`.
+
+       ! S3 Directory Handling
+
+         Note that regular S3 buckets do not have a 'native' notion of
+         directories, instead they are emulated using prefixes and a delimiter
+         (in Enso, the delimiter is set to "/").
+
+         The trailing slash determines if the given path is treated as a
+         directory or as a regular file.
+
+         However, for ease-of-use, if a path without a trailing slash is used
+         with the `/` operator it will be accepted and the sub paths will be
+         resolved, even though such a path would not be treated as a directory
+         by any other operations.
+
+         See: https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-folders.html
     / : Text -> S3_File
-    / self subpath = if self.is_directory.not then Error.throw (S3_Error.Error "Only folders can have children." self.uri) else
-        trimmed = if subpath.starts_with "/" then subpath.drop (First 1) else subpath
-        parts = trimmed.split "/"
-
-        extend current part =
-            if current == "" then part else
-                if current.ends_with "/" then current + part else
-                    current + "/" + part
-
-        loop current remaining = if remaining.length == 0 then current else
-            new_current = case remaining.first of
-                ".." ->
-                    last_index = current.last_index_of "/"
-                    if last_index == Nothing then (S3_Error.Error "Cannot move above root folder.") else current.take last_index
-                "." -> current
-                x -> extend current x
-            @Tail_Call loop new_current (remaining.drop 1)
-
-        initial = if subpath.starts_with "/" then "" else self.prefix
-        path = loop initial parts
-        S3_File.Value self.bucket path self.credentials
+    / self subpath =
+        S3_File.Value (self.s3_path.resolve subpath) self.credentials
 
     ## GROUP Standard.Base.Calculations
        Join two or more path segments together, normalizing the `..` and `.` subpaths.
 
        Arguments:
        - subpaths: The path segment or segments to join to the path of `self`.
-    join : (Text | Vector) -> S3_File
-    join self subpaths = case subpaths of
-        _ : Vector -> (subpaths.fold self c->p-> c / p)
-        _ -> self.join [subpaths]
+
+       See `/` for more information about S3 directory handling.
+    join : (Vector | Text) -> S3_File
+    join self (subpaths : Vector | Text) =
+        vec = Vector.unify_vector_or_element subpaths
+        vec_as_texts = vec.map subpath-> (subpath : Text)
+        S3_File.Value (self.s3_path.join vec_as_texts) self.credentials
 
     ## GROUP Standard.Base.Metadata
        Resolves the parent of this file.
     parent : S3_File | Nothing
     parent self =
-        if self.prefix == "" then Nothing else
-            is_directory = self.prefix.ends_with "/"
-            last_index = case is_directory of
-                # For directories we drop the trailing slash and find the one before it:
-                True -> (self.prefix.drop (Last 1)).last_index_of "/"
-                False -> self.prefix.last_index_of "/"
-            ## We include the trailing slash in the path, as the parent is
-               always a directory and in S3 directories are distinguished only
-               by the presence of this slash.
-            new_prefix = if last_index == Nothing then "" else self.prefix.take last_index+1
-            S3_File.Value self.bucket new_prefix self.credentials
+        parent_path = self.s3_path.parent
+        parent_path.if_not_nothing <|
+            S3_File.Value parent_path self.credentials
 
     ## GROUP Standard.Base.Metadata
        Checks if `self` is a descendant of `other`.
     is_descendant_of : S3_File -> Boolean
-    is_descendant_of self other = other.is_directory && self.uri.starts_with other.uri
+    is_descendant_of self other = self.s3_path.is_descendant_of other.s3_path
 
     ## GROUP Standard.Base.Metadata
        Returns the path of this file.
     path : Text
-    path self = self.uri
+    path self = self.s3_path.to_text
 
     ## GROUP Standard.Base.Metadata
        Returns the name of this file.
     name : Text
-    name self = if self.prefix == "" then self.bucket else
-        trimmed = if self.prefix.ends_with "/" then self.prefix.drop (Last 1) else self.prefix
-        last_index = trimmed.last_index_of "/"
-        if last_index == Nothing then trimmed else trimmed.drop (First last_index+1)
+    name self = self.s3_path.file_name
 
     ## GROUP Standard.Base.Metadata
        Returns the extension of the file.
@@ -291,7 +298,7 @@ type S3_File
     last_modified_time : Date_Time ! File_Error
     last_modified_time self =
         if self.is_directory then Error.throw (S3_Error.Error "`last_modified_time` can only be called on files." self.uri) else
-            instant = translate_file_errors self <| S3.raw_head self.bucket self.prefix self.credentials . lastModified
+            instant = translate_file_errors self <| S3.raw_head self.s3_path.bucket self.s3_path.key self.credentials . lastModified
             if instant.is_nothing then Error.throw (S3_Error.Error "Missing information for: lastModified" self.uri) else
                 instant.at_zone Time_Zone.system
 
@@ -314,13 +321,16 @@ type S3_File
     list self name_filter:Text="" recursive:Boolean=False =
         check_name_filter action = if name_filter != "" then Unimplemented.throw "S3 listing with name filter is not currently implemented." else action
         check_recursion action = if recursive then Unimplemented.throw "S3 listing with recursion is not currently implemented." else action
-        check_directory action = if self.is_directory.not then Error.throw (S3_Error.Error "Only folders can have children." self.uri) else action
+        check_directory action = if self.is_directory.not then Error.throw (S3_Error.Error "Only folders can be listed." self.uri) else action
 
         check_directory <| check_recursion <| check_name_filter <|
-            if self.bucket == "" then translate_file_errors self <| S3.list_buckets self.credentials . map bucket-> S3_File.Value bucket "" self.credentials else
-                pair = translate_file_errors self <| S3.read_bucket self.bucket self.prefix self.credentials
-                sub_folders = pair.first . map key-> S3_File.Value self.bucket key self.credentials
-                files = pair.second . map key-> S3_File.Value self.bucket key self.credentials
+            if self.s3_path.bucket == "" then translate_file_errors self <| S3.list_buckets self.credentials . map bucket-> S3_File.Value bucket "" self.credentials else
+                pair = translate_file_errors self <| S3.read_bucket self.s3_path.bucket self.s3_path.key self.credentials delimiter=S3_Path.delimiter
+                bucket = self.s3_path.bucket
+                sub_folders = pair.first . map key->
+                    S3_File.Value (S3_Path.Value bucket key) self.credentials
+                files = pair.second . map key->
+                    S3_File.Value (S3_Path.Value bucket key) self.credentials
                 sub_folders + files
 
 ## PRIVATE
@@ -337,5 +347,6 @@ Writable_File.from (that : S3_File) =
    A helper that translates lower level S3 errors to file-system errors.
 translate_file_errors related_file result =
     result.catch S3_Key_Not_Found error->
-        s3_file = S3_File.Value error.bucket error.key related_file.credentials
+        s3_path = S3_Path.Value error.bucket error.key
+        s3_file = S3_File.Value s3_path related_file.credentials
         Error.throw (File_Error.Not_Found s3_file)
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
index 3b0392649529..2b8908af4d3a 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/NOTICE
@@ -23,20 +23,20 @@ Copyright notices related to this dependency can be found in the directory `com.
 
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the Base.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
new file mode 100644
index 000000000000..13ed7577befa
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
@@ -0,0 +1,5 @@
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
new file mode 100644
index 000000000000..4e1daf3209ba
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
@@ -0,0 +1,7 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
new file mode 100644
index 000000000000..0bcf5ca20516
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
@@ -0,0 +1,7 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
new file mode 100644
index 000000000000..01e45ab0bed6
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
@@ -0,0 +1,7 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso
index dd3f64bacecc..aec254bbf014 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Array.enso
@@ -306,7 +306,8 @@ type Array
     to_list : List
     to_list self = Array_Like_Helpers.to_list self
 
-    ## GROUP Selections
+    ## ALIAS unique, deduplicate
+       GROUP Selections
        ICON preparation
        Keeps only unique elements within the array, removing any duplicates.
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Errors.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Errors.enso
deleted file mode 100644
index 678a8b748284..000000000000
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Errors.enso
+++ /dev/null
@@ -1,8 +0,0 @@
-import project.Data.Text.Text
-
-## PRIVATE
-   Error if the user is not logged into Enso Cloud.
-type Not_Logged_In
-    ## PRIVATE
-    to_display_text : Text
-    to_display_text self = "Not logged into Enso cloud. Please log in and restart."
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Utils.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Utils.enso
deleted file mode 100644
index c9547695c4ee..000000000000
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Utils.enso
+++ /dev/null
@@ -1,59 +0,0 @@
-private
-
-import project.Data.Enso_Cloud.Enso_Secret.Derived_Secret_Value
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
-import project.Data.Enso_Cloud.Errors.Not_Logged_In
-import project.Data.Pair.Pair
-import project.Data.Text.Text
-import project.Error.Error
-import project.Network.HTTP.Header.Header
-import project.Nothing.Nothing
-import project.Runtime.Ref.Ref
-import project.System.Environment
-import project.System.File.File
-
-polyglot java import org.enso.base.enso_cloud.AuthenticationProvider
-
-## PRIVATE
-cloud_root_uri = "" + AuthenticationProvider.getAPIRootURI
-
-## PRIVATE
-   Construct the authorization header for the request
-authorization_header : Header
-authorization_header =
-    token = AuthenticationProvider.getToken.if_nothing <|
-        f = credentials_file
-        if f.exists.not then Error.throw Not_Logged_In else
-            AuthenticationProvider.setToken (f.read_text)
-    Header.authorization_bearer token
-
-## PRIVATE
-credentials_file : File
-credentials_file = case Environment.get "ENSO_CLOUD_CREDENTIALS_FILE" of
-    Nothing -> File.home / ".enso" / "credentials"
-    path -> File.new path
-
-## PRIVATE
-   Root address for listing folders
-directory_api = cloud_root_uri + "directories"
-
-## PRIVATE
-   Root address for listing folders
-files_api = cloud_root_uri + "files"
-
-## PRIVATE
-   Root address for listing folders
-projects_api = cloud_root_uri + "projects"
-
-## PRIVATE
-   Root address for Secrets API
-secrets_api = cloud_root_uri + "secrets"
-
-## PRIVATE
-   The current project directory that will be used as the working directory,
-   if the user is running in the Cloud.
-internal_cloud_project_directory = AuthenticationProvider.getCurrentWorkingDirectory
-
-## PRIVATE
-flush_caches : Nothing
-flush_caches = AuthenticationProvider.flushCloudCaches
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Helpers.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Helpers.enso
index 9b046dced946..af43666202b5 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Helpers.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Helpers.enso
@@ -11,5 +11,5 @@ expect_text : Any -> Any -> Any ! Type_Error
 expect_text text_maybe ~action = case text_maybe of
     _ : Text -> action
     _ ->
-        Error.throw (Type_Error.Error Text (Meta.type_of text_maybe) "text_maybe")
+        Error.throw (Type_Error.Error Text text_maybe "text_maybe")
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex.enso
index f243f9e91914..ae170dcd8579 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Text/Regex.enso
@@ -47,8 +47,8 @@ type Regex
          text before matching on it.
 
        If an empty regex is used, `compile` throws an Illegal_Argument error.
-    compile : Text -> Boolean | Nothing -> Regex ! Regex_Syntax_Error | Illegal_Argument
-    compile expression case_insensitive=False =
+    compile : Text -> Boolean -> Regex ! Regex_Syntax_Error | Illegal_Argument
+    compile expression:Text case_insensitive:Boolean=False =
         if expression == '' then Error.throw (Illegal_Argument.Error "Regex cannot be the empty string") else
             options_string = if case_insensitive == True then "usgi" else "usg"
 
@@ -489,3 +489,14 @@ type Regex_Syntax_Error
        Provides a human-readable representation of the `Regex_Syntax_Error`.
     to_display_text : Text
     to_display_text self = "Regex Syntax Error:" + self.message
+
+## Shorthand to create a regular expression from a Text value.
+
+   If an empty regex is used, throws an Illegal_Argument error.
+
+   Arguments
+   - expression: The text representing the regular expression that you want to
+     compile. Must be non-empty.
+regex : Text -> Regex ! Regex_Syntax_Error | Illegal_Argument
+regex expression:Text = Regex.compile expression
+
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso
index 24f7c648671a..2b1a67fb0e24 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Vector.enso
@@ -1047,7 +1047,8 @@ type Vector a
     sort self (order = Sort_Direction.Ascending) on=Nothing by=Nothing on_incomparable=Problem_Behavior.Ignore =
         Array_Like_Helpers.sort self order on by on_incomparable
 
-    ## GROUP Selections
+    ## ALIAS unique, deduplicate
+       GROUP Selections
        ICON preparation
        Keeps only unique elements within the vector, removing any duplicates.
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_File.enso
similarity index 74%
rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_File.enso
rename to distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_File.enso
index feab8edfa96b..832e8eb94e73 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_File.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_File.enso
@@ -1,5 +1,6 @@
 import project.Any.Any
-import project.Data.Enso_Cloud.Utils
+import project.Enso_Cloud.Errors.Enso_Cloud_Error
+import project.Enso_Cloud.Utils
 import project.Data.Index_Sub_Range.Index_Sub_Range
 import project.Data.Json.JS_Object
 import project.Data.Numbers.Integer
@@ -8,6 +9,7 @@ import project.Data.Text.Matching_Mode.Matching_Mode
 import project.Data.Text.Text
 import project.Data.Text.Text_Sub_Range.Text_Sub_Range
 import project.Data.Time.Date_Time.Date_Time
+import project.Data.Time.Date_Time_Formatter.Date_Time_Formatter
 import project.Data.Vector.Vector
 import project.Error.Error
 import project.Errors.Common.Not_Found
@@ -15,17 +17,21 @@ import project.Errors.File_Error.File_Error
 import project.Errors.Illegal_Argument.Illegal_Argument
 import project.Errors.Illegal_State.Illegal_State
 import project.Errors.Problem_Behavior.Problem_Behavior
+import project.Errors.Time_Error.Time_Error
 import project.Errors.Unimplemented.Unimplemented
 import project.Network.HTTP.HTTP
 import project.Network.HTTP.HTTP_Method.HTTP_Method
-import project.Network.HTTP.Request_Body.Request_Body
 import project.Nothing.Nothing
+import project.Runtime.Context
 import project.System.File.File_Access.File_Access
+import project.System.File.Generic.Writable_File.Writable_File
 import project.System.File_Format_Metadata.File_Format_Metadata
 import project.System.Input_Stream.Input_Stream
 import project.System.Output_Stream.Output_Stream
 from project.Data.Boolean import Boolean, False, True
+from project.Enso_Cloud.Utils import get_required_field
 from project.Data.Text.Extensions import all
+from project.System.File.Generic.File_Write_Strategy import generic_copy
 from project.System.File_Format import Auto_Detect, Bytes, File_Format, Plain_Text_Format
 
 type Enso_File
@@ -57,7 +63,7 @@ type Enso_File
         "" -> if self.asset_type == Enso_Asset_Type.Directory then Utils.directory_api else
             Error.throw (Illegal_Argument.Error "Invalid ID for a "+self.asset_type.to_text+".")
         _ -> case self.asset_type of
-            Enso_Asset_Type.Directory -> Utils.directory_api + "?parent_id=" + self.id
+            Enso_Asset_Type.Directory -> Utils.directory_api + "/" + self.id
             Enso_Asset_Type.File -> Utils.files_api + "/" + self.id
             Enso_Asset_Type.Project -> Utils.projects_api + "/" + self.id
             Enso_Asset_Type.Data_Link -> Utils.secrets_api + "/" + self.id
@@ -67,28 +73,31 @@ type Enso_File
        Checks if the folder or file exists
     exists : Boolean
     exists self =
-        auth_header = Utils.authorization_header
-        response = HTTP.fetch self.internal_uri HTTP_Method.Get [auth_header]
+        response = Utils.http_request HTTP_Method.Get self.internal_uri
         response.code.is_success
 
     ## GROUP Metadata
        Gets the size of a file in bytes.
     size : Integer
-    size self = if self.is_regular_file.not then Error.throw (Illegal_Argument.Error "`size` can only be queried for regular files.") else
-        s3_url = get_s3_url_for_file self
-        response = HTTP.fetch s3_url HTTP_Method.Head []
-        content_length = response.get_header "content-length" if_missing=(Error.throw (Illegal_State.Error "Cannot get file size: missing `Content-Lentth` header."))
-        Integer.parse content_length
+    size self -> Integer = if self.is_regular_file.not then Error.throw (Illegal_Argument.Error "`size` can only be queried for regular files.") else
+        metadata = get_file_description self |> get_required_field "metadata"
+        get_required_field "size" metadata
 
     ## GROUP Metadata
        Gets the creation time of a file.
     creation_time : Date_Time
-    creation_time self = Unimplemented.throw "Enso_File.creation_time is not implemented"
+    creation_time self -> Date_Time = if self.is_directory then Unimplemented.throw "Enso_File.creation_time is not implemented yet for directories." else
+        metadata = get_file_description self |> get_required_field "metadata"
+        Date_Time.parse (get_required_field "created_at" metadata) Date_Time_Formatter.iso_offset_date_time
+            . catch Time_Error error-> Error.throw (Enso_Cloud_Error.Invalid_Response_Payload error)
 
     ## GROUP Metadata
        Gets the last modified time of a file.
     last_modified_time : Date_Time
-    last_modified_time self = Unimplemented.throw "Enso_File.creation_time is not implemented"
+    last_modified_time self = if self.is_directory then Unimplemented.throw "Enso_File.last_modified_time is not implemented yet for directories." else
+        metadata = get_file_description self |> get_required_field "metadata"
+        Date_Time.parse (get_required_field "modified_at" metadata) Date_Time_Formatter.iso_offset_date_time
+            . catch Time_Error error-> Error.throw (Enso_Cloud_Error.Invalid_Response_Payload error)
 
     ## GROUP Metadata
        Checks if this is a folder
@@ -151,7 +160,7 @@ type Enso_File
     with_input_stream : Vector File_Access -> (Input_Stream -> Any ! File_Error) -> Any ! File_Error | Illegal_Argument
     with_input_stream self (open_options : Vector) action = if self.asset_type != Enso_Asset_Type.File then Error.throw (Illegal_Argument.Error "Only files can be opened as a stream.") else
         if (open_options !=  [File_Access.Read]) then Error.throw (Illegal_Argument.Error "Files can only be opened for reading.") else
-            s3_url = get_s3_url_for_file self
+            s3_url = get_download_url_for_file self
             response = HTTP.fetch s3_url HTTP_Method.Get []
             response.if_not_error <| response.body.with_stream action
 
@@ -229,7 +238,7 @@ type Enso_File
        Gets a list of assets within self.
     list : Vector Enso_File
     list self =
-        # Remove secrets from the list
+        # Remove secrets from the list - they are handled separately in `Enso_Secret.list`.
         list_assets self . filter f-> f.asset_type != Enso_Asset_Type.Secret
 
     ## UNSTABLE
@@ -237,23 +246,49 @@ type Enso_File
        Creates a subdirectory in a specified directory.
     create_directory : Text -> Enso_File
     create_directory self (name : Text) = if self.is_directory.not then Error.throw (Illegal_Argument.Error "Only directories can contain subdirectories.") else
-        auth_header = Utils.authorization_header
         name_field = [["title", name]]
         parent_field = if self.id == "" then [] else [["parentId", self.id]]
         body = JS_Object.from_pairs (name_field + parent_field)
-        response = HTTP.post Utils.directory_api body HTTP_Method.Post [auth_header]
-        response.if_not_error <| response.decode_as_json.into Enso_File
+        response = Utils.http_request_as_json HTTP_Method.Post Utils.directory_api body
+        response.into Enso_File
 
     ## UNSTABLE
        GROUP Output
        Deletes the file or directory.
     delete : Nothing
     delete self = if self.id == "" then Error.throw (Illegal_Argument.Error "The root directory cannot be deleted.") else
-        # TODO this is a mess
-        uri = if self.is_directory then Utils.directory_api + "/" + self.id else self.internal_uri
-        auth_header = Utils.authorization_header
-        response = HTTP.post uri Request_Body.Empty HTTP_Method.Delete [auth_header]
-        response.if_not_error <| Nothing
+        response = Utils.http_request HTTP_Method.Delete self.internal_uri
+        response.if_not_error Nothing
+
+    ## Deletes the file if it had existed.
+    delete_if_exists : Nothing
+    delete_if_exists self =
+        r = self.delete
+        r.catch File_Error err-> case err of
+            File_Error.Not_Found _ -> Nothing
+            _ -> r
+
+    ## Copies the file to the specified destination.
+
+       Arguments:
+       - destination: the destination to move the file to.
+       - replace_existing: specifies if the operation should proceed if the
+         destination file already exists. Defaults to `False`.
+    copy_to : Writable_File -> Boolean -> Any ! File_Error
+    copy_to self (destination : Writable_File) (replace_existing : Boolean = False) =
+        generic_copy self destination.file replace_existing
+
+    ## Moves the file to the specified destination.
+
+       Arguments:
+       - destination: the destination to move the file to.
+       - replace_existing: specifies if the operation should proceed if the
+         destination file already exists. Defaults to `False`.
+    move_to : Writable_File -> Boolean -> Nothing ! File_Error
+    move_to self (destination : Writable_File) (replace_existing : Boolean = False) =
+        _ = [destination, replace_existing]
+        Context.Output.if_enabled disabled_message="File moving is forbidden as the Output context is disabled." panic=False <|
+            Unimplemented.throw "Enso_File.move_to is not implemented"
 
     ## UNSTABLE
        GROUP Operators
@@ -264,14 +299,17 @@ type Enso_File
             if name.contains "/" then Error.throw (Illegal_Argument.Error "Resolving sub-paths (/) is not implemented. Temporary workaround: use the `/` operator multiple times.") else
                 self.list . find f-> f.name == name
 
+    ## Returns the text representation of the file descriptor.
+    to_text : Text
+    to_text self -> Text =
+        if self == Enso_File.root then "Cloud Root Directory" else
+            "Cloud " + self.asset_type.to_text + " " + self.name
+
 ## PRIVATE
 list_assets parent = if parent.asset_type != Enso_Asset_Type.Directory then Error.throw (Illegal_Argument.Error "Only directories can be listed.") else
-     auth_header = Utils.authorization_header
-     response = HTTP.fetch parent.internal_uri HTTP_Method.Get [auth_header]
-     response.if_not_error <|
-         js_object = response.decode_as_json
-         assets = js_object.get "assets" if_missing=(Error.throw (Illegal_Argument.Error "Invalid JSON response from the Cloud."))
-         assets.map t-> t.into Enso_File
+     response = Utils.http_request_as_json HTTP_Method.Get parent.internal_uri
+     assets = get_required_field "assets" response
+     assets.map t-> t.into Enso_File
 
 ## PRIVATE
 Enso_File.from (that:JS_Object) = if ["title", "id", "parentId"].any (k-> that.contains_key k . not) then Error.throw (Illegal_Argument.Error "Invalid JSON for an Enso_File.") else
@@ -310,15 +348,16 @@ Enso_Asset_Type.from (that:Text) = case that of
 File_Format_Metadata.from (that:Enso_File) = File_Format_Metadata.Value Nothing that.name (that.extension.catch _->Nothing)
 
 ## PRIVATE
+   Fetches the basic information about a file from the Cloud endpoint.
 get_file_description file:Enso_File -> JS_Object =
-    auth_header = Utils.authorization_header
-    response = HTTP.fetch file.internal_uri HTTP_Method.Get [auth_header]
-    response.if_not_error <|
-        js_object = response.decode_as_json
-        js_object.get "file" if_missing=(Error.throw (Illegal_State.Error "Invalid JSON for an Enso_File (missing `file` field): "+js_object.to_text))
+    Utils.http_request_as_json HTTP_Method.Get file.internal_uri
 
 ## PRIVATE
-get_s3_url_for_file file:Enso_File -> Text =
+   The returned URL may be valid only for a very short time, so it should not be
+   stored anywhere.
+get_download_url_for_file file:Enso_File -> Text =
     file_description = get_file_description file
-    path = file_description.get "path" if_missing=(Error.throw (Illegal_State.Error "Invalid JSON for an Enso_File (missing `path`): "+file_description.to_text))
+    ## TODO migrate to the pre-signed URLs once that is implemented
+       presigned_url = file_description |> get_required_field "url"
+    path = file_description |> get_required_field "file" |> get_required_field "path"
     path.replace "s3://production-enso-organizations-files/" "https://production-enso-organizations-files.s3.eu-west-1.amazonaws.com/"
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_Secret.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_Secret.enso
similarity index 74%
rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_Secret.enso
rename to distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_Secret.enso
index 1a010f46fd23..55eb81de4814 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_Secret.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_Secret.enso
@@ -1,12 +1,12 @@
 import project.Data.Base_64.Base_64
-import project.Data.Enso_Cloud.Enso_File.Enso_Asset_Type
-import project.Data.Enso_Cloud.Enso_File.Enso_File
-import project.Data.Enso_Cloud.Utils
+import project.Enso_Cloud.Enso_File.Enso_Asset_Type
+import project.Enso_Cloud.Enso_File.Enso_File
+import project.Enso_Cloud.Utils
 import project.Data.Json.JS_Object
+import project.Data.Map.Map
 import project.Data.Text.Text
 import project.Data.Vector.Vector
 import project.Error.Error
-import project.Errors.Common.Forbidden_Operation
 import project.Errors.Common.Not_Found
 import project.Errors.Illegal_Argument.Illegal_Argument
 import project.Network.HTTP.HTTP
@@ -15,7 +15,7 @@ import project.Network.HTTP.Request_Body.Request_Body
 import project.Nothing.Nothing
 import project.Runtime.Context
 from project.Data.Boolean import Boolean, False, True
-from project.Data.Enso_Cloud.Enso_File import list_assets
+from project.Enso_Cloud.Enso_File import list_assets
 from project.Data.Text.Extensions import all
 
 polyglot java import org.enso.base.enso_cloud.EnsoSecretHelper
@@ -35,25 +35,24 @@ type Enso_Secret
          created in the current working directory.
     create : Text -> Text -> Enso_File | Nothing -> Enso_Secret
     create name:Text value:Text parent:(Enso_File | Nothing)=Nothing = if name == "" then Error.throw (Illegal_Argument.Error "Secret name cannot be empty") else
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Creating a secret is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="Creating a secret is forbidden as the Output context is disabled." panic=False <|
             if name.starts_with "connection-" then Error.throw (Illegal_Argument.Error "Secret name cannot start with 'connection-'") else
-                if Enso_Secret.exists name parent then Error.throw (Illegal_Argument.Error "Secret with this name already exists.") else
-                    auth_header = Utils.authorization_header
-                    parent_id = (parent.if_nothing Enso_File.current_working_directory).id
-                    parent_id_pair = if parent_id == "" then [] else [["parentDirectoryId", parent.id]]
-                    body = JS_Object.from_pairs [["name", name], ["value", value]]+parent_id_pair
-                    response = HTTP.post Utils.secrets_api body HTTP_Method.Post [auth_header]
-                    id = response.decode_as_json
-                    Enso_Secret.Value name id
+                parent_dir = parent.if_nothing Enso_File.current_working_directory
+                parent_id_pair = if parent_dir.id == "" then [] else [["parentDirectoryId", parent_dir.id]]
+                body = JS_Object.from_pairs [["name", name], ["value", value]]+parent_id_pair
+                handle_already_exists _ =
+                    message = "A secret with the name " + name.pretty + " already exists inside of directory " + parent_dir.name + "."
+                    Error.throw (Illegal_Argument.Error message)
+                error_handlers = Map.from_vector [["resource_already_exists", handle_already_exists]]
+                id = Utils.http_request_as_json HTTP_Method.Post Utils.secrets_api body error_handlers=error_handlers
+                Enso_Secret.Value name id
 
     ## GROUP Output
        Deletes a secret.
     delete : Enso_Secret
     delete self =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Deleting a secret is forbidden as the Output context is disabled.") else
-            auth_header = Utils.authorization_header
-            uri = Utils.secrets_api + "/" + self.id
-            response = HTTP.post uri Request_Body.Empty HTTP_Method.Delete [auth_header]
+        Context.Output.if_enabled disabled_message="Deleting a secret is forbidden as the Output context is disabled." panic=False <|
+            response = Utils.http_request HTTP_Method.Delete (secret_resource_uri self)
             response.if_not_error self
 
     ## GROUP Input
@@ -101,14 +100,9 @@ type Enso_Secret
        - new_value: The new value of the secret
     update_value : Text -> Enso_Secret
     update_value self (new_value : Text) =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Updating a secret is forbidden as the Output context is disabled.") else
-            auth_header = Utils.authorization_header
-            ## TODO I'd rather not have this obfuscated path in Enso code
-               (well it's clearly visible in Java code anyway, so no real harm),
-               but it's needed due to Cloud API structure.
-            uri = Utils.cloud_root_uri + "s3cr3tz" + "/" + self.id
+        Context.Output.if_enabled disabled_message="Updating a secret is forbidden as the Output context is disabled." panic=False <|
             body = JS_Object.from_pairs [["value", new_value]]
-            response = HTTP.post uri body HTTP_Method.Put [auth_header]
+            response = Utils.http_request HTTP_Method.Put (secret_resource_uri self) body
             response.if_not_error <|
                 EnsoSecretHelper.deleteSecretFromCache self.id
                 self
@@ -173,3 +167,7 @@ as_hideable_value (value : Text | Enso_Secret | Derived_Secret_Value) = case val
     Derived_Secret_Value.Secret_Value secret -> as_hideable_value secret
     Derived_Secret_Value.Concat left right -> HideableValue.ConcatValues.new (as_hideable_value left) (as_hideable_value right)
     Derived_Secret_Value.Base_64_Encode inner -> HideableValue.Base64EncodeValue.new (as_hideable_value inner)
+
+## PRIVATE
+secret_resource_uri secret =
+    Utils.secrets_api + "/" + secret.id
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_User.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_User.enso
similarity index 52%
rename from distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_User.enso
rename to distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_User.enso
index 98fa305b0ca8..e032db6398c0 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Data/Enso_Cloud/Enso_User.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Enso_User.enso
@@ -1,6 +1,6 @@
-import project.Data.Enso_Cloud.Enso_File.Enso_Asset_Type
-import project.Data.Enso_Cloud.Enso_File.Enso_File
-import project.Data.Enso_Cloud.Utils
+import project.Enso_Cloud.Enso_File.Enso_Asset_Type
+import project.Enso_Cloud.Enso_File.Enso_File
+import project.Enso_Cloud.Utils
 import project.Data.Json.JS_Object
 import project.Data.Text.Text
 import project.Data.Vector.Vector
@@ -10,6 +10,7 @@ import project.Network.HTTP.HTTP
 import project.Network.HTTP.HTTP_Method.HTTP_Method
 import project.Nothing.Nothing
 from project.Data.Boolean import Boolean, False, True
+from project.Enso_Cloud.Utils import get_required_field
 
 type Enso_User
     ## PRIVATE
@@ -26,23 +27,15 @@ type Enso_User
     ## Fetch the current user.
     current : Enso_User
     current =
-        auth_header = Utils.authorization_header
-        user_api = Utils.cloud_root_uri + "users/me"
-        response = HTTP.fetch user_api HTTP_Method.Get [auth_header]
-        response.if_not_error <|
-            js_object = response.decode_as_json
-            Enso_User.from js_object
+        json = Utils.http_request_as_json HTTP_Method.Get (Utils.cloud_root_uri + "users/me")
+        Enso_User.from json
 
     ## Lists all known users.
     list : Vector Enso_User
     list =
-        auth_header = Utils.authorization_header
-        user_api = Utils.cloud_root_uri + "users"
-        response = HTTP.fetch user_api HTTP_Method.Get [auth_header]
-        response.if_not_error <|
-            js_object = response.decode_as_json
-            users = js_object.get 'users' []
-            users.map (user-> Enso_User.from user)
+        json = Utils.http_request_as_json HTTP_Method.Get (Utils.cloud_root_uri + "users")
+        users = get_required_field "users" json
+        users.map (user-> Enso_User.from user)
 
     ## Flushes all cloud caches.
        For example, it will flush cached secrets, ensuring that new values will
@@ -51,8 +44,8 @@ type Enso_User
     flush_caches = Utils.flush_caches
 
 ## PRIVATE
-Enso_User.from (that:JS_Object) = if ["name", "email", "id"].any (k-> that.contains_key k . not) then Error.throw (Illegal_Argument.Error "Invalid JSON for an Enso_User.") else
-    root_folder_id = that.get "rootDirectoryId" ""
+Enso_User.from (that:JS_Object) =
+    root_folder_id = get_required_field "rootDirectoryId" that
     root_folder = Enso_File.Value "" root_folder_id "" Enso_Asset_Type.Directory
     is_enabled = that.get "isEnabled" True
-    Enso_User.User (that.get "name") (that.get "email") (that.get "id") root_folder is_enabled
+    Enso_User.User (get_required_field "name" that) (get_required_field "email" that) (get_required_field "id" that) root_folder is_enabled
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Errors.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Errors.enso
new file mode 100644
index 000000000000..f774ab7e0c4a
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Errors.enso
@@ -0,0 +1,36 @@
+import project.Any.Any
+import project.Data.Text.Text
+import project.Network.HTTP.HTTP_Status_Code.HTTP_Status_Code
+
+## PRIVATE
+   Error if the user is not logged into Enso Cloud.
+type Not_Logged_In
+    ## PRIVATE
+    to_display_text : Text
+    to_display_text self = "Not logged into Enso cloud. Please log in and restart."
+
+## PRIVATE
+type Enso_Cloud_Error
+    ## PRIVATE
+       An unhandled error response from Enso Cloud.
+    Unexpected_Service_Error (status_code : HTTP_Status_Code) (payload : Text)
+
+    ## PRIVATE
+       An error response from Enso Cloud that could not be parsed.
+    Invalid_Response_Payload (cause : Text | Any)
+
+    ## PRIVATE
+       An error response from Enso Cloud indicating that the provided user data is invalid.
+    Unauthorized
+
+    ## PRIVATE
+       An error indicating issues with connecting to Enso Cloud.
+    Connection_Error (cause : Any)
+
+    ## PRIVATE
+    to_display_text : Text
+    to_display_text self = case self of
+        Enso_Cloud_Error.Unexpected_Service_Error status_code payload -> "Unexpected error response from Enso Cloud: " + status_code.to_text + ": " + payload
+        Enso_Cloud_Error.Invalid_Response_Payload cause -> "Internal error: A response from Enso Cloud could not be parsed: " + cause.to_display_text
+        Enso_Cloud_Error.Unauthorized -> "Enso Cloud credentials file was found, but the service responded with 401 Unauthorized. You may try logging in again and restarting the workflow."
+        Enso_Cloud_Error.Connection_Error cause -> "Error connecting to Enso Cloud: " + cause.to_display_text
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Utils.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Utils.enso
new file mode 100644
index 000000000000..5f369030d0f2
--- /dev/null
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Enso_Cloud/Utils.enso
@@ -0,0 +1,118 @@
+private
+
+import project.Any.Any
+import project.Enso_Cloud.Enso_Secret.Derived_Secret_Value
+import project.Enso_Cloud.Enso_Secret.Enso_Secret
+import project.Enso_Cloud.Errors.Enso_Cloud_Error
+import project.Enso_Cloud.Errors.Not_Logged_In
+import project.Data.Json.Invalid_JSON
+import project.Data.Json.JS_Object
+import project.Data.Map.Map
+import project.Data.Pair.Pair
+import project.Data.Text.Text
+import project.Data.Vector.Vector
+import project.Error.Error
+import project.Function.Function
+import project.Network.HTTP.Header.Header
+import project.Network.HTTP.HTTP
+import project.Network.HTTP.HTTP_Error.HTTP_Error
+import project.Network.HTTP.HTTP_Method.HTTP_Method
+import project.Network.HTTP.HTTP_Status_Code.HTTP_Status_Code
+import project.Network.HTTP.Request.Request
+import project.Network.HTTP.Request_Body.Request_Body
+import project.Network.HTTP.Request_Error
+import project.Network.HTTP.Response.Response
+import project.Network.URI.URI
+import project.Nothing.Nothing
+import project.Runtime.Ref.Ref
+import project.System.Environment
+import project.System.File.File
+from project.Data.Boolean import Boolean, False, True
+from project.Data.Text.Extensions import all
+
+polyglot java import org.enso.base.enso_cloud.AuthenticationProvider
+
+## PRIVATE
+cloud_root_uri = "" + AuthenticationProvider.getAPIRootURI
+
+## PRIVATE
+   Construct the authorization header for the request
+authorization_header : Header
+authorization_header =
+    token = AuthenticationProvider.getToken.if_nothing <|
+        f = credentials_file
+        if f.exists.not then Error.throw Not_Logged_In else
+            AuthenticationProvider.setToken (f.read_text)
+    Header.authorization_bearer token
+
+## PRIVATE
+credentials_file : File
+credentials_file = case Environment.get "ENSO_CLOUD_CREDENTIALS_FILE" of
+    Nothing -> File.home / ".enso" / "credentials"
+    path -> File.new path
+
+## PRIVATE
+   Root address for listing folders
+directory_api = cloud_root_uri + "directories"
+
+## PRIVATE
+   Root address for listing folders
+files_api = cloud_root_uri + "files"
+
+## PRIVATE
+   Root address for listing folders
+projects_api = cloud_root_uri + "projects"
+
+## PRIVATE
+   Root address for Secrets API
+secrets_api = cloud_root_uri + "secrets"
+
+## PRIVATE
+   The current project directory that will be used as the working directory,
+   if the user is running in the Cloud.
+internal_cloud_project_directory = AuthenticationProvider.getCurrentWorkingDirectory
+
+## PRIVATE
+flush_caches : Nothing
+flush_caches = AuthenticationProvider.flushCloudCaches
+
+## PRIVATE
+   Performs a standard request to the Enso Cloud API,
+   parsing the result as JSON.
+http_request_as_json (method : HTTP_Method) (url : URI) (body : Request_Body = Request_Body.Empty) (additional_headers : Vector = []) (error_handlers : Map Text (Any -> Any) = Map.empty) -> Any ! Enso_Cloud_Error =
+    response = http_request method url body additional_headers error_handlers
+    response.decode_as_json.catch Invalid_JSON error->
+        Error.throw (Enso_Cloud_Error.Invalid_Response_Payload error)
+
+## PRIVATE
+   Performs a standard request to the Enso Cloud API,
+   returning a raw response on success, but handling the error responses.
+
+   Custom error handlers can be provided as a mapping from error codes
+   (defined in the cloud project) to functions that take the full JSON payload
+   and return a custom error.
+http_request (method : HTTP_Method) (url : URI) (body : Request_Body = Request_Body.Empty) (additional_headers : Vector = []) (error_handlers : Map Text (Any -> Any) = Map.empty) -> Response ! Enso_Cloud_Error =
+    all_headers = [authorization_header] + additional_headers
+    as_connection_error err = Error.throw (Enso_Cloud_Error.Connection_Error err)
+    response = HTTP.new.request (Request.new method url headers=all_headers body=body) error_on_failure_code=False
+        . catch HTTP_Error as_connection_error
+        . catch Request_Error as_connection_error
+    if response.code.is_success then response else
+        if response.code == HTTP_Status_Code.unauthorized then Error.throw Enso_Cloud_Error.Unauthorized else
+            payload = response.decode_as_text
+            ## If the payload can be parsed as JSON, contains a `code` field and this `code` is found in the error
+               handlers, a specialized handler will be used for the error. Otherwise, a generic Unexpected_Service_Error
+               will be reported, containing the payload for inspection.
+            json_payload = payload.parse_json.catch Invalid_JSON (_->Nothing)
+            error_code = json_payload.get "code"
+            handler = error_code.if_not_nothing <| error_handlers.get error_code
+            case handler of
+                Nothing -> Error.throw (Enso_Cloud_Error.Unexpected_Service_Error response.code payload)
+                _ : Function -> handler json_payload
+
+## PRIVATE
+   A helper that extracts a field from a response and handles unexpected
+   response structure.
+get_required_field key js_object = case js_object of
+    _ : JS_Object -> js_object.get key if_missing=(Error.throw (Enso_Cloud_Error.Invalid_Response_Payload "Missing required field `"+key+"` in "+js_object.to_display_text+"."))
+    _ -> Error.throw (Enso_Cloud_Error.Invalid_Response_Payload "Expected a JSON object, but got "+js_object.to_display_text+".")
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
index a5617b5b167b..6fec7ad63015 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
@@ -79,7 +79,7 @@ type Type_Error
                         _ -> ". Try to apply " + (missing_args.join ", ") + " arguments"
                _ -> tpe.to_text
 
-        "Type error: expected "+self.comment+" to be "+self.expected.to_display_text+", but got "+type_of_actual+"."
+        "Type error: expected "+self.comment+" to be "+self.expected.to_display_text+", but got "+(if type_of_actual.is_a Text then type_of_actual else "<ERR>")+"."
 
 @Builtin_Type
 type Compile_Error
@@ -380,16 +380,17 @@ type No_Conversion_Currying
 @Builtin_Type
 type Forbidden_Operation
     ## PRIVATE
-       An error that occurs when the action is not allowed to perform the operation in the given context.
+       An error that occurs when the action is not allowed to perform the
+       operation in the given context.
 
        Arguments:
-       - operation: attempted context that is not allowed.
-    Error operation
+       - message: message describing the operation that was not allowed.
+    Error message
 
     ## PRIVATE
        Convert the Forbidden_Operation error to a human-readable format.
     to_display_text : Text
-    to_display_text self = "Forbidden operation: "+self.operation+"."
+    to_display_text self = "Forbidden operation: "+self.message
 
 type Dry_Run_Operation
     ## PRIVATE
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/File_Error.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/File_Error.enso
index f4623dafeb63..18082551b390 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/File_Error.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Errors/File_Error.enso
@@ -12,6 +12,7 @@ import project.System.File_Format_Metadata.File_Format_Metadata
 
 polyglot java import java.io.FileNotFoundException
 polyglot java import java.io.IOException
+polyglot java import java.io.UncheckedIOException
 polyglot java import java.nio.file.AccessDeniedException
 polyglot java import java.nio.file.FileAlreadyExistsException
 polyglot java import java.nio.file.NoSuchFileException
@@ -71,8 +72,13 @@ type File_Error
 
        Utility method for running an action with Java exceptions mapping.
     handle_java_exceptions (file : File | Nothing) ~action =
-        Panic.catch IOException action caught_panic->
+        handle_io_exception caught_panic =
             File_Error.wrap_io_exception file caught_panic.payload
+        handle_unchecked_io_exception caught_panic =
+            File_Error.wrap_io_exception file caught_panic.payload.getCause
+        Panic.catch IOException handler=handle_io_exception <|
+            Panic.catch UncheckedIOException handler=handle_unchecked_io_exception <|
+                action
 
     ## PRIVATE
        Raises an error indicating that the user does not have permission to
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso
index 44abe8ed1023..e939fa6b6bba 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Main.enso
@@ -2,9 +2,9 @@ import project.Any.Any
 import project.Data
 import project.Data.Array.Array
 import project.Data.Boolean
-import project.Data.Enso_Cloud.Enso_File.Enso_File
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
-import project.Data.Enso_Cloud.Enso_User.Enso_User
+import project.Enso_Cloud.Enso_File.Enso_File
+import project.Enso_Cloud.Enso_Secret.Enso_Secret
+import project.Enso_Cloud.Enso_User.Enso_User
 import project.Data.Filter_Condition.Filter_Action
 import project.Data.Filter_Condition.Filter_Condition
 import project.Data.Index_Sub_Range.Index_Sub_Range
@@ -92,6 +92,7 @@ from project.Data.Index_Sub_Range.Index_Sub_Range import First, Last
 from project.Data.Json.Extensions import all
 from project.Data.Range.Extensions import all
 from project.Data.Text.Extensions import all
+from project.Data.Text.Regex import regex
 from project.Errors.Problem_Behavior.Problem_Behavior import all
 from project.Meta.Enso_Project import enso_project
 from project.Network.Extensions import all
@@ -100,9 +101,9 @@ from project.System.File_Format.Plain_Text_Format import Plain_Text
 export project.Any.Any
 export project.Data
 export project.Data.Array.Array
-export project.Data.Enso_Cloud.Enso_File.Enso_File
-export project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
-export project.Data.Enso_Cloud.Enso_User.Enso_User
+export project.Enso_Cloud.Enso_File.Enso_File
+export project.Enso_Cloud.Enso_Secret.Enso_Secret
+export project.Enso_Cloud.Enso_User.Enso_User
 export project.Data.Filter_Condition.Filter_Action
 export project.Data.Filter_Condition.Filter_Condition
 export project.Data.Index_Sub_Range.Index_Sub_Range
@@ -189,6 +190,7 @@ from project.Data.Numbers export Float, Integer, Number
 from project.Data.Range.Extensions export all
 from project.Data.Statistics export all hiding to_moment_statistic, wrap_java_call, calculate_correlation_statistics, calculate_spearman_rank, calculate_correlation_statistics_matrix, compute_fold, empty_value, is_valid
 from project.Data.Text.Extensions export all
+from project.Data.Text.Regex export regex
 from project.Errors.Problem_Behavior.Problem_Behavior export all
 from project.Function export all
 from project.Meta.Enso_Project export enso_project
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso
index 38589af5473f..b0a68d7d7e82 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Meta.enso
@@ -386,8 +386,19 @@ new_atom constructor fields = @Builtin_Method "Meta.new_atom"
    `fill` properties. Value contains the created atom and `fill` holds a
    function to "fill the hole" later.
 
+   There can be only one hole in the atom, i.e., only one field of the atom
+   returned by the `value` method should be a hole. If this condition is
+   violated, a Panic error with `Uninitialized_State` payload is thrown.
+
    Arguments:
    - factory: a function that takes the "hole" element and returns newly created atom
+
+   > Example
+     Create a Pair that has a hole in its first element.
+         atom_with_hole = Meta.atom_with_hole (e-> Pair.Value e 2)
+         atom_with_hole.value.first.to_text == "Meta.atom_with_hole"
+         atom_with_hole.fill 1
+         atom_with_hole.value.first.to_text == "1"
 atom_with_hole : (Any -> Atom) -> Any
 atom_with_hole factory = @Builtin_Method "Meta.atom_with_hole_builtin"
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso
index f8abdb9edd8e..8b8512e5f282 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP.enso
@@ -1,5 +1,5 @@
 import project.Any.Any
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
+import project.Enso_Cloud.Enso_Secret.Enso_Secret
 import project.Data.Map.Map
 import project.Data.Pair.Pair
 import project.Data.Set.Set
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/HTTP_Error.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/HTTP_Error.enso
index b0fcb387fce6..e03d0b055667 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/HTTP_Error.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/HTTP_Error.enso
@@ -1,5 +1,6 @@
 import project.Any.Any
 import project.Data.Text.Text
+import project.Error.Error
 import project.Network.HTTP.HTTP_Status_Code.HTTP_Status_Code
 import project.Network.URI.URI
 import project.Nothing.Nothing
@@ -40,4 +41,4 @@ type HTTP_Error
        Utility method for running an action with Java exceptions mapping.
     handle_java_exceptions (uri:URI) ~action =
         Panic.catch IOException action caught_panic->
-            HTTP_Error.IO_Error uri ("An IO error has occurred: " + caught_panic.payload.to_text)
+            Error.throw (HTTP_Error.IO_Error uri ("An IO error has occurred: " + caught_panic.payload.to_text))
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Header.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Header.enso
index f9772d14ecc3..3b26119dc79d 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Header.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/HTTP/Header.enso
@@ -1,12 +1,12 @@
-import project.Data.Enso_Cloud.Enso_Secret.Derived_Secret_Value
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
-import project.Data.Enso_Cloud.Utils as Cloud_Utils
+import project.Enso_Cloud.Enso_Secret.Derived_Secret_Value
+import project.Enso_Cloud.Enso_Secret.Enso_Secret
+import project.Enso_Cloud.Utils as Cloud_Utils
 import project.Data.Numbers.Integer
 import project.Data.Text.Encoding.Encoding
 import project.Data.Text.Text
 import project.Nothing.Nothing
 from project.Data.Boolean import Boolean, False, True
-from project.Data.Enso_Cloud.Enso_Secret import as_hideable_value
+from project.Enso_Cloud.Enso_Secret import as_hideable_value
 from project.Data.Ordering import all
 from project.Data.Text.Extensions import all
 
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/URI.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/URI.enso
index 6a349037b902..efa44cf4d738 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Network/URI.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Network/URI.enso
@@ -1,6 +1,6 @@
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret
-import project.Data.Enso_Cloud.Enso_Secret.Enso_Secret_Error
-import project.Data.Enso_Cloud.Utils as Cloud_Utils
+import project.Enso_Cloud.Enso_Secret.Enso_Secret
+import project.Enso_Cloud.Enso_Secret.Enso_Secret_Error
+import project.Enso_Cloud.Utils as Cloud_Utils
 import project.Data.Json.JS_Object
 import project.Data.Numbers.Integer
 import project.Data.Ordering.Comparable
@@ -18,7 +18,7 @@ import project.Meta
 import project.Nothing.Nothing
 import project.Panic.Panic
 from project.Data.Boolean.Boolean import False, True
-from project.Data.Enso_Cloud.Enso_Secret import as_hideable_value
+from project.Enso_Cloud.Enso_Secret import as_hideable_value
 from project.Data.Text.Extensions import all
 
 polyglot java import java.net.URI as Java_URI
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
index 24d3d78b9827..f4d15615ca7a 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
@@ -1,9 +1,9 @@
 import project.Any.Any
 import project.Data.Array.Array
-import project.Data.Boolean.Boolean
 import project.Data.Text.Case.Case
 import project.Data.Text.Text
 import project.Data.Vector.Vector
+import project.Error.Error
 import project.Errors.Common.Assertion_Error
 import project.Errors.Common.Forbidden_Operation
 import project.Errors.Common.Type_Error
@@ -14,6 +14,7 @@ import project.Panic.Panic
 import project.Polyglot.Polyglot
 import project.Runtime.Source_Location.Source_Location
 import project.System
+from project.Data.Boolean import Boolean, False, True
 from project.Data.Index_Sub_Range.Index_Sub_Range import First, Last
 from project.Data.Text.Extensions import all
 from project.Runtime.Context import Input, Output
@@ -168,12 +169,20 @@ type Context
        function and returns the result. If not, panics.
 
        Arguments:
-       - environment: Name of the execution environment.
-       - context: The context to enable.
        - action: Action to be performed with the context enabled.
-    if_enabled : Function -> Text -> Any
-    if_enabled self ~action environment=Runtime.current_execution_environment =
-        if self.is_enabled environment then action else Panic.throw (Forbidden_Operation.Error self.name)
+       - environment: Name of the execution environment.
+       - disabled_message: Message to be used in the error if the context is
+         disabled.
+       - panic: If set to `True`, the error is raised as a Panic.
+         Otherwise, it is a dataflow error.
+         A dataflow error may be lost if the result of the action is not used,
+         so raising a `Panic` is safer. However, when we know that the result is
+         not discarded, the dataflow error is preferred.
+    if_enabled : Any -> Text -> Text -> Boolean -> Any ! Forbidden_Operation
+    if_enabled self ~action (environment : Text = Runtime.current_execution_environment) (disabled_message : Text = "The "+self.name+" context is disabled.") (panic : Boolean = True) =
+        if self.is_enabled environment then action else
+            error = Forbidden_Operation.Error disabled_message
+            if panic then Panic.throw error else Error.throw error
 
     ## PRIVATE
        ADVANCED
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
index 4206d8c85c39..5b93f30e4f79 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File.enso
@@ -12,7 +12,6 @@ import project.Data.Time.Date_Time.Date_Time
 import project.Data.Vector.Vector
 import project.Error.Error
 import project.Errors.Common.Dry_Run_Operation
-import project.Errors.Common.Forbidden_Operation
 import project.Errors.Common.Type_Error
 import project.Errors.File_Error.File_Error
 import project.Errors.Illegal_Argument.Illegal_Argument
@@ -188,7 +187,7 @@ type File
                 _ -> stream
             Output_Stream.new wrapped (File_Error.handle_java_exceptions self)
 
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "File writing is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="File writing is forbidden as the Output context is disabled." panic=False <|
             Managed_Resource.bracket (new_output_stream self open_options) (_.close) action
 
     ## PRIVATE
@@ -489,7 +488,7 @@ type File
                 (Examples.data_dir / "my_directory") . create_directory
     create_directory : Nothing
     create_directory self =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Directory creation is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="Directory creation is forbidden as the Output context is disabled." panic=False <|
             self.create_directory_builtin
 
 
@@ -627,7 +626,7 @@ type File
                  file.delete
     delete : Nothing ! File_Error
     delete self =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "File deleting is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="File deleting is forbidden as the Output context is disabled." panic=False <|
             File_Error.handle_java_exceptions self self.delete_builtin
 
     ## Copies the file to the specified destination.
@@ -636,14 +635,12 @@ type File
        - destination: the destination to move the file to.
        - replace_existing: specifies if the operation should proceed if the
          destination file already exists. Defaults to `False`.
-    copy_to : File -> Boolean -> Nothing ! File_Error
-    copy_to self destination replace_existing=False =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "File copying is forbidden as the Output context is disabled.") else
-            File_Error.handle_java_exceptions self <| case replace_existing of
-                True ->
-                  copy_options = [StandardCopyOption.REPLACE_EXISTING]
-                  self.copy_builtin destination copy_options
-                False -> self.copy_builtin destination []
+    copy_to : Writable_File -> Boolean -> Nothing ! File_Error
+    copy_to self (destination : Writable_File) (replace_existing : Boolean = False) =
+        Context.Output.if_enabled disabled_message="File copying is forbidden as the Output context is disabled." panic=False <|
+            case destination.file of
+                _ : File -> local_file_copy self destination.file replace_existing
+                _ -> destination.copy_from_local self replace_existing
 
     ## Moves the file to the specified destination.
 
@@ -651,14 +648,15 @@ type File
        - destination: the destination to move the file to.
        - replace_existing: specifies if the operation should proceed if the
          destination file already exists. Defaults to `False`.
-    move_to : File -> Boolean -> Nothing ! File_Error
-    move_to self destination replace_existing=False =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "File moving is forbidden as the Output context is disabled.") else
-            File_Error.handle_java_exceptions self <| case replace_existing of
-                True ->
-                  copy_options = [StandardCopyOption.REPLACE_EXISTING]
-                  self.move_builtin destination copy_options
-                False -> self.move_builtin destination []
+    move_to : Writable_File -> Boolean -> Nothing ! File_Error
+    move_to self (destination : Writable_File) (replace_existing : Boolean = False) =
+        Context.Output.if_enabled disabled_message="File moving is forbidden as the Output context is disabled." panic=False <|
+            case destination.file of
+                _ : File -> local_file_move self destination.file replace_existing
+                _ ->
+                    r = destination.copy_from_local self replace_existing
+                    r.if_not_error <|
+                        self.delete . if_not_error r
 
     ## Deletes the file if it exists on disk.
 
@@ -843,3 +841,17 @@ File_Like.from (that : File) = File_Like.Value that
 ## PRIVATE
 Writable_File.from (that : File) =
     Writable_File.Value that.absolute.normalize Local_File_Write_Strategy.instance
+
+## PRIVATE
+local_file_copy : File -> File -> Boolean -> Nothing ! File_Error
+local_file_copy source destination replace_existing =
+    File_Error.handle_java_exceptions source <|
+        copy_options = if replace_existing then [StandardCopyOption.REPLACE_EXISTING] else []
+        source.copy_builtin destination copy_options
+
+## PRIVATE
+local_file_move : File -> File -> Boolean -> Nothing ! File_Error
+local_file_move source destination replace_existing =
+    File_Error.handle_java_exceptions source <|
+        copy_options = if replace_existing then [StandardCopyOption.REPLACE_EXISTING] else []
+        source.move_builtin destination copy_options
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Like.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Like.enso
index 3b9be6932b89..2bec67c7d405 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Like.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Like.enso
@@ -1,4 +1,5 @@
 import project.Data.Text.Text
+import project.System.File.File
 
 ## PRIVATE
    A generic interface for file-like objects.
@@ -19,3 +20,6 @@ type File_Like
 
     ## PRIVATE
     to_display_text self -> Text = self.underlying.to_display_text
+
+## PRIVATE
+File_Like.from (that : Text) = File_Like.from (File.new that)
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Write_Strategy.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Write_Strategy.enso
index 07a9382516a9..6e487ae1ac6f 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Write_Strategy.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/File_Write_Strategy.enso
@@ -1,5 +1,4 @@
 import project.Error.Error
-import project.Errors.Common.Forbidden_Operation
 import project.Errors.File_Error.File_Error
 import project.Panic.Panic
 import project.Runtime.Context
@@ -31,7 +30,12 @@ type File_Write_Strategy
        A remote file is downloaded to a temporary file and the provided action
        is called with that local temporary file. Then that file is uploaded to
        replace the remote file.
-    Value write_overwriting write_appending write_raising_error write_backing_up create_dry_run_file write_with_local_file
+
+       The `copy_from_local` action creates the file on a given backend from a
+       local file. It can be used to implement more efficient upload strategies
+       than ones based on just writing to an output stream.
+       The default `generic_copy` implementation can always be used here.
+    Value write_overwriting write_appending write_raising_error write_backing_up create_dry_run_file write_with_local_file copy_from_local
 
     ## PRIVATE
        Writes to a file according to the provided existing file behaviour.
@@ -74,7 +78,7 @@ default_raise_error file action =
 
 ## PRIVATE
 generic_remote_write_with_local_file (file : Writable_File) existing_file_behavior action =
-    if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Writing to remote file backends is not allowed in dry-run mode.") else
+    Context.Output.if_enabled disabled_message="Writing to remote file backends is not allowed in dry-run mode." panic=False <|
         temp_file = File.create_temporary_file prefix="remote-write-"
         Panic.with_finalizer temp_file.delete <|
             tmp_synchronized = case file.exists of
@@ -128,3 +132,12 @@ dry_run_behavior file behavior:Existing_File_Behavior -> Dry_Run_File_Settings =
         Dry_Run_File_Settings.Value Existing_File_Behavior.Overwrite copy_original=False
     Existing_File_Behavior.Append ->
         Dry_Run_File_Settings.Value Existing_File_Behavior.Append copy_original=True
+
+## PRIVATE
+   Generic `copy` implementation between two backends.
+   The files only need to support `with_input_stream` and `with_output_stream`.
+generic_copy source destination replace_existing =
+    source.with_input_stream [File_Access.Read] input_stream->
+        options = if replace_existing then [File_Access.Write, File_Access.Create, File_Access.Truncate_Existing] else [File_Access.Write, File_Access.Create_New]
+        destination.with_output_stream options output_stream->
+            output_stream.write_stream input_stream . if_not_error destination
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/Writable_File.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/Writable_File.enso
index 4a007baca782..2d91bf88048d 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/Writable_File.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Generic/Writable_File.enso
@@ -54,6 +54,13 @@ type Writable_File
     write_requiring_local_file self (existing_file_behavior : Existing_File_Behavior) (action : File -> Any) -> Any =
         self.write_strategy.write_with_local_file self.file existing_file_behavior action
 
+    ## PRIVATE
+       Writes a local file to this `Writable_File` destination.
+       This is used by `File.copy_to` and `File.move_to` to possibly implement
+       the upload more efficiently (avoiding duplicated temporary files).
+    copy_from_local self (source : File) (replace_existing : Boolean) =
+        self.write_strategy.copy_from_local source self.file replace_existing
+
     ## PRIVATE
     with_output_stream self (open_options : Vector) action =
         self.file.with_output_stream open_options action
@@ -69,10 +76,7 @@ type Writable_File
     to_display_text self -> Text = self.file.to_display_text
 
 ## PRIVATE
-Writable_File.from (that : Text) =
-    ## Currently this only works for local filesystem paths
-       TODO We should extend it to also support custom paths like S3, through a ServiceProvider solution
-    Writable_File.from (File.new that)
+Writable_File.from (that : Text) = Writable_File.from (File.new that)
 
 ## PRIVATE
    If a conversion to `File_Format_Metadata` is needed, we delegate to the underlying file.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Local_File_Write_Strategy.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Local_File_Write_Strategy.enso
index 690ee4dc5806..f9c7c450cc8c 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Local_File_Write_Strategy.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/System/File/Local_File_Write_Strategy.enso
@@ -6,6 +6,7 @@ import project.Errors.Illegal_State.Illegal_State
 import project.Nothing.Nothing
 import project.Panic.Caught_Panic
 import project.Panic.Panic
+import project.System.File.File
 import project.System.File.File_Access.File_Access
 import project.System.Output_Stream.Output_Stream
 from project.Data.Boolean import Boolean, False, True
@@ -13,12 +14,15 @@ from project.System.File.Generic.File_Write_Strategy import File_Write_Strategy,
 
 ## PRIVATE
 instance =
-    File_Write_Strategy.Value default_overwrite default_append default_raise_error moving_backup create_dry_run_file write_with_local_file
+    File_Write_Strategy.Value default_overwrite default_append default_raise_error moving_backup create_dry_run_file write_with_local_file copy_local_from_local
 
 ## PRIVATE
 create_dry_run_file file copy_original =
     file.create_dry_run_file copy_original
 
+## PRIVATE
+copy_local_from_local (source : File) (destination : File) = source.copy_to destination
+
 ## PRIVATE
    A `Backup` strategy that does the following:
    1. If the file does not exist, we write to it.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Widget_Helpers.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Widget_Helpers.enso
index 5e1eb713d003..a27c21841628 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Widget_Helpers.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Widget_Helpers.enso
@@ -14,7 +14,7 @@ from project.Metadata.Choice import Option
    Creates a Regex / Text Widget for search and replace.
 make_regex_text_widget : Widget
 make_regex_text_widget =
-    make_single_choice [["Text", '""'], ["Regular Expression", '"^$".to_regex']]
+    make_single_choice [["<Text Value>", '""'], ["<Regular Expression>", '(regex "^$")']]
 
 ## PRIVATE
    Creates a Single_Choice Widget for delimiters.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
index a6d93156334d..569a2f4be489 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
@@ -1,6 +1,5 @@
 from Standard.Base import all
 import Standard.Base.Errors.Common.Dry_Run_Operation
-import Standard.Base.Errors.Common.Forbidden_Operation
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Metadata.Display
 import Standard.Base.Metadata.Widget
@@ -10,7 +9,7 @@ import Standard.Base.Runtime.Ref.Ref
 from Standard.Base.Metadata.Choice import Option
 from Standard.Base.Metadata.Widget import Single_Choice, Vector_Editor
 
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Value_Type.Value_Type
 import Standard.Table.Internal.Column_Naming_Helper.Column_Naming_Helper
 
@@ -19,8 +18,8 @@ import project.Data.Dialect.Dialect
 import project.Data.SQL_Query.SQL_Query
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table as Database_Table_Module
-import project.Data.Table.Table as Database_Table
+import project.Data.DB_Table as DB_Table_Module
+import project.Data.DB_Table.DB_Table
 import project.Internal.Connection.Entity_Naming_Properties.Entity_Naming_Properties
 import project.Internal.Hidden_Table_Registry
 import project.Internal.IR.Context.Context
@@ -153,7 +152,7 @@ type Connection
        - all_fields: Return all the fields in the metadata table.
     @types make_table_types_selector
     @schema make_schema_selector
-    tables : Text -> Text -> Text -> Vector Text | Text | Nothing -> Boolean -> Materialized_Table
+    tables : Text -> Text -> Text -> Vector Text | Text | Nothing -> Boolean -> Table
     tables self name_like=Nothing database=self.database schema=Nothing types=self.dialect.default_table_types all_fields=False =
         self.get_tables_advanced name_like=name_like database=database schema=schema types=types all_fields=all_fields include_hidden=False
 
@@ -211,7 +210,7 @@ type Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> Database_Table ! Table_Not_Found | SQL_Error
+    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found | SQL_Error
     query self query alias="" = case query of
         _ : Text ->
             result = self.query alias=alias <|
@@ -236,7 +235,7 @@ type Connection
                    will actually result in both columns `A` and `A 1` containing
                    the value 1; and value 2 being lost. That is why such queries
                    must fail.
-                r = Database_Table_Module.make_table self name columns ctx on_problems=Problem_Behavior.Report_Error
+                r = DB_Table_Module.make_table self name columns ctx on_problems=Problem_Behavior.Report_Error
                 r.catch Any error->
                     Error.throw (Illegal_Argument.Error "The provided custom SQL query is invalid and may suffer data corruption when being processed, especially if it contains aliased column names, it may not be interpreted correctly. Please ensure the names are unique. The original error was: "+error.to_display_text cause=error)
         SQL_Query.Table_Name name ->
@@ -266,7 +265,7 @@ type Connection
          `execute_update` for DML queries, or if they are supposed to return
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
-    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Materialized_Table ! Table_Not_Found
+    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Table ! Table_Not_Found
     read self query (limit : Integer | Nothing = 1000) (warn_if_more_rows : Boolean = True) =
         self.query query . read max_rows=limit warn_if_more_rows=warn_if_more_rows
 
@@ -312,8 +311,8 @@ type Connection
          (like missing columns) and if successful, return a temporary table with
          a `Dry_Run_Operation` warning attached.
     @structure make_structure_creator
-    create_table : Text  -> Vector Column_Description | Database_Table | Materialized_Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> Database_Table ! Table_Already_Exists
-    create_table self (table_name : Text) (structure : Vector Column_Description | Database_Table | Materialized_Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
+    create_table : Text  -> Vector Column_Description | DB_Table | Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> DB_Table ! Table_Already_Exists
+    create_table self (table_name : Text) (structure : Vector Column_Description | DB_Table | Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
         create_table_implementation self table_name structure primary_key temporary allow_existing on_problems
 
     ## PRIVATE
@@ -327,7 +326,7 @@ type Connection
          to ensure that default `ResultSet` metadata is used for these columns.
        - last_row_only: If set true, only the last row of the query is fetched.
          Defaults to false.
-    read_statement : SQL_Statement -> (Nothing | Vector SQL_Type_Reference) -> Boolean -> Materialized_Table
+    read_statement : SQL_Statement -> (Nothing | Vector SQL_Type_Reference) -> Boolean -> Table
     read_statement self statement column_type_suggestions=Nothing last_row_only=False =
         type_overrides = self.dialect.get_type_mapping.prepare_type_overrides column_type_suggestions
         statement_setter = self.dialect.get_statement_setter
@@ -356,7 +355,7 @@ type Connection
          representing the query to execute.
     execute_update : Text | SQL_Statement -> Integer
     execute_update self query =
-        if Execution_Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Executing update queries is forbidden as the Output context is disabled.") else
+        Execution_Context.Output.if_enabled disabled_message="Executing update queries is forbidden as the Output context is disabled." panic=False <|
             statement_setter = self.dialect.get_statement_setter
             self.jdbc_connection.with_prepared_statement query statement_setter stmt->
                 result = case self.supports_large_update.get of
@@ -433,7 +432,7 @@ type Connection
 
        Once all references to the table with this name are destroyed, the table
        will be marked for removal and dropped at the next maintenance.
-    internal_allocate_dry_run_table : Text -> Database_Table
+    internal_allocate_dry_run_table : Text -> DB_Table
     internal_allocate_dry_run_table self table_name =
         ref = self.hidden_table_registry.make_reference table_name
         make_table_for_name self table_name table_name ref
@@ -474,6 +473,6 @@ make_table_for_name connection name alias internal_temporary_keep_alive_referenc
            fix that - so we are good with just attaching the problems as a
            warning. We do not want to fail, as we do want to allow the user to
            access any table already present in the database.
-        Database_Table_Module.make_table connection name columns ctx on_problems=Problem_Behavior.Report_Warning
+        DB_Table_Module.make_table connection name columns ctx on_problems=Problem_Behavior.Report_Warning
     result.catch SQL_Error sql_error->
         Error.throw (Table_Not_Found.Error name sql_error treated_as_query=False extra_message="")
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Column.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Column.enso
index b22128a4702d..89a569269c2e 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Column.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Column.enso
@@ -7,6 +7,7 @@ from Standard.Base.Widget_Helpers import make_format_chooser, make_regex_text_wi
 
 import Standard.Table.Data.Column.Column
 import Standard.Table.Data.Constants.Previous_Value
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Enso_Types
 import Standard.Table.Data.Type.Value_Type_Helpers
 import Standard.Table.Internal.Column_Naming_Helper.Column_Naming_Helper
@@ -22,7 +23,7 @@ from Standard.Table.Internal.Cast_Helpers import check_cast_compatibility
 import project.Connection.Connection.Connection
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.Helpers
 import project.Internal.IR.Context.Context
 import project.Internal.IR.Internal_Column.Internal_Column
@@ -81,9 +82,9 @@ type DB_Column
 
     ## ICON data_input
        Converts this column into a single-column table.
-    to_table : Table
+    to_table : DB_Table
     to_table self =
-        Table.Value self.name self.connection [self.as_internal] self.context
+        DB_Table.Value self.name self.connection [self.as_internal] self.context
 
     ## ALIAS metadata
        GROUP Standard.Base.Metadata
@@ -92,7 +93,7 @@ type DB_Column
        The table behaves like `Table.info` - it lists the column name, the count
        of non-null items and the value type.
     info : Table
-    info self = self.to_table.info
+    info self -> Table = self.to_table.info
 
     ## GROUP Standard.Base.Input
        ICON data_input
@@ -1305,7 +1306,7 @@ type DB_Column
         Value_Type.expect_text self <| Value_Type.expect_integer n <|
             n2 = n.max 0
             new_name = self.naming_helper.function_name "text_right" [self, n]
-            self.make_binary_op "RIGHT" n2 new_name           
+            self.make_binary_op "RIGHT" n2 new_name
 
     ## GROUP Standard.Base.Logical
        ICON preparation
@@ -1455,7 +1456,7 @@ type DB_Column
        Returns a column of `Integer` type.
     year : DB_Column ! Invalid_Value_Type
     year self = Value_Type.expect_has_date self <|
-        simple_unary_op self "year"
+        self.make_unary_op "year"
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1465,7 +1466,7 @@ type DB_Column
        Returns a column of `Integer` type.
     month : DB_Column ! Invalid_Value_Type
     month self = Value_Type.expect_has_date self <|
-        simple_unary_op self "month"
+        self.make_unary_op "month"
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1476,7 +1477,7 @@ type DB_Column
        Returns a column of `Integer` type.
     day : DB_Column ! Invalid_Value_Type
     day self = Value_Type.expect_has_date self <|
-        simple_unary_op self "day"
+        self.make_unary_op "day"
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1486,7 +1487,7 @@ type DB_Column
        Returns a column of `Integer` type.
     hour : DB_Column ! Invalid_Value_Type
     hour self = Value_Type.expect_has_time self <|
-        simple_unary_op self "hour"
+        self.make_unary_op "hour"
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1496,7 +1497,7 @@ type DB_Column
        Returns a column of `Integer` type.
     minute : DB_Column ! Invalid_Value_Type
     minute self = Value_Type.expect_has_time self <|
-        simple_unary_op self "minute"
+        self.make_unary_op "minute"
 
     ## GROUP Standard.Base.Selections
        ICON select_row
@@ -1506,7 +1507,7 @@ type DB_Column
        Returns a column of `Integer` type.
     second : DB_Column ! Invalid_Value_Type
     second self = Value_Type.expect_has_time self <|
-        simple_unary_op self "second"
+        self.make_unary_op "second"
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1516,7 +1517,7 @@ type DB_Column
     @period Date_Time_Helpers.make_period_selector_for_column
     date_part : Date_Period | Time_Period -> DB_Column ! Invalid_Value_Type | Illegal_Argument
     date_part self period =
-        Date_Time_Helpers.make_date_part_function self period simple_unary_op self.naming_helper
+        Date_Time_Helpers.make_date_part_function self period (column->op_name-> column.make_unary_op op_name) self.naming_helper
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1912,11 +1913,6 @@ adapt_unified_column column expected_type =
     adapted = dialect.adapt_unified_column column.as_internal expected_type infer_return_type
     DB_Column.Value name=column.name connection=column.connection sql_type_reference=adapted.sql_type_reference expression=adapted.expression context=column.context
 
-## PRIVATE
-   A shorthand to be able to share the implementations between in-memory and
-   database.
-simple_unary_op column op_kind = column.make_unary_op op_kind
-
 ## PRIVATE
 Column.from (that:DB_Column) =
     _ = [that]
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Table.enso
similarity index 92%
rename from distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso
rename to distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Table.enso
index eb14736cc502..3297b50bee88 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Table.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/DB_Table.enso
@@ -28,7 +28,8 @@ import Standard.Table.Data.Join_Kind_Cross.Join_Kind_Cross
 import Standard.Table.Data.Match_Columns as Match_Columns_Helpers
 import Standard.Table.Data.Report_Unmatched.Report_Unmatched
 import Standard.Table.Data.Row.Row
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Simple_Expression.Simple_Expression
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Value_Type_Helpers
 import Standard.Table.Extensions.Table_Ref.Table_Ref
 import Standard.Table.Internal.Add_Row_Number
@@ -74,7 +75,7 @@ polyglot java import java.sql.JDBCType
 polyglot java import java.util.UUID
 
 ## Represents a column-oriented table data structure backed by a database.
-type Table
+type DB_Table
     ## PRIVATE
 
        Represents a column-oriented table data structure backed by a database.
@@ -219,7 +220,7 @@ type Table
 
              table.select_columns [-1, 0, 1] reorder=True
     @columns Widget_Helpers.make_column_name_vector_selector
-    select_columns :  Vector (Integer | Text | Regex) | Text | Integer | Regex -> Boolean -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table ! No_Output_Columns | Missing_Input_Columns
+    select_columns :  Vector (Integer | Text | Regex) | Text | Integer | Regex -> Boolean -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table ! No_Output_Columns | Missing_Input_Columns
     select_columns self (columns : (Vector | Text | Integer | Regex) = [self.columns.first.name]) (reorder:Boolean=False) (case_sensitivity=Case_Sensitivity.Default) (error_on_missing_columns:Boolean=True) (on_problems:Problem_Behavior=Report_Warning) =
         new_columns = self.columns_helper.select_columns columns case_sensitivity reorder error_on_missing_columns on_problems
         self.updated_columns new_columns
@@ -273,7 +274,7 @@ type Table
 
              table.remove_columns [-1, 0, 1]
     @columns Widget_Helpers.make_column_name_vector_selector
-    remove_columns :  Vector (Integer | Text | Regex) | Text | Integer | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table ! No_Output_Columns | Missing_Input_Columns
+    remove_columns :  Vector (Integer | Text | Regex) | Text | Integer | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table ! No_Output_Columns | Missing_Input_Columns
     remove_columns self (columns : (Vector | Text | Integer | Regex) = [self.columns.first.name]) (case_sensitivity=Case_Sensitivity.Default) (error_on_missing_columns:Boolean=False) (on_problems:Problem_Behavior=Report_Warning) =
         new_columns = self.columns_helper.remove_columns columns case_sensitivity error_on_missing_columns=error_on_missing_columns on_problems=on_problems
         self.updated_columns new_columns
@@ -299,7 +300,7 @@ type Table
          Select completely blank columns from a table.
 
              table.select_blank_columns
-    select_blank_columns : Blank_Selector -> Boolean -> Table
+    select_blank_columns : Blank_Selector -> Boolean -> DB_Table
     select_blank_columns self (when:Blank_Selector = Blank_Selector.All_Cells) treat_nans_as_blank=False =
         new_columns = self.columns_helper.select_blank_columns_helper when treat_nans_as_blank
         self.updated_columns new_columns
@@ -325,7 +326,7 @@ type Table
          Remove completely blank columns from a table.
 
              table.remove_blank_columns
-    remove_blank_columns : Blank_Selector -> Boolean -> Table
+    remove_blank_columns : Blank_Selector -> Boolean -> DB_Table
     remove_blank_columns self (when:Blank_Selector = Blank_Selector.All_Cells) treat_nans_as_blank=False =
         new_columns = self.columns_helper.select_blank_columns_helper when treat_nans_as_blank invert_selection=True
         self.updated_columns new_columns
@@ -380,7 +381,7 @@ type Table
 
              table.reorder_columns [0] position=Position.After_Other_Columns
     @columns Widget_Helpers.make_column_name_vector_selector
-    reorder_columns : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Position -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table ! Missing_Input_Columns
+    reorder_columns : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Position -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table ! Missing_Input_Columns
     reorder_columns self (columns : (Vector | Text | Integer | Regex) = [self.columns.first.name]) (position:Position=Position.Before_Other_Columns) (case_sensitivity=Case_Sensitivity.Default) (error_on_missing_columns:Boolean=False) (on_problems:Problem_Behavior=Report_Warning) =
         new_columns = self.columns_helper.reorder_columns columns position case_sensitivity error_on_missing_columns on_problems
         self.updated_columns new_columns
@@ -409,7 +410,7 @@ type Table
          Sort columns in descending order.
 
              table.reorder_columns Sort_Direction.Descending
-    sort_columns : Sort_Direction -> Text_Ordering -> Table
+    sort_columns : Sort_Direction -> Text_Ordering -> DB_Table
     sort_columns self order=Sort_Direction.Ascending text_ordering=Text_Ordering.Default =
         new_columns = Table_Helpers.sort_columns internal_columns=self.internal_columns order text_ordering
         self.updated_columns new_columns
@@ -477,7 +478,7 @@ type Table
 
               table.rename_columns (Map.from_vector [["name=(.*)".to_regex, "key:$1"]])
     @column_map Widget_Helpers.make_rename_name_vector_selector
-    rename_columns : Map (Text | Integer | Regex) Text | Vector Text | Vector Vector -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table ! Missing_Input_Columns | Ambiguous_Column_Rename | Too_Many_Column_Names_Provided | Invalid_Column_Names | Duplicate_Output_Column_Names
+    rename_columns : Map (Text | Integer | Regex) Text | Vector Text | Vector Vector -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table ! Missing_Input_Columns | Ambiguous_Column_Rename | Too_Many_Column_Names_Provided | Invalid_Column_Names | Duplicate_Output_Column_Names
     rename_columns self (column_map:(Map | Vector)=["Column"]) (case_sensitivity:Case_Sensitivity=Case_Sensitivity.Default) (error_on_missing_columns:Boolean=True) (on_problems:Problem_Behavior=Report_Warning) =
         new_names = Table_Helpers.rename_columns self.column_naming_helper self.internal_columns column_map case_sensitivity error_on_missing_columns on_problems
         Warning.with_suspended new_names names->
@@ -502,10 +503,10 @@ type Table
          Rename the column based on the first row
 
               table.use_first_row_as_names
-    use_first_row_as_names : Problem_Behavior -> Table
+    use_first_row_as_names : Problem_Behavior -> DB_Table
     use_first_row_as_names self (on_problems=Report_Warning) =
         _ = on_problems
-        Error.throw (Unsupported_Database_Operation.Error "Table.use_first_row_as_names is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.use_first_row_as_names is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
 
     ## PRIVATE
 
@@ -572,9 +573,9 @@ type Table
          Select people celebrating a jubilee.
 
              people.filter "age" (age -> (age%10 == 0))
-    @column Widget_Helpers.make_column_name_selector
+    @column (Widget_Helpers.make_column_name_selector add_expression=True)
     @filter Widget_Helpers.make_filter_condition_selector
-    filter : (DB_Column | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
+    filter : (DB_Column | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> DB_Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
     filter self column (filter : Filter_Condition | (Any -> Boolean) = Filter_Condition.Equal True) on_problems=Report_Warning = case column of
        _ : DB_Column ->
            mask filter_column = case Helpers.check_integrity self filter_column of
@@ -593,6 +594,7 @@ type Table
                   missing arguments and then another error is more appropriate.
                _ : Function -> Filter_Condition_Module.handle_constructor_missing_arguments filter <|
                    Error.throw (Unsupported_Database_Operation.Error "Filtering with a custom predicate is not supported in the database.")
+       _ : Expression -> self.filter (self.evaluate_expression column on_problems) filter on_problems
        _ ->
            table_at = self.at column
            self.filter table_at filter on_problems
@@ -630,10 +632,11 @@ type Table
          Select people celebrating a jubilee.
 
              people.filter_by_expression "[age] % 10 == 0"
-    filter_by_expression : Text -> Problem_Behavior -> Table ! No_Such_Column | Invalid_Value_Type | Expression_Error
-    filter_by_expression self expression on_problems=Report_Warning =
-        column = self.evaluate_expression expression on_problems
-        self.filter column Filter_Condition.Is_True
+    filter_by_expression : Text -> Problem_Behavior -> DB_Table ! No_Such_Column | Invalid_Value_Type | Expression_Error
+    filter_by_expression self expression:Text on_problems=Report_Warning =
+        column = self.evaluate_expression (Expression.Value expression) on_problems
+        result = self.filter column Filter_Condition.Is_True
+        Warning.attach (Deprecated.Warning "Standard.Database.Data.DB_Table.DB_Table" "filter_by_expression" "Deprecated: use `filter` with an `Expression` instead.") result
 
     ## ALIAS first, last, sample, slice
        GROUP Standard.Base.Selections
@@ -663,7 +666,7 @@ type Table
 
              table.take (While row-> row.to_vector.compute Statistic.Sum == 10)
     @range Index_Sub_Range.default_widget
-    take : (Index_Sub_Range | Range | Integer) -> Table
+    take : (Index_Sub_Range | Range | Integer) -> DB_Table
     take self range=(First 1) =
         Take_Drop_Helpers.take_drop_helper Take_Drop.Take self range
 
@@ -695,14 +698,14 @@ type Table
 
              table.drop (While row-> row.to_vector.compute Statistic.Sum == 10)
     @range Index_Sub_Range.default_widget
-    drop : (Index_Sub_Range | Range | Integer) -> Table
+    drop : (Index_Sub_Range | Range | Integer) -> DB_Table
     drop self range=(First 1) =
         Take_Drop_Helpers.take_drop_helper Take_Drop.Drop self range
 
     ## PRIVATE
        Filter out all rows.
-    remove_all_rows : Table
-    remove_all_rows self = self.filter_by_expression "0==1"
+    remove_all_rows : DB_Table
+    remove_all_rows self = self.filter (Expression.Value "0==1")
 
     ## ALIAS add index column, rank, record id
        GROUP Standard.Base.Values
@@ -738,7 +741,7 @@ type Table
            problem is reported.
     @group_by Widget_Helpers.make_column_name_vector_selector
     @order_by Widget_Helpers.make_order_by_selector
-    add_row_number : Text -> Integer -> Integer -> Vector (Text | Integer | Regex) | Text | Integer | Regex -> Vector (Text | Sort_Column) | Text -> Problem_Behavior -> Table
+    add_row_number : Text -> Integer -> Integer -> Vector (Text | Integer | Regex) | Text | Integer | Regex -> Vector (Text | Sort_Column) | Text -> Problem_Behavior -> DB_Table
     add_row_number self (name:Text="Row") (from:Integer=1) (step:Integer=1) (group_by:(Vector | Text | Integer | Regex)=[]) (order_by:(Vector | Text)=[]) (on_problems:Problem_Behavior=Problem_Behavior.Report_Warning) =
         problem_builder = Problem_Builder.new error_on_missing_columns=True
         grouping_columns = self.columns_helper.select_columns_helper group_by Case_Sensitivity.Default True problem_builder
@@ -809,19 +812,19 @@ type Table
              t1 = table.order_by [Sort_Column.Name "A"] . limit 5
              t2 = t1.filter 'A' (Greater than=5)
              t2.read
-    limit : Integer -> Table
+    limit : Integer -> DB_Table
     limit self max_rows =
         new_ctx = self.context.set_limit max_rows
         self.updated_context new_ctx
 
-    ## ALIAS add column, new column, update column
+    ## ALIAS add column, new column, update column, formula
        GROUP Standard.Base.Values
        ICON dataframe_map_column
        Sets the column value at the given name.
 
        Arguments:
-       - column: The new column or expression to create column.
-       - new_name: Optional new name for the column.
+       - value: The value, expression or column to create column.
+       - as: Optional new name for the column.
        - set_mode: Specifies the expected behaviour in regards to existing
          column with the same name.
        - on_problems: Specifies how to handle problems with expression
@@ -855,34 +858,36 @@ type Table
              example_set =
                  table = Examples.inventory_table
                  double_inventory = table.at "total_stock" * 2
-                 table.set double_inventory new_name="total_stock"
-                 table.set "2 * [total_stock]" new_name="total_stock_expr"
-    @new_name Widget_Helpers.make_column_name_selector
-    set : DB_Column | Text | Array | Vector | Range | Date_Range | Constant_Column | Column_Operation -> Text -> Set_Mode -> Problem_Behavior -> Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
-    set self column (new_name : Text = "") (set_mode : Set_Mode = Set_Mode.Add_Or_Update) (on_problems : Problem_Behavior = Report_Warning) =
+                 table.set double_inventory as="total_stock"
+                 table.set (expr "2 * [total_stock]") as="total_stock_expr"
+    @value Simple_Expression.default_widget
+    set : DB_Column | Text | Expression | Array | Vector | Range | Date_Range | Constant_Column | Simple_Expression | Column_Operation -> Text -> Set_Mode -> Problem_Behavior -> DB_Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
+    set self value (as : Text = "") (set_mode : Set_Mode = Set_Mode.Add_Or_Update) (on_problems : Problem_Behavior = Report_Warning) =
         problem_builder = Problem_Builder.new
         unique = self.column_naming_helper.create_unique_name_strategy
         unique.mark_used self.column_names
 
-        resolved = case column of
-            _ : Text -> self.evaluate_expression column on_problems
+        resolved = case value of
+            _ : Text -> self.make_constant_column value
+            _ : Expression -> self.evaluate_expression value on_problems
             _ : DB_Column ->
-                if Helpers.check_integrity self column then column else
-                    Error.throw (Integrity_Error.Error "Column "+column.name)
-            _ : Constant_Column -> self.make_constant_column column
-            _ : Column_Operation -> column.evaluate self (set_mode==Set_Mode.Update && new_name=="") on_problems
+                if Helpers.check_integrity self value then value else
+                    Error.throw (Integrity_Error.Error "Column "+value.name)
+            _ : Constant_Column -> self.make_constant_column value
+            _ : Column_Operation -> (value:Simple_Expression).evaluate self (set_mode==Set_Mode.Update && as=="") on_problems
+            _ : Simple_Expression -> value.evaluate self (set_mode==Set_Mode.Update && as=="") on_problems
             _ : Vector -> Error.throw (Unsupported_Database_Operation.Error "Cannot use `Vector` for `set` in the database.")
             _ : Array -> Error.throw (Unsupported_Database_Operation.Error "Cannot use `Array` for `set` in the database.")
             _ : Range -> Error.throw (Unsupported_Database_Operation.Error "Cannot use `Range` for `set` in the database.")
             _ : Date_Range -> Error.throw (Unsupported_Database_Operation.Error "Cannot use `Date_Range` for `set` in the database.")
-            _ -> Error.throw (Illegal_Argument.Error "Unsupported type for `Table.set`.")
+            _ -> Error.throw (Illegal_Argument.Error "Unsupported type for `DB_Table.set`.")
 
-        ## If `new_name` was specified, use that. Otherwise, if `column` is a
+        ## If `as` was specified, use that. Otherwise, if `value` is a
            `DB_Column`, use its name. In these two cases, do not make it unique.
            Otherwise, make it unique. If set_mode is Update, however, do not
            make it unique.
-        new_column_name = if new_name != "" then new_name else
-            if column.is_a DB_Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
+        new_column_name = if as != "" then as else
+            if value.is_a DB_Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
         renamed = resolved.rename new_column_name
         renamed.if_not_error <| self.column_naming_helper.check_ambiguity self.column_names renamed.name <|
             index = self.internal_columns.index_of (c -> c.name == renamed.name)
@@ -921,12 +926,12 @@ type Table
              an `Arithmetic_Error`.
            - If more than 10 rows encounter computation issues,
              an `Additional_Warnings`.
-    evaluate_expression : Text -> Problem_Behavior -> DB_Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
-    evaluate_expression self expression on_problems=Report_Warning =
+    evaluate_expression : Text | Expression -> Problem_Behavior -> DB_Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
+    evaluate_expression self (expression:Text|Expression) on_problems=Report_Warning = if expression.is_a Text then self.evaluate_expression (Expression.Value expression) on_problems else
         get_column name = self.at name
         new_column = Expression.evaluate expression get_column self.make_constant_column "Standard.Database.Data.DB_Column" "DB_Column" DB_Column.var_args_functions
         problems = Warning.get_all new_column . map .value
-        result = new_column.rename (self.connection.base_connection.column_naming_helper.sanitize_name expression)
+        result = new_column.rename (self.connection.base_connection.column_naming_helper.sanitize_name expression.expression)
         on_problems.attach_problems_before problems <|
             Warning.set result []
 
@@ -952,8 +957,8 @@ type Table
 
     ## PRIVATE
        Run a table transformer with a temporary column added.
-    with_temporary_column :  DB_Column -> (Text -> Table -> Table) -> Table
-    with_temporary_column self new_column:DB_Column f:(Text -> Table -> Table) =
+    with_temporary_column :  DB_Column -> (Text -> DB_Table -> DB_Table) -> DB_Table
+    with_temporary_column self new_column:DB_Column f:(Text -> DB_Table -> DB_Table) =
         new_column_name = self.make_temp_column_name
         with_new_column = self.set new_column new_column_name set_mode=Set_Mode.Add
         modified_table = f new_column_name with_new_column
@@ -962,7 +967,7 @@ type Table
     ## PRIVATE
        Filter a table on a boolean column. The column does not have to be part
        of the table, but it must be derived from it and share a context.
-    filter_on_predicate_column : DB_Column -> Table
+    filter_on_predicate_column : DB_Column -> DB_Table
     filter_on_predicate_column self predicate_column =
         self.with_temporary_column predicate_column name-> table->
             table.filter name Filter_Condition.Is_True
@@ -1087,7 +1092,7 @@ type Table
 
               table.order_by [(Sort_Column.Select_By_Name "a.*".to_regex case_sensitivity=Case_Sensitivity.Insensitive)]
     @columns Widget_Helpers.make_order_by_selector
-    order_by : Vector (Text | Sort_Column) | Text -> Text_Ordering -> Boolean -> Problem_Behavior -> Table  ! Incomparable_Values | No_Input_Columns_Selected | Missing_Input_Columns
+    order_by : Vector (Text | Sort_Column) | Text -> Text_Ordering -> Boolean -> Problem_Behavior -> DB_Table  ! Incomparable_Values | No_Input_Columns_Selected | Missing_Input_Columns
     order_by self (columns = ([(Sort_Column.Name (self.columns.at 0 . name))])) text_ordering=Text_Ordering.Default error_on_missing_columns=True on_problems=Problem_Behavior.Report_Warning =
         problem_builder = Problem_Builder.new error_on_missing_columns=error_on_missing_columns types_to_always_throw=[No_Input_Columns_Selected]
         columns_for_ordering = Table_Helpers.prepare_order_by self.columns columns problem_builder
@@ -1133,7 +1138,8 @@ type Table
         # If the key is a result of a join, union or a subquery then it has no notion of primary key.
         _ -> Nothing
 
-    ## GROUP Standard.Base.Selections
+    ## ALIAS unique, deduplicate
+       GROUP Standard.Base.Selections
        ICON preparation
        Returns the distinct set of rows within the specified columns from the
        input table.
@@ -1168,7 +1174,7 @@ type Table
            `Floating_Point_Equality` is reported according to the `on_problems`
            setting.
     @columns Widget_Helpers.make_column_name_vector_selector
-    distinct : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table ! No_Output_Columns | Missing_Input_Columns | No_Input_Columns_Selected | Floating_Point_Equality
+    distinct : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table ! No_Output_Columns | Missing_Input_Columns | No_Input_Columns_Selected | Floating_Point_Equality
     distinct self columns=self.column_names case_sensitivity=Case_Sensitivity.Default error_on_missing_columns=True on_problems=Report_Warning =
         key_columns = self.columns_helper.select_columns columns Case_Sensitivity.Default reorder=True error_on_missing_columns=error_on_missing_columns on_problems=on_problems . catch No_Output_Columns _->
             Error.throw No_Input_Columns_Selected
@@ -1251,14 +1257,14 @@ type Table
          the same name. So `table.join other on=["A", "B"]` is a shorthand for:
              table.join other on=[Join_Condition.Equals "A" "A", Join_Condition.Equals "B" "B"]
     @on Widget_Helpers.make_join_condition_selector
-    join : Table -> Join_Kind -> Join_Condition | Text | Vector (Join_Condition | Text) -> Text -> Problem_Behavior -> Table
+    join : DB_Table -> Join_Kind -> Join_Condition | Text | Vector (Join_Condition | Text) -> Text -> Problem_Behavior -> DB_Table
     join self right (join_kind : Join_Kind = Join_Kind.Left_Outer) (on : Join_Condition | Text | Vector (Join_Condition | Text) = (default_join_condition self join_kind)) (right_prefix:Text="Right ") (on_problems:Problem_Behavior=Report_Warning) =
         self.join_or_cross_join right join_kind on right_prefix on_problems
 
     ## PRIVATE
        Implementation of both `join` and `cross_join`.
-    join_or_cross_join : Table -> Join_Kind | Join_Kind_Cross -> Vector (Join_Condition | Text) | Text -> Text -> Problem_Behavior -> Table
-    join_or_cross_join self right:Table join_kind on right_prefix on_problems =
+    join_or_cross_join : DB_Table -> Join_Kind | Join_Kind_Cross -> Vector (Join_Condition | Text) | Text -> Text -> Problem_Behavior -> DB_Table
+    join_or_cross_join self right:DB_Table join_kind on right_prefix on_problems =
         can_proceed = Helpers.ensure_same_connection "table" [self, right] <|
             join_conditions_ok = join_kind != Join_Kind_Cross.Cross || on == []
             if join_conditions_ok . not then Error.throw (Illegal_Argument.Error "Cross join does not allow join conditions") else
@@ -1310,7 +1316,7 @@ type Table
             problem_builder.attach_problems_before on_problems <|
                 new_from = From_Spec.Join sql_join_kind left_setup.subquery right_setup.subquery on_expressions
                 new_ctx = Context.for_subquery new_from . set_where_filters where_expressions
-                Table.Value new_table_name self.connection result_columns new_ctx
+                DB_Table.Value new_table_name self.connection result_columns new_ctx
 
     ## ALIAS append, cartesian join
        GROUP Standard.Base.Calculations
@@ -1356,8 +1362,8 @@ type Table
        ? Result Ordering For Database Tables
 
          The ordering of rows in the resulting table is not specified.
-    cross_join : Table -> Integer | Nothing -> Text -> Problem_Behavior -> Table
-    cross_join self right:Table right_row_limit=100 right_prefix="Right " on_problems=Report_Warning =
+    cross_join : DB_Table -> Integer | Nothing -> Text -> Problem_Behavior -> DB_Table
+    cross_join self right:DB_Table right_row_limit=100 right_prefix="Right " on_problems=Report_Warning =
         limit_problems = case right_row_limit.is_nothing.not && (right.row_count > right_row_limit) of
             True ->
                 [Cross_Join_Row_Limit_Exceeded.Error right_row_limit right.row_count]
@@ -1421,8 +1427,8 @@ type Table
            - If `add_new_columns` is `False` and the lookup table has columns
              that are not present in this table, an `Unexpected_Extra_Columns`.
     @key_columns Widget_Helpers.make_column_name_vector_selector
-    merge : Table -> (Vector (Integer | Text | Regex) | Text | Integer | Regex) -> Boolean -> Boolean -> Problem_Behavior -> Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
-    merge self lookup_table:Table key_columns:(Vector (Integer | Text | Regex) | Text | Integer | Regex) add_new_columns:Boolean=False allow_unmatched_rows:Boolean=True on_problems:Problem_Behavior=Problem_Behavior.Report_Warning =
+    merge : DB_Table -> (Vector (Integer | Text | Regex) | Text | Integer | Regex) -> Boolean -> Boolean -> Problem_Behavior -> DB_Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
+    merge self lookup_table:DB_Table key_columns:(Vector (Integer | Text | Regex) | Text | Integer | Regex) add_new_columns:Boolean=False allow_unmatched_rows:Boolean=True on_problems:Problem_Behavior=Problem_Behavior.Report_Warning =
         Helpers.ensure_same_connection "table" [self, lookup_table] <|
             Lookup_Query_Helper.build_lookup_query self lookup_table key_columns add_new_columns allow_unmatched_rows on_problems
 
@@ -1500,10 +1506,10 @@ type Table
              #    1 | 20 | b | f
              #    2 | 30 | c | g
              #    3 | 40 | d | h
-    replace : Table | Map -> (Text | Integer) -> (Text | Integer) -> (Text | Integer) -> Boolean -> Problem_Behavior -> Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
-    replace self lookup_table:(Table | Map) column:(Text | Integer) from_column:(Text | Integer)=0 to_column:(Text | Integer)=1 allow_unmatched_rows:Boolean=True on_problems:Problem_Behavior=Problem_Behavior.Report_Warning =
+    replace : DB_Table | Map -> (Text | Integer) -> (Text | Integer) -> (Text | Integer) -> Boolean -> Problem_Behavior -> DB_Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
+    replace self lookup_table:(DB_Table | Map) column:(Text | Integer) from_column:(Text | Integer)=0 to_column:(Text | Integer)=1 allow_unmatched_rows:Boolean=True on_problems:Problem_Behavior=Problem_Behavior.Report_Warning =
         _ = [lookup_table, column, from_column, to_column, allow_unmatched_rows, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.replace is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.replace is not implemented yet for the Database backends.")
 
     ## ALIAS join by row position
        GROUP Standard.Base.Calculations
@@ -1552,10 +1558,10 @@ type Table
          order of columns is undefined and the operation will fail, reporting a
          `Undefined_Column_Order` problem and returning an empty table.
     @keep_unmatched (make_single_choice [["True", "Boolean.True"], ["False", "Boolean.False"], ["Report", Meta.get_qualified_type_name Report_Unmatched]])
-    zip : Table -> Boolean | Report_Unmatched -> Text -> Problem_Behavior -> Table
+    zip : DB_Table -> Boolean | Report_Unmatched -> Text -> Problem_Behavior -> DB_Table
     zip self right keep_unmatched=Report_Unmatched right_prefix="Right " on_problems=Report_Warning =
         _ = [right, keep_unmatched, right_prefix, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.zip is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.zip is not implemented yet for the Database backends.")
 
     ## ALIAS append, concat
        GROUP Standard.Base.Calculations
@@ -1648,10 +1654,10 @@ type Table
          are meant to be mixed, at least one of them should be explicitly
          retyped to the `Mixed` type to indicate that intention. Note that the
          `Mixed` type may not be supported by most Database backends.
-    union : (Table | Vector Table) -> Match_Columns -> Boolean | Report_Unmatched -> Boolean -> Problem_Behavior -> Table
-    union self tables:(Table | Vector) match_columns=Match_Columns.By_Name keep_unmatched_columns=Report_Unmatched allow_type_widening=True on_problems=Report_Warning =
+    union : (DB_Table | Vector DB_Table) -> Match_Columns -> Boolean | Report_Unmatched -> Boolean -> Problem_Behavior -> DB_Table
+    union self tables:(DB_Table | Vector) match_columns=Match_Columns.By_Name keep_unmatched_columns=Report_Unmatched allow_type_widening=True on_problems=Report_Warning =
         all_tables = case tables of
-            v : Vector -> [self] + (v.map t-> Table.from t)
+            v : Vector -> [self] + (v.map t-> DB_Table.from t)
             single_table -> [self, single_table]
         Helpers.ensure_same_connection "table" all_tables <|
             ## We keep separate problem builders, because if we are reporting `No_Output_Columns`,
@@ -1715,7 +1721,7 @@ type Table
                         input_column = Internal_Column.Value name (infer_return_type expression) expression
                         dialect.adapt_unified_column input_column result_type infer_return_type
 
-                    Table.Value union_alias self.connection new_columns new_ctx
+                    DB_Table.Value union_alias self.connection new_columns new_ctx
 
     ## ALIAS group by, summarize
        GROUP Standard.Base.Calculations
@@ -1787,7 +1793,7 @@ type Table
               table.aggregate ["Key"] [Aggregate_Column.Count]
     @group_by Widget_Helpers.make_column_name_vector_selector
     @columns Widget_Helpers.make_aggregate_column_vector_selector
-    aggregate : Vector (Integer | Text | Regex | Aggregate_Column) | Text | Integer | Regex -> Vector Aggregate_Column -> Boolean -> Problem_Behavior -> Table ! No_Output_Columns | Invalid_Aggregate_Column | Invalid_Column_Names | Duplicate_Output_Column_Names | Floating_Point_Equality | Invalid_Aggregation | Unquoted_Delimiter | Additional_Warnings
+    aggregate : Vector (Integer | Text | Regex | Aggregate_Column) | Text | Integer | Regex -> Vector Aggregate_Column -> Boolean -> Problem_Behavior -> DB_Table ! No_Output_Columns | Invalid_Aggregate_Column | Invalid_Column_Names | Duplicate_Output_Column_Names | Floating_Point_Equality | Invalid_Aggregation | Unquoted_Delimiter | Additional_Warnings
     aggregate self group_by=[] columns=[] (error_on_missing_columns=False) (on_problems=Report_Warning) =
         normalized_group_by = Vector.unify_vector_or_element group_by
         if normalized_group_by.is_empty && columns.is_empty then Error.throw (No_Output_Columns.Error "At least one column must be specified.") else
@@ -1819,8 +1825,8 @@ type Table
                     type_mapping.infer_return_type infer_from_database_callback op_kind columns expression
                 results = resolved_aggregates.map p->
                     agg = p.second
-                    new_name = p.first
-                    result = Aggregate_Helper.make_aggregate_column self agg new_name dialect infer_return_type problem_builder
+                    as = p.first
+                    result = Aggregate_Helper.make_aggregate_column self agg as dialect infer_return_type problem_builder
                     ## If the `result` did contain an error, we catch it to be
                        able to store it in a vector and then we will partition the
                        created columns and failures.
@@ -1842,7 +1848,7 @@ type Table
                         if new_columns.is_empty then handle_no_output_columns else
                             result = self.updated_context_and_columns new_ctx new_columns subquery=True
                             if validated.old_style.not then result else
-                                Warning.attach (Deprecated.Warning "Standard.Database.Data.Aggregate_Column.Aggregate_Column" "Group_By" "Deprecated: `Group_By` constructor has been deprecated, use the `group_by` argument instead.") result
+                                Warning.attach (Deprecated.Warning "Standard.Table.Data.Aggregate_Column.Aggregate_Column" "Group_By" "Deprecated: `Group_By` constructor has been deprecated, use the `group_by` argument instead.") result
 
     ## GROUP Standard.Base.Calculations
        ICON dataframe_map_row
@@ -1893,7 +1899,7 @@ type Table
             B  | Name      | Another
             B  | Country   | Germany
     @key_columns Widget_Helpers.make_column_name_vector_selector
-    transpose : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text -> Text -> Boolean -> Problem_Behavior -> Table ! No_Output_Columns | Missing_Input_Columns | Duplicate_Output_Column_Names
+    transpose : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text -> Text -> Boolean -> Problem_Behavior -> DB_Table ! No_Output_Columns | Missing_Input_Columns | Duplicate_Output_Column_Names
     transpose self key_columns=[] (attribute_column_name="Name") (value_column_name="Value") (error_on_missing_columns=True) (on_problems = Report_Warning) =
         ## Avoid unused arguments warning. We cannot rename arguments to `_`,
            because we need to keep the API consistent with the in-memory table.
@@ -1953,13 +1959,13 @@ type Table
            ----|---------|---------
             A  | Example | France
     @group_by Widget_Helpers.make_column_name_vector_selector
-    @name_column Widget_Helpers.make_column_name_selector
+    @names Widget_Helpers.make_column_name_selector
     @values Widget_Helpers.make_aggregate_column_selector
-    cross_tab : Vector (Integer | Text | Regex | Aggregate_Column) | Text | Integer | Regex -> (Text | Integer) -> Aggregate_Column | Vector Aggregate_Column -> Problem_Behavior -> Table ! Missing_Input_Columns | Invalid_Aggregate_Column | Floating_Point_Equality | Invalid_Aggregation | Unquoted_Delimiter | Additional_Warnings | Invalid_Column_Names
-    cross_tab self group_by name_column values=Aggregate_Column.Count (on_problems=Report_Warning) =
+    cross_tab : Vector (Integer | Text | Regex | Aggregate_Column) | Text | Integer | Regex -> (Text | Integer) -> Aggregate_Column | Vector Aggregate_Column -> Problem_Behavior -> DB_Table ! Missing_Input_Columns | Invalid_Aggregate_Column | Floating_Point_Equality | Invalid_Aggregation | Unquoted_Delimiter | Additional_Warnings | Invalid_Column_Names
+    cross_tab self group_by names values=Aggregate_Column.Count (on_problems=Report_Warning) =
         ## Avoid unused arguments warning. We cannot rename arguments to `_`,
            because we need to keep the API consistent with the in-memory table.
-        _ = [group_by, name_column, values, on_problems]
+        _ = [group_by, names, values, on_problems]
         msg = "Cross tab of database tables is not supported, the table has to be materialized first with `read`."
         Error.throw (Unsupported_Database_Operation.Error msg)
 
@@ -2018,12 +2024,12 @@ type Table
     @type (Widget_Helpers.parse_type_selector include_auto=False)
     @columns Widget_Helpers.make_column_name_vector_selector
     @format (make_format_chooser include_number=False)
-    parse : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Value_Type | Auto -> Text | Data_Formatter -> Boolean -> Problem_Behavior -> Table
+    parse : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Value_Type | Auto -> Text | Data_Formatter -> Boolean -> Problem_Behavior -> DB_Table
     parse self columns=(self.columns . filter (c-> c.value_type.is_text) . map .name) type format:(Text|Data_Formatter)='' error_on_missing_columns=True on_problems=Report_Warning =
         selected = self.columns_helper.select_columns columns Case_Sensitivity.Default reorder=False error_on_missing_columns=error_on_missing_columns on_problems=on_problems error_on_empty=False . map self.make_column
         selected.fold self table-> column_to_parse->
             new_column = column_to_parse.parse type format on_problems
-            table.set new_column new_name=column_to_parse.name set_mode=Set_Mode.Update
+            table.set new_column as=column_to_parse.name set_mode=Set_Mode.Update
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -2101,10 +2107,10 @@ type Table
     @columns Widget_Helpers.make_column_name_vector_selector
     @locale Locale.default_widget
     @format (make_format_chooser include_number=False)
-    format : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Text | Date_Time_Formatter | DB_Column -> Locale -> Boolean -> Problem_Behavior -> Table ! Date_Time_Format_Parse_Error | Illegal_Argument
+    format : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Text | Date_Time_Formatter | DB_Column -> Locale -> Boolean -> Problem_Behavior -> DB_Table ! Date_Time_Format_Parse_Error | Illegal_Argument
     format self columns format:(Text | Date_Time_Formatter | DB_Column)="" locale=Locale.default error_on_missing_columns=True on_problems=Report_Warning =
         _ = [columns, format, locale, error_on_missing_columns, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.format is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.format is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -2125,10 +2131,10 @@ type Table
          be reported according to the `on_problems` behavior.
     @column Widget_Helpers.make_column_name_selector
     @delimiter make_delimiter_selector
-    split_to_columns : Text | Integer -> Text -> Integer | Nothing -> Problem_Behavior -> Table
+    split_to_columns : Text | Integer -> Text -> Integer | Nothing -> Problem_Behavior -> DB_Table
     split_to_columns self column delimiter="," column_count=Nothing on_problems=Report_Error =
         _ = [column, delimiter, column_count, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.split_to_columns is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.split_to_columns is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -2140,10 +2146,10 @@ type Table
        - delimiter: The term or terms used to split the text.
     @column Widget_Helpers.make_column_name_selector
     @delimiter make_delimiter_selector
-    split_to_rows : Text | Integer -> Text -> Table
+    split_to_rows : Text | Integer -> Text -> DB_Table
     split_to_rows self column delimiter="," =
         _ = [column, delimiter]
-        Error.throw (Unsupported_Database_Operation.Error "Table.split_to_rows is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.split_to_rows is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -2168,10 +2174,10 @@ type Table
          If the data exceeds the `column_count`, a `Column_Count_Exceeded` will
          be reported according to the `on_problems` behavior.
     @column Widget_Helpers.make_column_name_selector
-    tokenize_to_columns : Text | Integer -> Text -> Case_Sensitivity -> Integer | Nothing -> Problem_Behavior -> Table
+    tokenize_to_columns : Text | Integer -> Text -> Case_Sensitivity -> Integer | Nothing -> Problem_Behavior -> DB_Table
     tokenize_to_columns self column pattern="." case_sensitivity=Case_Sensitivity.Sensitive column_count=Nothing on_problems=Report_Error =
         _ = [column, pattern, case_sensitivity, column_count, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.tokenize_to_columns is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.tokenize_to_columns is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -2190,10 +2196,10 @@ type Table
          produce at least one row, with `Nothing` for the output column values.
          Equivalent to converting a tokenization output of [] to [Nothing].
     @column Widget_Helpers.make_column_name_selector
-    tokenize_to_rows : Text | Integer -> Text -> Case_Sensitivity -> Boolean -> Table
+    tokenize_to_rows : Text | Integer -> Text -> Case_Sensitivity -> Boolean -> DB_Table
     tokenize_to_rows self column pattern="." case_sensitivity=Case_Sensitivity.Sensitive at_least_one_row=False =
         _ = [column, pattern, case_sensitivity, at_least_one_row]
-        Error.throw (Unsupported_Database_Operation.Error "Table.tokenize_to_rows is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.tokenize_to_rows is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -2222,10 +2228,10 @@ type Table
        If the new name is already in use it will be renamed following the normal
        suffixing strategy.
     @column Widget_Helpers.make_column_name_selector
-    parse_to_columns : Text | Integer -> Text | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> Table
+    parse_to_columns : Text | Integer -> Text | Regex -> Case_Sensitivity -> Boolean -> Problem_Behavior -> DB_Table
     parse_to_columns self column pattern="." case_sensitivity=Case_Sensitivity.Sensitive parse_values=True on_problems=Report_Error =
         _ = [column, pattern, case_sensitivity, parse_values, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.parse_to_columns is not implemented yet for the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.parse_to_columns is not implemented yet for the Database backends.")
 
     ## GROUP Standard.Base.Calculations
        ICON split_text
@@ -2237,10 +2243,10 @@ type Table
         - prefix: Prefix to add to the column names. If `Nothing` then the column
           name is used.
     @column Widget_Helpers.make_column_name_selector
-    expand_column : Text | Integer -> Vector | Nothing -> Text | Table -> Table ! Type_Error
+    expand_column : Text | Integer -> Vector | Nothing -> Text | DB_Table -> DB_Table ! Type_Error
     expand_column self column fields=Nothing prefix=Nothing =
             _ = [column, fields, prefix]
-            Error.throw (Unsupported_Database_Operation.Error "Table.expand_column is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
+            Error.throw (Unsupported_Database_Operation.Error "DB_Table.expand_column is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
 
     ## GROUP Standard.Base.Calculations
        ICON split_text
@@ -2275,10 +2281,10 @@ type Table
          table = Table.new [["aaa", [1, 2]], ["bbb", [[30, 31], [40, 41]]]]
          # => Table.new [["aaa", [1, 1, 2, 2]], ["bbb", [30, 31, 40, 41]]]
     @column Widget_Helpers.make_column_name_selector
-    expand_to_rows : Text | Integer -> Boolean -> Table ! Type_Error | No_Such_Column | Index_Out_Of_Bounds
+    expand_to_rows : Text | Integer -> Boolean -> DB_Table ! Type_Error | No_Such_Column | Index_Out_Of_Bounds
     expand_to_rows self column at_least_one_row=False =
         _ = [column, at_least_one_row]
-        Error.throw (Unsupported_Database_Operation.Error "Table.expand_to_rows is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.expand_to_rows is currently not implemented for the Database backend. You may download the table to memory using `.read` to use this feature.")
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -2333,12 +2339,12 @@ type Table
          types. Due to this, a Mixed column containing values `[2, "3"]` will
          actually be converted into `[2, Nothing]` when casting to Integer type.
     @columns Widget_Helpers.make_column_name_vector_selector
-    cast : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Value_Type -> Boolean -> Problem_Behavior -> Table ! Illegal_Argument | Inexact_Type_Coercion | Conversion_Failure
+    cast : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Value_Type -> Boolean -> Problem_Behavior -> DB_Table ! Illegal_Argument | Inexact_Type_Coercion | Conversion_Failure
     cast self columns=[0] value_type error_on_missing_columns=True on_problems=Problem_Behavior.Report_Warning =
         selected = self.columns_helper.select_columns columns Case_Sensitivity.Default reorder=False error_on_missing_columns=error_on_missing_columns on_problems=on_problems error_on_empty=False . map self.make_column
         selected.fold self table-> column_to_cast->
             new_column = column_to_cast.cast value_type on_problems
-            table.set new_column new_name=column_to_cast.name set_mode=Set_Mode.Update
+            table.set new_column as=column_to_cast.name set_mode=Set_Mode.Update
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -2346,10 +2352,10 @@ type Table
        their contents.
 
        This operation is currently not available in the Database backend.
-    auto_value_types : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Boolean -> Boolean -> Problem_Behavior -> Table
+    auto_value_types : Vector (Text | Integer | Regex) | Text | Integer | Regex -> Boolean -> Boolean -> Problem_Behavior -> DB_Table
     auto_value_types self columns=self.column_names shrink_types=False error_on_missing_columns=True on_problems=Problem_Behavior.Report_Warning =
         _ = [columns, shrink_types, error_on_missing_columns, on_problems]
-        Error.throw (Unsupported_Database_Operation.Error "Table.auto_value_types is not supported in the Database backends.")
+        Error.throw (Unsupported_Database_Operation.Error "DB_Table.auto_value_types is not supported in the Database backends.")
 
     ## ALIAS drop_missing_rows, dropna
        GROUP Standard.Base.Selections
@@ -2364,7 +2370,7 @@ type Table
 
        ? Blank values
          Blank values are `Nothing`, `""` and depending on setting `Number.nan`.
-    filter_blank_rows : Blank_Selector -> Boolean -> Table
+    filter_blank_rows : Blank_Selector -> Boolean -> DB_Table
     filter_blank_rows self (when:Blank_Selector = Blank_Selector.All_Cells) treat_nans_as_blank=False =
         Table_Helpers.filter_blank_rows self when treat_nans_as_blank
 
@@ -2395,7 +2401,7 @@ type Table
          If `Nothing`, all available rows are returned.
        - warn_if_more_rows: if set to `True`, a warning is attached to the
          result if the number of rows returned by the query exceeds `max_rows`.
-    read : (Integer | Nothing) -> Boolean -> Materialized_Table
+    read : (Integer | Nothing) -> Boolean -> Table
     read self (max_rows : Integer | Nothing = 1000) (warn_if_more_rows:Boolean = True) =
         preprocessed = if max_rows.is_nothing then self else
             if warn_if_more_rows then self.limit max_rows+1 else self.limit max_rows
@@ -2445,7 +2451,7 @@ type Table
 
        The table lists all columns, counts of non-null items and value types of
        each column.
-    info : Materialized_Table
+    info : Table
     info self =
         cols = self.internal_columns
         count_query =
@@ -2464,7 +2470,7 @@ type Table
         type_mapping = self.connection.dialect.get_type_mapping
         types = cols.map col->
             type_mapping.sql_type_to_value_type col.sql_type_reference.get
-        Materialized_Table.new [["Column", cols.map .name], ["Items Count", counts], ["Value Type", types]]
+        Table.new [["Column", cols.map .name], ["Items Count", counts], ["Value Type", types]]
 
     ## PRIVATE
 
@@ -2491,8 +2497,8 @@ type Table
 
        Arguments:
        - columns: The columns with which to update this table.
-    updated_columns : Vector Internal_Column -> Table
-    updated_columns self internal_columns = Table.Value self.name self.connection internal_columns self.context
+    updated_columns : Vector Internal_Column -> DB_Table
+    updated_columns self internal_columns = DB_Table.Value self.name self.connection internal_columns self.context
 
     ## PRIVATE
 
@@ -2500,8 +2506,8 @@ type Table
 
        Arguments:
        - ctx: The new context for this table.
-    updated_context : Context -> Table
-    updated_context self ctx = Table.Value self.name self.connection self.internal_columns ctx
+    updated_context : Context -> DB_Table
+    updated_context self ctx = DB_Table.Value self.name self.connection self.internal_columns ctx
 
     ## PRIVATE
 
@@ -2519,20 +2525,20 @@ type Table
          avoid nesting subqueries without necessity. However, for now, for
          simplicity, we are always wrapping brittle operations. This may be
          revised in the future, to generate better and more concise SQL code.
-    updated_context_and_columns : Context -> Vector Internal_Column -> Boolean -> Table
+    updated_context_and_columns : Context -> Vector Internal_Column -> Boolean -> DB_Table
     updated_context_and_columns self ctx internal_columns subquery=False = case subquery of
         True ->
             setup = ctx.as_subquery self.name [internal_columns]
             new_ctx = Context.for_subquery setup.subquery
             new_columns = setup.new_columns.first
-            Table.Value self.name self.connection new_columns new_ctx
+            DB_Table.Value self.name self.connection new_columns new_ctx
         False ->
-            Table.Value self.name self.connection internal_columns ctx
+            DB_Table.Value self.name self.connection internal_columns ctx
 
     ## PRIVATE
        Nests a table as a subquery, using `updated_context_and_columns`, which
        causes its columns to be referenced as names rather than expressions.
-    as_subquery : Table
+    as_subquery : DB_Table
     as_subquery self = self.updated_context_and_columns self.context self.internal_columns subquery=True
 
     ## PRIVATE
@@ -2646,7 +2652,7 @@ type Table
              fill_nothing = table.fill_nothing ["col0", "col1"] 20.5
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True add_number=True add_boolean=True)
-    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Previous_Value | Any -> Table
+    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Expression | Previous_Value | Any -> DB_Table
     fill_nothing self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_nothing resolved_default
@@ -2674,7 +2680,7 @@ type Table
              fill_empty = table.fill_empty ["col0", "col1"] "hello"
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True)
-    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Previous_Value | Any -> Table
+    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> DB_Column | Column_Ref | Expression | Previous_Value | Any -> DB_Table
     fill_empty self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_empty resolved_default
@@ -2715,8 +2721,8 @@ type Table
     @columns Widget_Helpers.make_column_name_vector_selector
     @term (Widget_Helpers.make_column_ref_by_name_selector add_regex=True add_text=True)
     @new_text (Widget_Helpers.make_column_ref_by_name_selector add_text=True)
-    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | DB_Column | Column_Ref | Regex -> Text | DB_Column | Column_Ref -> Case_Sensitivity -> Boolean -> DB_Column
-    text_replace self columns (term : Text | DB_Column | Column_Ref | Regex = "") (new_text : Text | DB_Column | Column_Ref = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
+    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | DB_Column | Column_Ref | Expression | Regex -> Text | DB_Column | Column_Ref | Expression -> Case_Sensitivity -> Boolean -> DB_Column
+    text_replace self columns (term : Text | DB_Column | Column_Ref | Expression | Regex = "") (new_text : Text | DB_Column | Column_Ref | Expression = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
         table_ref = Table_Ref.from self
         resolved_term = table_ref.resolve term
         resolved_new_text = table_ref.resolve new_text
@@ -2734,7 +2740,7 @@ type Table
      column name and its expected SQL Type.
    - ctx: The context to use for the table.
    - on_problems: The behavior to use when problems are encountered.
-make_table : Connection -> Text -> Vector -> Context -> Problem_Behavior -> Table
+make_table : Connection -> Text -> Vector -> Context -> Problem_Behavior -> DB_Table
 make_table connection table_name columns ctx on_problems =
     if columns.is_empty then Error.throw (Illegal_State.Error "Unexpectedly attempting to create a Database Table with no columns. This is a bug in the Database library.") else
         problem_builder = Problem_Builder.new
@@ -2750,7 +2756,7 @@ make_table connection table_name columns ctx on_problems =
         problem_builder.report_unique_name_strategy column_names_validator
         # We do not want to stop the table from being fetched, so we report the issues as warnings.
         problem_builder.attach_problems_before on_problems <|
-            Table.Value table_name connection cols ctx
+            DB_Table.Value table_name connection cols ctx
 
 ## PRIVATE
 
@@ -2768,7 +2774,7 @@ make_table connection table_name columns ctx on_problems =
      line will be included that will say how many hidden rows there are.
    - format_term: A boolean flag, specifying whether to use ANSI escape codes
      for rich formatting in the terminal.
-display_dataframe : Materialized_Table -> Integer -> Integer -> Boolean -> Text
+display_dataframe : Table -> Integer -> Integer -> Boolean -> Text
 display_dataframe df indices_count all_rows_count format_terminal =
     cols = Vector.from_polyglot_array df.java_table.getColumns
     col_names = cols.map .getName . map normalize_string_for_display
@@ -2776,7 +2782,7 @@ display_dataframe df indices_count all_rows_count format_terminal =
     display_rows = df.row_count
     rows = Vector.new display_rows row_num->
         col_vals.map col->
-            if col.isNa row_num then "Nothing" else get_item_string col row_num
+            if col.isNothing row_num then "Nothing" else get_item_string col row_num
     table = print_table col_names rows indices_count format_terminal
     if display_rows == all_rows_count then table else
         missing_rows_count = all_rows_count - display_rows
@@ -2786,20 +2792,20 @@ display_dataframe df indices_count all_rows_count format_terminal =
 ## PRIVATE
    By default, join on the first column, unless it's a cross join, in which
    case there are no join conditions.
-default_join_condition : Table -> Join_Kind | Join_Kind_Cross -> Join_Condition
+default_join_condition : DB_Table -> Join_Kind | Join_Kind_Cross -> Join_Condition
 default_join_condition table join_kind = case join_kind of
     Join_Kind_Cross.Cross -> []
     _ -> [Join_Condition.Equals table.column_names.first]
 
 ## PRIVATE
-Materialized_Table.from (that:Table) =
+Table.from (that:DB_Table) =
     _ = [that]
     Error.throw (Illegal_Argument.Error "Currently cross-backend operations are not supported. Materialize the table using `.read` before mixing it with an in-memory Table.")
 
 ## PRIVATE
-Table.from (that:Materialized_Table) =
+DB_Table.from (that:Table) =
     _ = [that]
     Error.throw (Illegal_Argument.Error "Currently cross-backend operations are not supported. Either materialize the other table using `.read` or upload the table into the database using `.select_into_database_table`.")
 
 ## PRIVATE
-Table_Ref.from (that:Table) = Table_Ref.Value that
+Table_Ref.from (that:DB_Table) = Table_Ref.Value that
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
index ff296b5608d4..47e6b5393ace 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso
@@ -8,7 +8,7 @@ import project.Connection.Connection.Connection
 import project.Data.DB_Column.DB_Column
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.Column_Fetcher.Column_Fetcher
 import project.Internal.Error_Mapper.Error_Mapper
 import project.Internal.IR.Context.Context
@@ -65,7 +65,7 @@ type Dialect
 
     ## PRIVATE
        Prepares a distinct operation.
-    prepare_distinct : Table -> Vector -> Case_Sensitivity -> Problem_Builder -> Table
+    prepare_distinct : DB_Table -> Vector -> Case_Sensitivity -> Problem_Builder -> DB_Table
     prepare_distinct self table key_columns case_sensitivity problem_builder =
         _ = [table, key_columns, case_sensitivity, problem_builder]
         Unimplemented.throw "This is an interface only."
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
index ed56d1e108ea..e268a55d55ef 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Take_Drop_Helpers.enso
@@ -8,7 +8,7 @@ from Standard.Base.Data.Index_Sub_Range import normalize_ranges, resolve_ranges,
 
 from Standard.Table import Set_Mode
 
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 from project.Errors import Unsupported_Database_Operation
 
 ## PRIVATE
@@ -21,7 +21,7 @@ type Take_Drop
 
 ## PRIVATE
    Apply `take` or `drop` to a table, returning the specified by the selector.
-take_drop_helper : Take_Drop -> Table -> (Index_Sub_Range | Range | Integer) -> Table
+take_drop_helper : Take_Drop -> DB_Table -> (Index_Sub_Range | Range | Integer) -> DB_Table
 take_drop_helper take_drop table selector =
     check_supported selector <|
         length = table.row_count
@@ -74,7 +74,7 @@ cleanup_ranges ranges:(Vector Range) =
 
 ## PRIVATE
    Filter a table with a single range. Returns only those rows whose row column fall within the range.
-generate_subquery : Table -> Text -> Range -> Table
+generate_subquery : DB_Table -> Text -> Range -> DB_Table
 generate_subquery table row_column_name range =
     case range.step of
         1 ->
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_Database_Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_Database_Table.enso
index 465b0c4dfcbf..8313eaaf2b1c 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_Database_Table.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_Database_Table.enso
@@ -1,12 +1,12 @@
 from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
-import Standard.Table.Data.Table.Table as In_Memory_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Internal.Widget_Helpers
 from Standard.Table.Errors import all
 
 import project.Connection.Connection.Connection
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Data.Update_Action.Update_Action
 from project.Errors import all
 from project.Internal.Upload_Table import all
@@ -56,8 +56,8 @@ from project.Internal.Upload_Table import all
      More expensive checks, like clashing keys are checked only on the sample of
      rows, so errors may still occur when the output action is enabled.
 @primary_key Widget_Helpers.make_column_name_vector_selector
-Table.select_into_database_table : Connection -> Text -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> Table ! Table_Already_Exists | Inexact_Type_Coercion | Missing_Input_Columns | Non_Unique_Key | SQL_Error | Illegal_Argument
-Table.select_into_database_table self connection (table_name : Text) primary_key=[self.columns.first.name] temporary=False on_problems=Problem_Behavior.Report_Warning =
+DB_Table.select_into_database_table : Connection -> Text -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> DB_Table ! Table_Already_Exists | Inexact_Type_Coercion | Missing_Input_Columns | Non_Unique_Key | SQL_Error | Illegal_Argument
+DB_Table.select_into_database_table self connection (table_name : Text) primary_key=[self.columns.first.name] temporary=False on_problems=Problem_Behavior.Report_Warning =
     select_into_table_implementation self connection table_name primary_key temporary on_problems
 
 ## GROUP Standard.Base.Output
@@ -131,8 +131,8 @@ Table.select_into_database_table self connection (table_name : Text) primary_key
      More expensive checks, like clashing keys or unmatched rows are checked
      only on a sample of rows, so errors may still occur when the output action
      is enabled.
-Table.update_rows : Table | In_Memory_Table -> Update_Action -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> Table ! Table_Not_Found | Unmatched_Columns | Missing_Input_Columns | Column_Type_Mismatch | SQL_Error | Illegal_Argument
-Table.update_rows self (source_table : Table | In_Memory_Table) (update_action : Update_Action = Update_Action.Update_Or_Insert) (key_columns : Vector | Nothing = default_key_columns self) (error_on_missing_columns : Boolean = False) (on_problems : Problem_Behavior = Problem_Behavior.Report_Warning) =
+DB_Table.update_rows : DB_Table | Table -> Update_Action -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> DB_Table ! Table_Not_Found | Unmatched_Columns | Missing_Input_Columns | Column_Type_Mismatch | SQL_Error | Illegal_Argument
+DB_Table.update_rows self (source_table : DB_Table | Table) (update_action : Update_Action = Update_Action.Update_Or_Insert) (key_columns : Vector | Nothing = default_key_columns self) (error_on_missing_columns : Boolean = False) (on_problems : Problem_Behavior = Problem_Behavior.Report_Warning) =
     common_update_table source_table self update_action key_columns error_on_missing_columns on_problems
 
 ## GROUP Standard.Base.Output
@@ -191,6 +191,6 @@ Table.update_rows self (source_table : Table | In_Memory_Table) (update_action :
      columns, and returns the count of rows that would have been deleted by this
      operation, with a `Dry_Run_Operation` warning attached.
 @key_columns Widget_Helpers.make_column_name_vector_selector
-Table.delete_rows : Table | In_Memory_Table -> Vector Text | Nothing -> Boolean -> Integer ! Missing_Input_Columns | SQL_Error
-Table.delete_rows self (key_values_to_delete : Table | In_Memory_Table) (key_columns : Vector Text | Nothing = default_key_columns_required self) (allow_duplicate_matches : Boolean = False) =
+DB_Table.delete_rows : DB_Table | Table -> Vector Text | Nothing -> Boolean -> Integer ! Missing_Input_Columns | SQL_Error
+DB_Table.delete_rows self (key_values_to_delete : DB_Table | Table) (key_columns : Vector Text | Nothing = default_key_columns_required self) (allow_duplicate_matches : Boolean = False) =
     common_delete_rows self key_values_to_delete key_columns allow_duplicate_matches
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_In_Memory_Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_In_Memory_Table.enso
index d13473ed9b94..d6a2376a27b0 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_In_Memory_Table.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Extensions/Upload_In_Memory_Table.enso
@@ -6,7 +6,7 @@ import Standard.Table.Internal.Widget_Helpers
 from Standard.Table.Errors import all
 
 import project.Connection.Connection.Connection
-import project.Data.Table.Table as Database_Table
+import project.Data.DB_Table.DB_Table
 import project.Data.Update_Action.Update_Action
 from project.Errors import all
 from project.Internal.Upload_Table import all
@@ -56,7 +56,7 @@ from project.Internal.Upload_Table import all
      More expensive checks, like clashing keys are checked only on the sample of
      rows, so errors may still occur when the output action is enabled.
 @primary_key Widget_Helpers.make_column_name_vector_selector
-Table.select_into_database_table : Connection -> Text -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> Database_Table ! Table_Already_Exists | Inexact_Type_Coercion | Missing_Input_Columns | Non_Unique_Key | SQL_Error | Illegal_Argument
+Table.select_into_database_table : Connection -> Text -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> DB_Table ! Table_Already_Exists | Inexact_Type_Coercion | Missing_Input_Columns | Non_Unique_Key | SQL_Error | Illegal_Argument
 Table.select_into_database_table self connection (table_name : Text) primary_key=[self.columns.first.name] temporary=False on_problems=Problem_Behavior.Report_Warning =
     select_into_table_implementation self connection table_name primary_key temporary on_problems
 
@@ -122,8 +122,8 @@ Table.select_into_database_table self connection (table_name : Text) primary_key
      More expensive checks, like clashing keys or unmatched rows are checked
      only on a sample of rows, so errors may still occur when the output action
      is enabled.
-Table.update_rows : Database_Table | Table -> Update_Action -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> Database_Table ! Table_Not_Found | Unmatched_Columns | Missing_Input_Columns | Column_Type_Mismatch | SQL_Error | Illegal_Argument
-Table.update_rows self (source_table : Database_Table | Table) (update_action : Update_Action = Update_Action.Update_Or_Insert) (key_columns : Vector | Nothing = Nothing) (error_on_missing_columns : Boolean = False) (on_problems : Problem_Behavior = Problem_Behavior.Report_Warning) =
+Table.update_rows : DB_Table | Table -> Update_Action -> Vector Text | Nothing -> Boolean -> Problem_Behavior -> DB_Table ! Table_Not_Found | Unmatched_Columns | Missing_Input_Columns | Column_Type_Mismatch | SQL_Error | Illegal_Argument
+Table.update_rows self (source_table : DB_Table | Table) (update_action : Update_Action = Update_Action.Update_Or_Insert) (key_columns : Vector | Nothing = Nothing) (error_on_missing_columns : Boolean = False) (on_problems : Problem_Behavior = Problem_Behavior.Report_Warning) =
     _ = [source_table, update_action, key_columns, error_on_missing_columns, on_problems]
     Error.throw (Illegal_Argument.Error "Table.update_rows modifies the underlying table, so it is only supported for Database tables - in-memory tables are immutable. Consider using `join` or `merge` for a similar operation that creates a new Table instead.")
 
@@ -183,7 +183,7 @@ Table.update_rows self (source_table : Database_Table | Table) (update_action :
      columns, and returns the count of rows that would have been deleted by this
      operation, with a `Dry_Run_Operation` warning attached.
 @key_columns Widget_Helpers.make_column_name_vector_selector
-Table.delete_rows : Table | Database_Table -> Vector Text | Nothing -> Boolean -> Integer ! Missing_Input_Columns | SQL_Error
-Table.delete_rows self (key_values_to_delete : Table | Database_Table) (key_columns=[]) (allow_duplicate_matches : Boolean = False) =
+Table.delete_rows : Table | DB_Table -> Vector Text | Nothing -> Boolean -> Integer ! Missing_Input_Columns | SQL_Error
+Table.delete_rows self (key_values_to_delete : Table | DB_Table) (key_columns=[]) (allow_duplicate_matches : Boolean = False) =
     _ = [key_values_to_delete, key_columns, allow_duplicate_matches]
     Error.throw (Illegal_Argument.Error "Table.delete_rows modifies the underlying table, so it is only supported for Database tables - in-memory tables are immutable. If you want to create a copy of this table with some rows removed based on a key from another table, you can use a Left Exclusive join, e.g. `table.join key_values_to_delete join_kind=Join_Kind.Left_Exclusive on=key_columns`.")
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Aggregate_Helper.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Aggregate_Helper.enso
index 412c195e398e..f07c44d70ad7 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Aggregate_Helper.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Aggregate_Helper.enso
@@ -7,7 +7,7 @@ from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all
 from Standard.Table.Errors import Floating_Point_Equality
 
 import project.Data.Dialect.Dialect
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.IR.Internal_Column.Internal_Column
 import project.Internal.IR.SQL_Expression.SQL_Expression
 import project.Internal.SQL_Type_Reference.SQL_Type_Reference
@@ -19,19 +19,19 @@ from project.Errors import Unsupported_Database_Operation
    Arguments:
    - table: The table owning the columns used in the aggregation.
    - aggregate: The description of the aggregation to compute.
-   - new_name: The name for the created column.
+   - as: The name for the created column.
    - dialect: The dialect of the database to generate the SQL for.
    - infer_return_type: A function that takes 3 arguments (name of the
      operation, list of input columns and a raw SQL IR Expression) and returns
      the inferred type for the aggregation.
    - problem_builder: A `Problem_Builder` instance used for reporting warnings.
-make_aggregate_column : Table -> Aggregate_Column -> Text -> Dialect -> (Any -> Any -> Any -> SQL_Type_Reference) -> Problem_Builder -> SQL_Expression
-make_aggregate_column table aggregate new_name dialect infer_return_type problem_builder =
+make_aggregate_column : DB_Table -> Aggregate_Column -> Text -> Dialect -> (Any -> Any -> Any -> SQL_Type_Reference) -> Problem_Builder -> SQL_Expression
+make_aggregate_column table aggregate as dialect infer_return_type problem_builder =
     is_non_empty_selector v = v.is_nothing.not && v.not_empty
     simple_aggregate op_kind columns =
         expression = SQL_Expression.Operation op_kind (columns.map .expression)
         sql_type_ref = infer_return_type op_kind columns expression
-        Internal_Column.Value new_name sql_type_ref expression
+        Internal_Column.Value as sql_type_ref expression
 
     aggregate_with_order_by op_kind column order_by =
         order_bys = order_by.map sc->
@@ -39,11 +39,11 @@ make_aggregate_column table aggregate new_name dialect infer_return_type problem
             dialect.prepare_order_descriptor sc.column.as_internal sc.direction effective_ordering
         expression = SQL_Expression.Operation op_kind [column.expression]+order_bys
         sql_type_ref = infer_return_type op_kind [column] expression
-        Internal_Column.Value new_name sql_type_ref expression
+        Internal_Column.Value as sql_type_ref expression
 
     dialect.check_aggregate_support aggregate . if_not_error <| case aggregate of
         Group_By c _ ->
-            Internal_Column.Value new_name c.sql_type_reference c.expression
+            Internal_Column.Value as c.sql_type_reference c.expression
         Count _ -> simple_aggregate "COUNT_ROWS" []
         Count_Distinct columns _ ignore_nothing -> if columns.is_empty then Error.throw (Illegal_Argument.Error "Count_Distinct must have at least one column.") else
             case ignore_nothing of
@@ -57,11 +57,11 @@ make_aggregate_column table aggregate new_name dialect infer_return_type problem
             op_kind = "PERCENTILE"
             expression = SQL_Expression.Operation op_kind [SQL_Expression.Literal p.to_text, c.expression]
             sql_type_ref = infer_return_type op_kind [c] expression
-            Internal_Column.Value new_name sql_type_ref expression
+            Internal_Column.Value as sql_type_ref expression
         Mode c _ ->
             col = table.make_column c
             if col.value_type.is_floating_point then
-                problem_builder.report_other_warning (Floating_Point_Equality.Error new_name)
+                problem_builder.report_other_warning (Floating_Point_Equality.Error as)
             simple_aggregate "MODE" [c]
         First c _ ignore_nothing order_by -> case is_non_empty_selector order_by of
             False -> Error.throw (Unsupported_Database_Operation.Error "`First` aggregation requires at least one `order_by` column.")
@@ -95,7 +95,7 @@ make_aggregate_column table aggregate new_name dialect infer_return_type problem
                 "CONCAT" -> base_args
             expression = SQL_Expression.Operation op_kind effective_args
             sql_type_ref = infer_return_type op_kind [c] expression
-            Internal_Column.Value new_name sql_type_ref expression
+            Internal_Column.Value as sql_type_ref expression
         Sum c _ -> simple_aggregate "SUM" [c]
         Average c _ -> simple_aggregate "AVG" [c]
         Median c _ -> simple_aggregate "MEDIAN" [c]
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Column_Fetcher.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Column_Fetcher.enso
index b0538eccf609..30bb40f56c0e 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Column_Fetcher.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Column_Fetcher.enso
@@ -9,6 +9,7 @@ import Standard.Table.Internal.Java_Exports
 from project.Errors import Unsupported_Database_Operation
 
 polyglot java import java.sql.ResultSet
+polyglot java import java.time.LocalDate as Java_Local_Date
 polyglot java import java.time.LocalTime as Java_Local_Time
 
 polyglot java import org.enso.database.JDBCUtils
@@ -129,6 +130,16 @@ fallback_fetcher =
         make_builder_from_java_object_builder java_builder
     Column_Fetcher.Value fetch_value make_builder
 
+## PRIVATE
+date_fetcher =
+    fetch_value rs i =
+        time = rs.getObject i Java_Local_Date.class
+        if rs.wasNull then Nothing else time
+    make_builder initial_size _ =
+        java_builder = Java_Exports.make_date_builder initial_size
+        make_builder_from_java_object_builder java_builder
+    Column_Fetcher.Value fetch_value make_builder
+
 ## PRIVATE
 time_fetcher =
     fetch_value rs i =
@@ -172,6 +183,7 @@ default_fetcher_for_value_type value_type =
         Value_Type.Char _ _ -> text_fetcher value_type
         Value_Type.Boolean -> boolean_fetcher
         Value_Type.Time -> time_fetcher
+        Value_Type.Date -> date_fetcher
         # We currently don't distinguish timestamps without a timezone on the Enso value side.
         Value_Type.Date_Time has_timezone ->
             if has_timezone then date_time_fetcher else local_date_time_fetcher
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Database_Join_Helper.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Database_Join_Helper.enso
index ef6b6dbcff61..551b0176e07c 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Database_Join_Helper.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Database_Join_Helper.enso
@@ -8,7 +8,7 @@ from Standard.Table.Errors import Floating_Point_Equality
 
 import project.Connection.Connection.Connection
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.Helpers
 import project.Internal.IR.Context.Context
 import project.Internal.IR.From_Spec.From_Spec
@@ -77,7 +77,7 @@ type Join_Subquery_Setup
                 [old.name, new]
 
 ## PRIVATE
-prepare_subqueries : Connection -> Table -> Table -> Boolean -> Boolean -> Pair Join_Subquery_Setup
+prepare_subqueries : Connection -> DB_Table -> DB_Table -> Boolean -> Boolean -> Pair Join_Subquery_Setup
 prepare_subqueries connection left right needs_left_indicator needs_right_indicator =
     table_naming_helper = connection.base_connection.table_naming_helper
     column_naming_helper = connection.base_connection.column_naming_helper
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Lookup_Query_Helper.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Lookup_Query_Helper.enso
index 4aba2a769060..440c79d42666 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Lookup_Query_Helper.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Common/Lookup_Query_Helper.enso
@@ -7,7 +7,7 @@ import Standard.Table.Internal.Lookup_Helpers.Lookup_Column
 from Standard.Table import Join_Kind, Value_Type
 from Standard.Table.Errors import all
 
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.IR.Context.Context
 import project.Internal.IR.From_Spec.From_Spec
 import project.Internal.IR.Internal_Column.Internal_Column
@@ -19,7 +19,7 @@ from project.Internal.Upload_Table import check_for_null_keys
 ## PRIVATE
    Implementation of `lookup_and_replace` for Database backend.
    See `Table.lookup_and_replace` for more details.
-build_lookup_query : Table -> Table -> (Vector (Integer | Text | Regex) | Text | Integer | Regex) -> Boolean -> Boolean -> Problem_Behavior -> Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
+build_lookup_query : DB_Table -> DB_Table -> (Vector (Integer | Text | Regex) | Text | Integer | Regex) -> Boolean -> Boolean -> Problem_Behavior -> DB_Table ! Missing_Input_Columns | Non_Unique_Key | Unmatched_Rows_In_Lookup
 build_lookup_query base_table lookup_table key_columns add_new_columns allow_unmatched_rows on_problems =
     lookup_columns = Lookup_Helpers.prepare_columns_for_lookup base_table lookup_table key_columns add_new_columns allow_unmatched_rows on_problems
     lookup_columns.if_not_error <| check_initial_invariants base_table lookup_table lookup_columns allow_unmatched_rows <|
@@ -57,12 +57,12 @@ build_lookup_query base_table lookup_table key_columns add_new_columns allow_unm
         new_ctx_with_invariant_check = new_ctx.add_where_filters [make_invariant_check subquery_setup.lookup_counter allow_unmatched_rows]
 
         precheck_for_duplicate_matches lookup_columns subquery_setup base_table.connection new_ctx <|
-            Table.Value subquery_setup.new_table_name base_table.connection new_columns new_ctx_with_invariant_check
+            DB_Table.Value subquery_setup.new_table_name base_table.connection new_columns new_ctx_with_invariant_check
 
 ## PRIVATE
    Checks if they key contains NULL values or if there would be unmatched rows
    (if `allow_unmatched_rows` is `False`), and reports any errors.
-check_initial_invariants : Table -> Table -> Vector Lookup_Column -> Boolean -> Any -> Any
+check_initial_invariants : DB_Table -> DB_Table -> Vector Lookup_Column -> Boolean -> Any -> Any
 check_initial_invariants base_table lookup_table lookup_columns allow_unmatched_rows ~continuation =
     key_column_names = lookup_columns.flat_map c-> case c of
         Lookup_Column.Key_Column base_column lookup_column ->
@@ -192,7 +192,7 @@ precheck_for_duplicate_matches lookup_columns subquery_setup connection new_ctx
     key_columns_for_duplicate_check = (_.flatten) <| lookup_columns.map_with_index ix-> c-> case c of
         Lookup_Column.Key_Column _ _ -> [subquery_setup.get_self_column ix]
         _ -> []
-    table_for_duplicate_check = Table.Value subquery_setup.new_table_name connection [subquery_setup.lookup_counter]+key_columns_for_duplicate_check new_ctx
+    table_for_duplicate_check = DB_Table.Value subquery_setup.new_table_name connection [subquery_setup.lookup_counter]+key_columns_for_duplicate_check new_ctx
     duplicate_lookup_matches = table_for_duplicate_check.filter 0 (Filter_Condition.Greater than=1) . read max_rows=1 warn_if_more_rows=False
     case duplicate_lookup_matches.row_count > 0 of
         True ->
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
index a1e3e019a79b..2574eee359c6 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Helpers.enso
@@ -3,7 +3,7 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 from Standard.Base.Runtime import assert
 
 import project.Data.DB_Column.DB_Column
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.IR.Internal_Column.Internal_Column
 from project.Errors import Unsupported_Database_Operation
 
@@ -20,7 +20,7 @@ polyglot java import java.util.regex.Pattern
 
    To combine different objects they need to satisfy this requirement, otherwise
    the combination would be ill-formed.
-check_integrity : (Table | DB_Column) -> (Table | DB_Column) -> Boolean
+check_integrity : (DB_Table | DB_Column) -> (DB_Table | DB_Column) -> Boolean
 check_integrity entity1 entity2 =
     ctx = entity1.context == entity2.context
     ctx && (check_connection entity1 entity2)
@@ -32,7 +32,7 @@ check_integrity entity1 entity2 =
    Arguments:
    - entity1: The entity to check against the second.
    - entity2: The entity to check against the first.
-check_connection : (Table | DB_Column) -> (Table | DB_Column) -> Boolean
+check_connection : (DB_Table | DB_Column) -> (DB_Table | DB_Column) -> Boolean
 check_connection entity1 entity2 =
     # The `if_not_error` is needed `Meta.is_same_object` does not forward dataflow errors.
     entity1.if_not_error <| entity2.if_not_error <|
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
index 93bff5dd39e0..40434c603072 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
@@ -4,14 +4,13 @@ import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Errors.Unimplemented.Unimplemented
 import Standard.Base.Runtime.Context
 import Standard.Base.Runtime.Managed_Resource.Managed_Resource
-from Standard.Base.Data.Enso_Cloud.Enso_Secret import as_hideable_value
+from Standard.Base.Enso_Cloud.Enso_Secret import as_hideable_value
 
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Value_Type.Value_Type
 
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table as Database_Table
 import project.Internal.Column_Fetcher as Column_Fetcher_Module
 import project.Internal.In_Transaction.In_Transaction
 import project.Internal.SQL_Warning_Helper
@@ -158,7 +157,7 @@ type JDBC_Connection
 
        It may be used for accessing simple database metadata. It should never be
        used for proper queries.
-    raw_read_statement : Text -> Materialized_Table
+    raw_read_statement : Text -> Table
     raw_read_statement self raw_sql =
         self.with_prepared_statement raw_sql Statement_Setter.null stmt->
             log_sql_if_enabled self stmt.toString
@@ -227,7 +226,7 @@ type JDBC_Connection
 
        It is the caller's responsibility to call this method from within a
        transaction to ensure consistency.
-    batch_insert : Text -> Statement_Setter -> Materialized_Table -> Integer -> Vector Value_Type | Nothing -> Integer | Nothing -> Nothing
+    batch_insert : Text -> Statement_Setter -> Table -> Integer -> Vector Value_Type | Nothing -> Integer | Nothing -> Nothing
     batch_insert self insert_template statement_setter table batch_size expected_type_hints=Nothing row_limit=Nothing =
         In_Transaction.ensure_in_transaction <| self.with_connection java_connection-> handle_sql_errors related_query=insert_template <|
             Managed_Resource.bracket (java_connection.prepareStatement insert_template) .close stmt->
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
index 1c3a2fa957b1..7f98c46701c8 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
@@ -4,7 +4,7 @@ import Standard.Base.Metadata.Display
 from Standard.Base.Metadata.Choice import Option
 from Standard.Base.Metadata.Widget import Single_Choice
 
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Value_Type.Value_Type
 
 import project.Connection.Connection.Connection
@@ -13,7 +13,7 @@ import project.Data.Dialect
 import project.Data.SQL_Query.SQL_Query
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table as Database_Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.IR.Query.Query
 import project.Internal.JDBC_Connection
 import project.Internal.Postgres.Postgres_Entity_Naming_Properties
@@ -118,7 +118,7 @@ type Postgres_Connection
        - all_fields: Return all the fields in the metadata table.
     @types make_table_types_selector
     @schema make_schema_selector
-    tables : Text -> Text -> Text -> Vector -> Boolean -> Materialized_Table
+    tables : Text -> Text -> Text -> Vector -> Boolean -> Table
     tables self name_like=Nothing database=self.database schema=Nothing types=self.dialect.default_table_types all_fields=False =
         self.connection.tables name_like database schema types all_fields
 
@@ -140,7 +140,7 @@ type Postgres_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> Database_Table ! Table_Not_Found
+    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
     query self query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
@@ -164,7 +164,7 @@ type Postgres_Connection
          `execute_update` for DML queries, or if they are supposed to return
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
-    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Materialized_Table ! Table_Not_Found
+    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Table ! Table_Not_Found
     read self query (limit : Integer | Nothing = 1000) (warn_if_more_rows : Boolean = True) =
         self.connection.read query limit warn_if_more_rows
 
@@ -211,8 +211,8 @@ type Postgres_Connection
          (like missing columns) and if successful, return a temporary table with
          a `Dry_Run_Operation` warning attached.
     @structure make_structure_creator
-    create_table : Text  -> Vector Column_Description | Database_Table | Materialized_Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> Database_Table ! Table_Already_Exists
-    create_table self (table_name : Text) (structure : Vector Column_Description | Database_Table | Materialized_Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
+    create_table : Text  -> Vector Column_Description | DB_Table | Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> DB_Table ! Table_Already_Exists
+    create_table self (table_name : Text) (structure : Vector Column_Description | DB_Table | Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
         self.connection.create_table table_name structure primary_key temporary allow_existing on_problems
 
     ## ADVANCED
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
index 61048ed3deca..40f5c3a6de8d 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
@@ -18,7 +18,7 @@ import project.Data.SQL.SQL_Builder
 import project.Data.SQL.SQL_Fragment
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.Base_Generator
 import project.Internal.Column_Fetcher as Column_Fetcher_Module
 import project.Internal.Column_Fetcher.Column_Fetcher
@@ -107,7 +107,7 @@ type Postgres_Dialect
 
     ## PRIVATE
        Prepares a distinct operation.
-    prepare_distinct : Table -> Vector -> Case_Sensitivity -> Problem_Builder -> Table
+    prepare_distinct : DB_Table -> Vector -> Case_Sensitivity -> Problem_Builder -> DB_Table
     prepare_distinct self table key_columns case_sensitivity problem_builder =
         table_name_deduplicator = table.connection.base_connection.table_naming_helper.create_unique_name_strategy
         table_name_deduplicator.mark_used table.name
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso
index edaf55c5e8c5..c51d35530552 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Result_Set.enso
@@ -1,6 +1,6 @@
 from Standard.Base import all
 
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Internal.Java_Problems
 
 import project.Data.SQL_Type.SQL_Type
@@ -26,8 +26,8 @@ read_column result_set column_name =
         builder.to_vector
 
 ## PRIVATE
-   Converts a ResultSet into a Materialized_Table.
-result_set_to_table : ResultSet -> (SQL_Type -> Column_Fetcher) -> (Vector (SQL_Type | Nothing) | Nothing) -> Boolean -> Materialized_Table
+   Converts a ResultSet into a Table.
+result_set_to_table : ResultSet -> (SQL_Type -> Column_Fetcher) -> (Vector (SQL_Type | Nothing) | Nothing) -> Boolean -> Table
 result_set_to_table result_set make_column_fetcher type_overrides=Nothing last_row_only=False =
     metadata = result_set.getMetaData
     ncols = metadata.getColumnCount
@@ -74,4 +74,4 @@ result_set_to_table result_set make_column_fetcher type_overrides=Nothing last_r
         Problem_Behavior.Report_Warning.attach_problems_before warnings_builder.to_vector <|
             columns = column_builders.zip column_names builder-> name->
                 builder.make_column name
-            Materialized_Table.new columns
+            Table.new columns
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
index 14e7803d56d6..d5098f3f7123 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
@@ -4,7 +4,7 @@ import Standard.Base.Metadata.Display
 from Standard.Base.Metadata.Choice import Option
 from Standard.Base.Metadata.Widget import Single_Choice
 
-import Standard.Table.Data.Table.Table as Materialized_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Type.Value_Type.Value_Type
 
 import project.Connection.Connection.Connection
@@ -13,7 +13,7 @@ import project.Data.Dialect
 import project.Data.SQL_Query.SQL_Query
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table as Database_Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.IR.Query.Query
 import project.Internal.JDBC_Connection
 import project.Internal.SQL_Type_Reference.SQL_Type_Reference
@@ -111,7 +111,7 @@ type SQLite_Connection
        - all_fields: Return all the fields in the metadata table.
     @types make_table_types_selector
     @schema make_schema_selector
-    tables : Text -> Text -> Text -> Vector -> Boolean -> Materialized_Table
+    tables : Text -> Text -> Text -> Vector -> Boolean -> Table
     tables self name_like=Nothing database=self.database schema=Nothing types=self.dialect.default_table_types all_fields=False =
         self.connection.tables name_like database schema types all_fields
 
@@ -133,7 +133,7 @@ type SQLite_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> Database_Table ! Table_Not_Found
+    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
     query self query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
@@ -157,7 +157,7 @@ type SQLite_Connection
          `execute_update` for DML queries, or if they are supposed to return
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
-    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Materialized_Table ! Table_Not_Found
+    read : Text | SQL_Query -> Integer | Nothing -> Boolean -> Table ! Table_Not_Found
     read self query (limit : Integer | Nothing = 1000) (warn_if_more_rows : Boolean = True) =
         self.connection.read query limit warn_if_more_rows
 
@@ -204,8 +204,8 @@ type SQLite_Connection
          (like missing columns) and if successful, return a temporary table with
          a `Dry_Run_Operation` warning attached.
     @structure make_structure_creator
-    create_table : Text  -> Vector Column_Description | Database_Table | Materialized_Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> Database_Table ! Table_Already_Exists
-    create_table self (table_name : Text) (structure : Vector Column_Description | Database_Table | Materialized_Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
+    create_table : Text  -> Vector Column_Description | DB_Table | Table -> Vector Text | Nothing -> Boolean -> Boolean -> Problem_Behavior -> DB_Table ! Table_Already_Exists
+    create_table self (table_name : Text) (structure : Vector Column_Description | DB_Table | Table) (primary_key : (Vector Text | Nothing) = [first_column_name_in_structure structure]) (temporary : Boolean = False) (allow_existing : Boolean = False) (on_problems:Problem_Behavior = Problem_Behavior.Report_Warning) =
         self.connection.create_table table_name structure primary_key temporary allow_existing on_problems
 
     ## ADVANCED
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
index 10bac679c697..1f0da4318a1c 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
@@ -13,7 +13,7 @@ import project.Data.Dialect
 import project.Data.SQL.SQL_Builder
 import project.Data.SQL_Statement.SQL_Statement
 import project.Data.SQL_Type.SQL_Type
-import project.Data.Table.Table
+import project.Data.DB_Table.DB_Table
 import project.Internal.Base_Generator
 import project.Internal.Column_Fetcher as Column_Fetcher_Module
 import project.Internal.Column_Fetcher.Column_Fetcher
@@ -105,7 +105,7 @@ type SQLite_Dialect
 
     ## PRIVATE
        Prepares a distinct operation.
-    prepare_distinct : Table -> Vector -> Case_Sensitivity -> Problem_Builder -> Table
+    prepare_distinct : DB_Table -> Vector -> Case_Sensitivity -> Problem_Builder -> DB_Table
     prepare_distinct self table key_columns case_sensitivity problem_builder =
         table_name_deduplicator = table.connection.base_connection.table_naming_helper.create_unique_name_strategy
         table_name_deduplicator.mark_used table.name
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload_Table.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload_Table.enso
index 38fae6f292bd..ee135b47694b 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload_Table.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload_Table.enso
@@ -1,13 +1,12 @@
 from Standard.Base import all
 import Standard.Base.Data.Vector.No_Wrap
 import Standard.Base.Errors.Common.Dry_Run_Operation
-import Standard.Base.Errors.Common.Forbidden_Operation
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Runtime.Context
 from Standard.Base.Runtime import assert
 
-import Standard.Table.Data.Table.Table as In_Memory_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Internal.Problem_Builder.Problem_Builder
 from Standard.Table import Aggregate_Column, Join_Kind, Value_Type
 from Standard.Table.Errors import all
@@ -17,7 +16,7 @@ import project.Data.Column_Constraint.Column_Constraint
 import project.Data.Column_Description.Column_Description
 import project.Data.SQL_Query.SQL_Query
 import project.Data.SQL_Statement.SQL_Statement
-import project.Data.Table.Table as Database_Table
+import project.Data.DB_Table.DB_Table
 import project.Data.Update_Action.Update_Action
 import project.Internal.In_Transaction.In_Transaction
 import project.Internal.IR.Create_Column_Descriptor.Create_Column_Descriptor
@@ -77,8 +76,8 @@ internal_create_table_structure connection table_name structure primary_key temp
 
    Arguments:
    - source_table: the table to be uploaded.
-     If it's a `Database_Table`, the query will be materialized as a new table.
-     If it's an `In_Memory_Table`, the data will be uploaded to the newly created table.
+     If it's a `DB_Table`, the query will be materialized as a new table.
+     If it's an In Memmory `Table`, the data will be uploaded to the newly created table.
    - connection: the connection to the database.
    - table_name: the name of the table to be created.
    - primary_key: the primary key of the table to be created. Can be `Nothing` to set no key.
@@ -86,12 +85,12 @@ internal_create_table_structure connection table_name structure primary_key temp
    - structure_hint: If set, it can be used to hint what types should be used for the columns of the table. Useful if the types slightly differ from the in-memory source types.
    - on_problems: the behavior to be used when reporting problems.
    - row_limit: if set, only the first `row_limit` rows will be uploaded.
-internal_upload_table : Database_Table | In_Memory_Table -> Connection -> Text -> Nothing | Vector Text -> Boolean -> Vector Column_Description ->  Problem_Behavior -> Integer|Nothing -> Database_Table
+internal_upload_table : DB_Table | Table -> Connection -> Text -> Nothing | Vector Text -> Boolean -> Vector Column_Description ->  Problem_Behavior -> Integer|Nothing -> DB_Table
 internal_upload_table source_table connection table_name primary_key temporary structure_hint=Nothing on_problems=Problem_Behavior.Report_Error row_limit=Nothing =
     case source_table of
-        _ : In_Memory_Table ->
+        _ : Table ->
             internal_upload_in_memory_table source_table connection table_name primary_key temporary structure_hint on_problems row_limit
-        _ : Database_Table ->
+        _ : DB_Table ->
             internal_upload_database_table source_table connection table_name primary_key temporary structure_hint on_problems row_limit
         _ ->
             Panic.throw <| Illegal_Argument.Error ("Unsupported table type: " + Meta.get_qualified_type_name source_table)
@@ -244,11 +243,11 @@ raise_duplicated_primary_key_error source_table primary_key original_panic =
             Error.throw (Non_Unique_Key.Error primary_key example_entry example_count)
 
 ## PRIVATE
-align_structure : Connection | Any -> Database_Table | In_Memory_Table | Vector Column_Description -> Vector Column_Description
+align_structure : Connection | Any -> DB_Table | Table | Vector Column_Description -> Vector Column_Description
 align_structure connection table_or_columns = case table_or_columns of
     vector : Vector         -> align_vector_structure vector
-    table : Database_Table  -> structure_from_existing_table connection table
-    table : In_Memory_Table -> structure_from_existing_table connection table
+    table : DB_Table  -> structure_from_existing_table connection table
+    table : Table -> structure_from_existing_table connection table
 
 ## PRIVATE
 align_vector_structure vector =
@@ -290,8 +289,8 @@ validate_structure column_naming_helper structure ~action =
    Used to provide the default value for `primary_key` in `create_table`.
 first_column_name_in_structure structure = case structure of
     vector : Vector -> align_vector_structure vector . first . name
-    table : Database_Table  -> table.column_names.first
-    table : In_Memory_Table -> table.column_names.first
+    table : DB_Table  -> table.column_names.first
+    table : Table -> table.column_names.first
 
 ## PRIVATE
    Creates a statement that will create a table with structure determined by the
@@ -325,7 +324,7 @@ make_batched_insert_template connection table_name column_names =
     template
 
 ## PRIVATE
-common_update_table (source_table : Database_Table | In_Memory_Table) (target_table : Database_Table) update_action key_columns error_on_missing_columns on_problems =
+common_update_table (source_table : DB_Table | Table) (target_table : DB_Table) update_action key_columns error_on_missing_columns on_problems =
     check_target_table_for_update target_table <|
         connection = target_table.connection
         Panic.recover SQL_Error <| handle_upload_errors <|
@@ -351,8 +350,8 @@ common_update_table (source_table : Database_Table | In_Memory_Table) (target_ta
 
 ## PRIVATE
 check_target_table_for_update target_table ~action = case target_table of
-    _ : In_Memory_Table -> Error.throw (Illegal_Argument.Error "The target table must be a Database table.")
-    _ : Database_Table -> if target_table.is_trivial_query . not then Error.throw (Illegal_Argument.Error "The target table must be a simple table reference, like returned by `Connection.query`, without any changes like joins, aggregations or even column modifications.") else
+    _ : Table -> Error.throw (Illegal_Argument.Error "The target table must be a Database table.")
+    _ : DB_Table -> if target_table.is_trivial_query . not then Error.throw (Illegal_Argument.Error "The target table must be a simple table reference, like returned by `Connection.query`, without any changes like joins, aggregations or even column modifications.") else
         action
 
 ## PRIVATE
@@ -490,7 +489,7 @@ check_update_arguments_structure_match source_table target_table key_columns upd
                             on_problems.attach_problems_before problems action
 
 ## PRIVATE
-default_key_columns (table : Database_Table | In_Memory_Table) =
+default_key_columns (table : DB_Table | Table) =
     check_target_table_for_update table <|
         table.get_primary_key
 
@@ -561,7 +560,7 @@ common_delete_rows target_table key_values_to_delete key_columns allow_duplicate
    In dry-run mode, if the table is an SQL query, it is kept as is to avoid copying data.
    In real mode, the table is copied into a temporary table to simplify the DELETE FROM query.
    If the source table is in-memory, it is uploaded in either mode, but in dry-run mode only a sample of the rows is processed.
-prepare_source_table_for_delete_matching (key_values_to_delete : Database_Table | In_Memory_Table) connection key_columns dry_run =
+prepare_source_table_for_delete_matching (key_values_to_delete : DB_Table | Table) connection key_columns dry_run =
     ## We select only the key columns and discard anything else.
        We also call distinct to ensure that we will not have primary-key
        duplicate issues when uploading the temporary table.
@@ -569,9 +568,9 @@ prepare_source_table_for_delete_matching (key_values_to_delete : Database_Table
     case dry_run of
         True ->
             case prepared_table of
-                _ : Database_Table ->
+                _ : DB_Table ->
                     Delete_Rows_Source.Value prepared_table Nothing
-                _ : In_Memory_Table ->
+                _ : Table ->
                     tmp_table_name = connection.base_connection.table_naming_helper.generate_random_table_name "enso-temp-keys-table-"
                     uploaded_table = internal_upload_in_memory_table prepared_table connection tmp_table_name primary_key=key_columns temporary=True structure_hint=Nothing on_problems=Problem_Behavior.Report_Error row_limit=dry_run_row_limit
 
@@ -589,7 +588,7 @@ prepare_source_table_for_delete_matching (key_values_to_delete : Database_Table
 ## PRIVATE
 type Delete_Rows_Source
     ## PRIVATE
-    Value (db_table : Database_Table) (tmp_table_name : Nothing | Text) (dry_run_message_suffix : Text = "")
+    Value (db_table : DB_Table) (tmp_table_name : Nothing | Text) (dry_run_message_suffix : Text = "")
 
     ## PRIVATE
        Drops a temporarily created table, if there was one.
diff --git a/distribution/lib/Standard/Google_Api/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Google_Api/0.0.0-dev/src/Main.enso
index 40e9a228fa1b..21b3ba87a5b7 100644
--- a/distribution/lib/Standard/Google_Api/0.0.0-dev/src/Main.enso
+++ b/distribution/lib/Standard/Google_Api/0.0.0-dev/src/Main.enso
@@ -1,6 +1,8 @@
 from Standard.Base import all
 import Standard.Base.Data.Array_Proxy.Array_Proxy
-
+import Standard.Base.Metadata.Display
+from Standard.Base.Metadata import make_single_choice, Widget
+from Standard.Base.Metadata.Widget import Single_Choice, Vector_Editor
 from Standard.Table import Table
 
 polyglot java import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
@@ -68,29 +70,46 @@ initialize secret_file =
     json_factory = GsonFactory.getDefaultInstance
     Google_Api_Client.Value credential json_factory http_transport
 
+## PRIVATE
+make_dimensions_vector_selector : Widget
+make_dimensions_vector_selector =
+    item_editor = make_single_choice ['country', 'date', 'isConversionEvent', 'language', 'userAgeBracket', 'userGender']
+    Vector_Editor item_editor=item_editor item_default=item_editor.values.first.value display=Display.Always
+
+## PRIVATE
+make_metrics_vector_selector : Widget
+make_metrics_vector_selector =
+    item_editor = make_single_choice ['activeUsers', 'bounceRate', 'conversions', 'newUsers', 'sessionsPerUser', 'userConversionRate']
+    Vector_Editor item_editor=item_editor item_default=item_editor.values.first.value display=Display.Always
+
 
 ## PLACEHOLDER, performs google analytics call
-   This method calls the google reporting v4 api. Presently it specifically returns activeUsers by City
+   This method calls the google reporting v4 api. 
    Arguments:
    - property_id: The Google Analytics property_id that is being queried
    - start_date: The beginning date of the query. Default is 2020-03-31
    - end_date: The end date being queried. Defaults to today.
-run_analytics_report : Text -> Date -> Date -> Table
-run_analytics_report property_id:Text start_date:Date=(Date.new 2020 3 31) end_date:Date=Date.today -> Table =
+@dimensions make_dimensions_vector_selector
+@metrics make_metrics_vector_selector
+run_analytics_report : Text -> Date -> Date -> (Vector Text) -> (Vector Text) -> Table
+run_analytics_report property_id:Text start_date:Date=(Date.new 2020 3 31) end_date:Date=Date.today dimensions:Vector=['userType'] metrics:Vector=['users'] -> Table =
     analytics_data = BetaAnalyticsDataClient.create
-    request = RunReportRequest.newBuilder
+    request_builder = RunReportRequest.newBuilder
         . setProperty ("properties/"+property_id)
-        . addDimensions (Dimension.newBuilder.setName "city")
-        . addMetrics (Metric.newBuilder.setName "activeUsers")
         . addDateRanges (DateRange.newBuilder.setStartDate start_date.to_text . setEndDate end_date.to_text)
-        . build
+    dimensions.distinct.each dimension->
+        request_builder.addDimensions (Dimension.newBuilder.setName dimension)
+    metrics.distinct.each metric->
+        request_builder.addMetrics (Metric.newBuilder.setName metric)
+
+    request = request_builder.build
     response = analytics_data.runReport request
 
     dimension_count = response.getDimensionHeadersCount
-    dimensions = 0.up_to dimension_count . map i-> response.getDimensionHeaders i . getName
+    dimension_headers = 0.up_to dimension_count . map i-> response.getDimensionHeaders i . getName
     metric_count = response.getMetricHeadersCount
-    metrics = 0.up_to metric_count . map i-> response.getMetricHeaders i . getName
-    headers = dimensions + metrics
+    metric_headers = 0.up_to metric_count . map i-> response.getMetricHeaders i . getName
+    headers = dimension_headers + metric_headers
 
     row_count = response.getRowCount
     row_proxy = Array_Proxy.new row_count i->
diff --git a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso
index 19a9241ed73d..acb1eb78dcfc 100644
--- a/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso
+++ b/distribution/lib/Standard/Image/0.0.0-dev/src/Data/Image.enso
@@ -1,5 +1,4 @@
 from Standard.Base import all
-import Standard.Base.Errors.Common.Forbidden_Operation
 import Standard.Base.Errors.File_Error.File_Error
 import Standard.Base.Runtime.Context
 import Standard.Base.System.File.Generic.Writable_File.Writable_File
@@ -98,7 +97,7 @@ type Image
              image.write path image [Write_Flag.JPEG_Quality 40, Write_Flag.JPEG_Progressive]
     write : Writable_File  -> (Write_Flag | Vector) -> Nothing ! File_Error
     write self location:Writable_File flags=[] =
-        if Context.Output.is_enabled.not then Error.throw (Forbidden_Operation.Error "Writing the image to a file is forbidden as the Output context is disabled.") else
+        Context.Output.if_enabled disabled_message="Writing the image to a file is forbidden as the Output context is disabled." panic=False <|
             write_flags = case flags of
                 _ : Vector -> flags
                 _ -> [flags]
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Aggregate_Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Aggregate_Column.enso
index 085a8fbc512e..85ba20998fb6 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Aggregate_Column.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Aggregate_Column.enso
@@ -9,15 +9,15 @@ type Aggregate_Column
 
        Arguments:
        - column: the column (either name, expression or index) to group by.
-       - new_name: name of new column.
-    Group_By (column:Text|Integer|Any) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Group_By (column:Text|Integer|Any) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the row count of each group. If no rows,
        evaluates to 0.
 
        Arguments:
-       - new_name: name of new column.
-    Count (new_name:Text="")
+       - as: name of new column.
+    Count (as:Text="")
 
     ## Creates a new column with the count of unique items in the selected
        column(s) within each group. If no rows, evaluates to 0.
@@ -28,9 +28,9 @@ type Aggregate_Column
          an expression evaluated on the Table, if provided instead of a
          single column name. Currently expressions are not supported with
          multiple selection.
-       - new_name: name of new column.
+       - as: name of new column.
        - ignore_nothing: if all values are Nothing won't be included.
-    Count_Distinct (columns:(Text | Integer | Regex | Vector (Integer | Text | Regex | Any))=0) (new_name:Text="") (ignore_nothing:Boolean=False) # Any needed because of 6866
+    Count_Distinct (columns:(Text | Integer | Regex | Vector (Integer | Text | Regex | Any))=0) (as:Text="") (ignore_nothing:Boolean=False) # Any needed because of 6866
 
     ## ALIAS Count_Not_Null
 
@@ -39,8 +39,8 @@ type Aggregate_Column
 
        Arguments:
        - column: the column (specified by name, expression or index) to count.
-       - new_name: name of new column.
-    Count_Not_Nothing (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Count_Not_Nothing (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## ALIAS Count_Null, Count_Missing
 
@@ -49,40 +49,40 @@ type Aggregate_Column
 
        Arguments:
        - column: the column (specified by name, expression or index) to count.
-       - new_name: name of new column.
-    Count_Nothing (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Count_Nothing (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the count of not `Nothing` (null) and non-empty
        ("") values of the column within each group. If no rows, evaluates to 0.
 
        Arguments:
        - column: the column (specified by name, expression or index) to count.
-       - new_name: name of new column.
-    Count_Not_Empty (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Count_Not_Empty (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the count of `Nothing` (null) or empty ("")
        text values of the column within each group. If no rows, evaluates to 0.
 
        Arguments:
        - column: the column (specified by name, expression or index) to count.
-       - new_name: name of new column.
-    Count_Empty (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Count_Empty (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the sum of values (ignoring missing values) of
        the column within each group. If no rows, evaluates to `Nothing`.
 
        Arguments:
        - column: the column (specified by name, expression or index) to total.
-       - new_name: name of new column.
-    Sum (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Sum (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the mean of values (ignoring missing values) of
        the column within each group. If no rows, evaluates to `Nothing`.
 
        Arguments:
        - column: the column (specified by name, expression or index) to average.
-       - new_name: name of new column.
-    Average (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Average (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the median of values (ignoring missing values)
        of the column within each group. If no rows, evaluates to `Nothing`.
@@ -90,8 +90,8 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to calculate
          median on.
-       - new_name: name of new column.
-    Median (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Median (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the percentile of values (ignoring missing values)
        of the column within each group. If no rows, evaluates to `Nothing`.
@@ -100,8 +100,8 @@ type Aggregate_Column
        - percentile: Percentage to compute from 0-1 inclusive.
        - column: column (specified by name, expression or index) to compute
          percentile.
-       - new_name: name of new column.
-    Percentile (percentile:Number=0.5) (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Percentile (percentile:Number=0.5) (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the mode of values (ignoring missing values)
        of the column within each group. If no rows, evaluates to `Nothing`.
@@ -109,8 +109,8 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find the
          most common value.
-       - new_name: name of new column.
-    Mode (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Mode (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the standard deviation of values (ignoring
        missing values) of the column within each group. If no rows, evaluates to
@@ -119,22 +119,22 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to compute
          standard deviation.
-       - new_name: name of new column.
+       - as: name of new column.
        - population: specifies if group is a sample or the population
-    Standard_Deviation (column:Text|Integer|Any=0) (new_name:Text="") (population:Boolean=False) # Any needed because of 6866
+    Standard_Deviation (column:Text|Integer|Any=0) (as:Text="") (population:Boolean=False) # Any needed because of 6866
 
     ## Creates a new column with the values concatenated together. `Nothing`
        values will become an empty string. If no rows, evaluates to `Nothing`.
 
        Arguments:
        - column: column (specified by name, expression or index) to concatenate.
-       - new_name: name of new column.
+       - as: name of new column.
        - separator: added between each value.
        - prefix: added at the start of the result.
        - suffix: added at the end of the result.
        - quote_char: character used to quote the values if the value is `Empty`
          or contains the separator.
-    Concatenate (column:Text|Integer|Any=0) (new_name:Text="") (separator:Text="") (prefix:Text="") (suffix:Text="") (quote_char:Text="") # Any needed because of 6866
+    Concatenate (column:Text|Integer|Any=0) (as:Text="") (separator:Text="") (prefix:Text="") (suffix:Text="") (quote_char:Text="") # Any needed because of 6866
 
     ## Creates a new column with the first value in each group. If no rows,
        evaluates to `Nothing`.
@@ -142,12 +142,12 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find first
          group entry.
-       - new_name: name of new column.
+       - as: name of new column.
        - ignore_nothing: if `True`, then missing values are ignored and first
          not missing value returned.
        - order_by: required for database tables. Specifies how to order the
          results within the group.
-    First (column:Text|Integer|Any=0) (new_name:Text="") (ignore_nothing:Boolean=True) (order_by:(Text | Vector (Text | Sort_Column) | Nothing)=Nothing) # Any needed because of 6866
+    First (column:Text|Integer|Any=0) (as:Text="") (ignore_nothing:Boolean=True) (order_by:(Text | Vector (Text | Sort_Column) | Nothing)=Nothing) # Any needed because of 6866
 
     ## Creates a new column with the last value in each group. If no rows,
        evaluates to `Nothing`.
@@ -155,12 +155,12 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find last
          group entry.
-       - new_name: name of new column.
+       - as: name of new column.
        - ignore_nothing: if `True`, then missing values are ignored and last
          not missing value returned.
        - order_by: required for database tables. Specifies how to order the
          results within the group.
-    Last (column:Text|Integer|Any=0) (new_name:Text="") (ignore_nothing:Boolean=True) (order_by:(Text | Vector (Text | Sort_Column) | Nothing)=Nothing) # Any needed because of 6866
+    Last (column:Text|Integer|Any=0) (as:Text="") (ignore_nothing:Boolean=True) (order_by:(Text | Vector (Text | Sort_Column) | Nothing)=Nothing) # Any needed because of 6866
 
     ## Creates a new column with the maximum value in each group. If no rows,
        evaluates to `Nothing`.
@@ -168,8 +168,8 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find the
          group maximum.
-       - new_name: name of new column.
-    Maximum (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Maximum (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the maximum value in each group. If no rows,
        evaluates to `Nothing`.
@@ -177,8 +177,8 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find the
          group minimum.
-       - new_name: name of new column.
-    Minimum (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Minimum (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the shortest text in each group. If no rows,
        evaluates to `Nothing`.
@@ -186,8 +186,8 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find the
          group shortest value.
-       - new_name: name of new column.
-    Shortest (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Shortest (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
 
     ## Creates a new column with the longest text in each group. If no rows,
        evaluates to `Nothing`.
@@ -195,5 +195,5 @@ type Aggregate_Column
        Arguments:
        - column: column (specified by name, expression or index) to find the
          group longest value.
-       - new_name: name of new column.
-    Longest (column:Text|Integer|Any=0) (new_name:Text="") # Any needed because of 6866
+       - as: name of new column.
+    Longest (column:Text|Integer|Any=0) (as:Text="") # Any needed because of 6866
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Calculations/Column_Operation.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Calculations/Column_Operation.enso
index a3f949b26bd8..6d3d086a9e8e 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Calculations/Column_Operation.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Calculations/Column_Operation.enso
@@ -1,151 +1,102 @@
 from Standard.Base import all
-import Standard.Base.Metadata.Display
-import Standard.Base.Metadata.Widget
-from Standard.Base.Metadata.Choice import Option
-from Standard.Base.Metadata.Widget import Single_Choice
+import Standard.Base.Errors.Deprecated.Deprecated
 
 import project.Data.Column_Ref.Column_Ref
-import project.Extensions.Table_Ref.Table_Ref
-import project.Internal.Widget_Helpers
-from project.Internal.Filter_Condition_Helpers import make_filter_column
+import project.Data.Expression.Expression
+import project.Data.Simple_Expression.Simple_Expression
+import project.Data.Simple_Expression.Simple_Calculation
 
-## Defines a column operation generally acting on each row producing a new
-   column.
+## PRIVATE
+
+   Defines a column operation generally acting on each row producing a new
+   column. Deprecated in favour of `Simple_Expression`.
 type Column_Operation
     ## Add two values/columns.
-    Add (input : Column_Ref|Number|Text) (rhs : Column_Ref|Number|Text)
+    Add (input : Column_Ref|Expression|Number|Text) (rhs : Column_Ref|Expression|Number|Text)
 
     ## Subtract two values/columns.
-    Subtract (input : Column_Ref|Number) (rhs : Column_Ref|Number)
+    Subtract (input : Column_Ref|Expression|Number) (rhs : Column_Ref|Expression|Number)
 
     ## Multiply two values/columns.
-    Multiply (input : Column_Ref|Number) (rhs : Column_Ref|Number)
+    Multiply (input : Column_Ref|Expression|Number) (rhs : Column_Ref|Expression|Number)
 
     ## Divide a fixed value or column by another value or column.
-    Divide (input : Column_Ref|Number) (rhs : Column_Ref|Number)
+    Divide (input : Column_Ref|Expression|Number) (rhs : Column_Ref|Expression|Number)
 
     ## Compute the remainder of a fixed value or column divided by another
        value or column.
-    Mod (input : Column_Ref|Number) (rhs : Column_Ref|Number)
+    Mod (input : Column_Ref|Expression|Number) (rhs : Column_Ref|Expression|Number)
 
     ## Raise a fixed value or column to the power of another value or column.
-    Power (input : Column_Ref|Number) (rhs : Column_Ref|Number)
+    Power (input : Column_Ref|Expression|Number) (rhs : Column_Ref|Expression|Number)
 
     ## Rounds values in the column to the specified precision.
-    Round (input : Column_Ref|Number) (precision:Integer = 0) (use_bankers:Boolean = False)
+    Round (input : Column_Ref|Expression|Number) (precision:Integer = 0) (use_bankers:Boolean = False)
 
     ## Rounds values in the column up to the nearest integer.
-    Ceil (input : Column_Ref|Number)
+    Ceil (input : Column_Ref|Expression|Number)
 
     ## Rounds values in the column down to the nearest integer.
-    Floor (input : Column_Ref|Number)
+    Floor (input : Column_Ref|Expression|Number)
 
     ## Truncates the fractional part of values in the column.
        If a Date_Time, returns the Date.
-    Truncate (input : Column_Ref|Number|Date_Time)
+    Truncate (input : Column_Ref|Expression|Number|Date_Time)
 
     ## Returns the minimum value of two columns.
-    Min (input : Column_Ref|Any) (rhs : Column_Ref|Any)
+    Min (input : Column_Ref|Expression|Any) (rhs : Column_Ref|Expression|Any)
 
     ## Returns the maximum value of two columns.
-    Max (input : Column_Ref|Any) (rhs : Column_Ref|Any)
+    Max (input : Column_Ref|Expression|Any) (rhs : Column_Ref|Expression|Any)
 
     ## Adds a period to a date/time column.
-    Date_Add (input : Column_Ref|Date_Time|Date|Time_Of_Day) (length : Column_Ref|Integer) (period : Date_Period|Time_Period = Date_Period.Day)
+    Date_Add (input : Column_Ref|Expression|Date_Time|Date|Time_Of_Day) (length : Column_Ref|Expression|Integer) (period : Date_Period|Time_Period = Date_Period.Day)
 
     ## Returns part of a date/time column.
-    Date_Part (input : Column_Ref|Date_Time|Date|Time_Of_Day) (period : Date_Period|Time_Period)
+    Date_Part (input : Column_Ref|Expression|Date_Time|Date|Time_Of_Day) (period : Date_Period|Time_Period)
 
     ## Returns the difference between two date/time columns.
-    Date_Diff (input : Column_Ref|Date_Time|Date|Time_Of_Day) (end : Column_Ref|Date_Time|Date|Time_Of_Day) (period:Date_Period|Time_Period = Date_Period.Day)
+    Date_Diff (input : Column_Ref|Expression|Date_Time|Date|Time_Of_Day) (end : Column_Ref|Expression|Date_Time|Date|Time_Of_Day) (period:Date_Period|Time_Period = Date_Period.Day)
 
     ## Negate a boolean column.
-    Not (input : Column_Ref|Boolean)
+    Not (input : Column_Ref|Expression|Boolean)
 
     ## Boolean AND on two boolean columns.
-    And (input : Column_Ref|Boolean) (rhs : Column_Ref|Boolean)
+    And (input : Column_Ref|Expression|Boolean) (rhs : Column_Ref|Expression|Boolean)
 
     ## Boolean OR on two boolean columns.
-    Or (input : Column_Ref|Boolean) (rhs : Column_Ref|Boolean)
+    Or (input : Column_Ref|Expression|Boolean) (rhs : Column_Ref|Expression|Boolean)
 
     ## If input meets a condition return true value, otherwise false value.
 
        The `true_value` and `false_value` can be either a constant or a column.
-    If (input : Column_Ref|Any) (condition:Filter_Condition) (true_value:Column_Ref|Any = True) (false_value:Column_Ref|Any = False)
+    If (input : Column_Ref|Expression|Any) (condition:Filter_Condition) (true_value:Column_Ref|Expression|Any = True) (false_value:Column_Ref|Expression|Any = False)
 
     ## Removes the specified characters, by default any whitespace, from the
        start, the end, or both ends of the input.
-    Trim (input : Column_Ref|Text) (where:Location = Location.Both) (what:Text|Column_Ref = "")
-
-    ## PRIVATE
-       Interprets the `Column_Operation` as operation on columns of a provided
-       table, resolving the column references.
-       It creates a new column instance which can be added to the table.
-    evaluate : Table_Ref -> Boolean -> Problem_Behavior -> Any
-    evaluate self table:Table_Ref use_input_name:Boolean on_problems:Problem_Behavior =
-        input_column = table.resolve_as_column self.input
-        derived = case self of
-            Column_Operation.Add _ rhs      -> input_column + (table.resolve rhs)
-            Column_Operation.Subtract _ rhs -> input_column - (table.resolve rhs)
-            Column_Operation.Multiply _ rhs -> input_column * (table.resolve rhs)
-            Column_Operation.Divide _ rhs   -> input_column / (table.resolve rhs)
-            Column_Operation.Mod _ rhs      -> input_column % (table.resolve rhs)
-            Column_Operation.Power _ rhs    -> input_column ^ (table.resolve rhs)
-
-            Column_Operation.Round _ precision use_bankers ->
-                input_column.round precision use_bankers
-            Column_Operation.Ceil _     -> input_column.ceil
-            Column_Operation.Floor _    -> input_column.floor
-            Column_Operation.Truncate _ -> input_column.truncate
-
-            Column_Operation.Min _ rhs -> input_column.min (table.resolve rhs)
-            Column_Operation.Max _ rhs -> input_column.max (table.resolve rhs)
-
-            Column_Operation.Date_Add _ length period ->
-                input_column.date_add (table.resolve length) period
-            Column_Operation.Date_Part _ period ->
-                input_column.date_part period
-            Column_Operation.Date_Diff _ end period ->
-                input_column.date_diff (table.resolve end) period
-
-            Column_Operation.Not _     -> input_column.not
-            Column_Operation.And _ rhs -> input_column && (table.resolve rhs)
-            Column_Operation.Or _ rhs  -> input_column || (table.resolve rhs)
-
-            Column_Operation.If _ condition true_value false_value ->
-                condition_column =  make_filter_column input_column (table.resolve_condition condition) on_problems
-                condition_column.iif (table.resolve true_value) (table.resolve false_value)
-
-            Column_Operation.Trim _ where what ->
-                input_column.trim where (table.resolve what)
-        if use_input_name then derived.rename input_column.name else derived
-
-    ## PRIVATE
-       Create a widget for operation
-    default_widget : Table_Ref -> Display -> Widget
-    default_widget table:Table_Ref display=Display.Always =
-        col_refs = Widget_Helpers.make_column_ref_by_name_selector table
-        filter_cond = Widget_Helpers.make_filter_condition_selector table
-        builder = Vector.new_builder
-        fqn = Meta.get_qualified_type_name Column_Operation
-        builder.append (Option "add" fqn+".Add" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "subtract" fqn+".Subtract" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "multiply" fqn+".Multiply" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "divide" fqn+".Divide" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "mod" fqn+".Mod" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "power" fqn+".Power" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "round" fqn+".Round" [["input", col_refs]])
-        builder.append (Option "ceil" fqn+".Ceil" [["input", col_refs]])
-        builder.append (Option "floor" fqn+".Floor" [["input", col_refs]])
-        builder.append (Option "truncate" fqn+".Truncate" [["input", col_refs]])
-        builder.append (Option "min" fqn+".Min" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "max" fqn+".Max" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "date add" fqn+".Date_Add" [["input", col_refs], ["length", col_refs]])
-        builder.append (Option "date part" fqn+".Date_Part" [["input", col_refs]])
-        builder.append (Option "date diff" fqn+".Date_Diff" [["input", col_refs], ["end", col_refs]])
-        builder.append (Option "not" fqn+".Not" [["input", col_refs]])
-        builder.append (Option "and" fqn+".And" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "or" fqn+".Or" [["input", col_refs], ["rhs", col_refs]])
-        builder.append (Option "if" fqn+".If" [["input", col_refs], ["condition", filter_cond], ["true_value", col_refs], ["false_value", col_refs]])
-        builder.append (Option "trim" fqn+".Trim" [["input", col_refs], ["what", col_refs]])
-        Single_Choice builder.to_vector display=display
+    Trim (input : Column_Ref|Expression|Text) (where:Location = Location.Both) (what:Text|Column_Ref = "")
+
+## PRIVATE
+Simple_Expression.from (that:Column_Operation) =
+    derived = case that of
+        Column_Operation.Add input rhs -> Simple_Expression.From input (Simple_Calculation.Add rhs)
+        Column_Operation.Subtract input rhs -> Simple_Expression.From input (Simple_Calculation.Subtract rhs)
+        Column_Operation.Multiply input rhs -> Simple_Expression.From input (Simple_Calculation.Multiply rhs)
+        Column_Operation.Divide input rhs -> Simple_Expression.From input (Simple_Calculation.Divide rhs)
+        Column_Operation.Mod input rhs -> Simple_Expression.From input (Simple_Calculation.Mod rhs)
+        Column_Operation.Power input rhs -> Simple_Expression.From input (Simple_Calculation.Power rhs)
+        Column_Operation.Round input precision use_bankers -> Simple_Expression.From input (Simple_Calculation.Round precision use_bankers)
+        Column_Operation.Ceil input -> Simple_Expression.From input Simple_Calculation.Ceil
+        Column_Operation.Floor input -> Simple_Expression.From input Simple_Calculation.Floor
+        Column_Operation.Truncate input -> Simple_Expression.From input Simple_Calculation.Truncate
+        Column_Operation.Min input rhs -> Simple_Expression.From input (Simple_Calculation.Min rhs)
+        Column_Operation.Max input rhs -> Simple_Expression.From input (Simple_Calculation.Max rhs)
+        Column_Operation.Date_Add input length period -> Simple_Expression.From input (Simple_Calculation.Date_Add length period)
+        Column_Operation.Date_Part input period -> Simple_Expression.From input (Simple_Calculation.Date_Part period)
+        Column_Operation.Date_Diff input end period -> Simple_Expression.From input (Simple_Calculation.Date_Diff end period)
+        Column_Operation.Not input -> Simple_Expression.From input Simple_Calculation.Not
+        Column_Operation.And input rhs -> Simple_Expression.From input (Simple_Calculation.And rhs)
+        Column_Operation.Or input rhs -> Simple_Expression.From input (Simple_Calculation.Or rhs)
+        Column_Operation.If input condition true_value false_value -> Simple_Expression.From input (Simple_Calculation.If condition true_value false_value)
+        Column_Operation.Trim input where what -> Simple_Expression.From input (Simple_Calculation.Trim where what)
+    Warning.attach (Deprecated.Warning "Standard.Table.Data.Column_Operation.Column_Operation" "" "Deprecated: `Column_Operation` has been replaced by `Simple_Expression`.") derived
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso
index 97cf8e36733e..96a3226d4662 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column.enso
@@ -33,7 +33,18 @@ from project.Internal.Column_Format import all
 from project.Internal.Java_Exports import make_date_builder_adapter, make_string_builder
 
 polyglot java import org.enso.base.Time_Utils
+polyglot java import org.enso.table.data.column.operation.CountNothing
+polyglot java import org.enso.table.data.column.operation.UnaryOperation
 polyglot java import org.enso.table.data.column.operation.cast.CastProblemAggregator
+polyglot java import org.enso.table.data.column.operation.unary.DatePartOperation
+polyglot java import org.enso.table.data.column.operation.unary.IsEmptyOperation
+polyglot java import org.enso.table.data.column.operation.unary.IsInfiniteOperation
+polyglot java import org.enso.table.data.column.operation.unary.IsNaNOperation
+polyglot java import org.enso.table.data.column.operation.unary.IsNothingOperation
+polyglot java import org.enso.table.data.column.operation.unary.NotOperation
+polyglot java import org.enso.table.data.column.operation.unary.TextLengthOperation
+polyglot java import org.enso.table.data.column.operation.unary.TruncatedTimePartOperation
+polyglot java import org.enso.table.data.column.operation.unary.UnaryRoundOperation
 polyglot java import org.enso.table.data.column.storage.Storage as Java_Storage
 polyglot java import org.enso.table.data.mask.OrderMask
 polyglot java import org.enso.table.data.table.Column as Java_Column
@@ -150,7 +161,7 @@ type Column
         num_rows = java_col.getSize
         display_rows = num_rows.min show_rows
         items = Vector.new display_rows num->
-            row = if storage.isNa num then "Nothing" else
+            row = if storage.isNothing num then "Nothing" else
                 get_item_string storage num
             [num.to_text, row]
         table = print_table ["", col_name] items 1 format_terminal
@@ -769,7 +780,7 @@ type Column
     not self =
         Value_Type.expect_boolean self <|
             new_name = naming_helper.concat ["not", naming_helper.to_expression_text self]
-            run_vectorized_unary_op self Java_Storage.Maps.NOT new_name
+            apply_unary_operation self NotOperation.INSTANCE new_name
 
     ## ALIAS if
        GROUP Standard.Base.Logical
@@ -921,7 +932,7 @@ type Column
                     True ->
                         self.rename new_name
                     False ->
-                        simple_unary_op self Java_Storage.Maps.TRUNCATE
+                        apply_unary_operation self UnaryRoundOperation.TRUNCATE_INSTANCE
             False -> case precise_value_type == Value_Type.Date_Time of
                 True ->
                     fun = _.date
@@ -946,7 +957,7 @@ type Column
                 new_name = naming_helper.function_name "ceil" [self]
                 self.rename new_name
             False ->
-                simple_unary_op self Java_Storage.Maps.CEIL
+                apply_unary_operation self UnaryRoundOperation.CEIL_INSTANCE
 
     ## GROUP Standard.Base.Rounding
        ICON math
@@ -966,7 +977,7 @@ type Column
                 new_name = naming_helper.function_name "floor" [self]
                 self.rename new_name
             False ->
-                simple_unary_op self Java_Storage.Maps.FLOOR
+                apply_unary_operation self UnaryRoundOperation.FLOOR_INSTANCE
 
     ## GROUP Standard.Base.Logical
        ICON operators
@@ -1045,7 +1056,7 @@ type Column
     is_nothing : Column
     is_nothing self =
         new_name = naming_helper.concat [naming_helper.to_expression_text self, "is Nothing"]
-        run_vectorized_unary_op self Java_Storage.Maps.IS_NOTHING new_name fallback_fn=(x-> x == Nothing) expected_result_type=Value_Type.Boolean skip_nulls=False
+        apply_unary_operation self IsNothingOperation.INSTANCE new_name
 
     ## GROUP Standard.Base.Math
        ICON math
@@ -1061,9 +1072,8 @@ type Column
         new_name = naming_helper.function_name "is_nan" [self]
         fallback x = case x of
             _ : Float   -> x.is_nan
-            Nothing     -> Nothing
             _           -> False
-        run_vectorized_unary_op self Java_Storage.Maps.IS_NAN new_name fallback_fn=fallback expected_result_type=Value_Type.Boolean
+        apply_unary_operation self IsNaNOperation.INSTANCE new_name if_unsupported=(apply_unary_map self new_name fallback Value_Type.Boolean)
 
     ## GROUP Standard.Base.Math
        ICON math
@@ -1075,9 +1085,8 @@ type Column
         new_name = naming_helper.function_name "is_infinite" [self]
         fallback x = case x of
             _ : Float   -> x.is_infinite
-            Nothing     -> Nothing
             _           -> False
-        run_vectorized_unary_op self Java_Storage.Maps.IS_INFINITE new_name fallback_fn=fallback expected_result_type=Value_Type.Boolean
+        apply_unary_operation self IsInfiniteOperation.INSTANCE new_name if_unsupported=(apply_unary_map self new_name fallback Value_Type.Boolean)
 
     ## PRIVATE
        Returns a column of booleans, with `True` items at the positions where
@@ -1094,7 +1103,7 @@ type Column
             _ : Text -> x == ""
             Nothing  -> True
             _        -> False
-        run_vectorized_unary_op self Java_Storage.Maps.IS_EMPTY new_name fallback_fn=fallback expected_result_type=Value_Type.Boolean skip_nulls=False
+        apply_unary_operation self IsEmptyOperation.INSTANCE new_name if_unsupported=(apply_unary_map self new_name fallback Value_Type.Boolean nothing_unchanged=False)
 
     ## GROUP Standard.Base.Logical
        ICON preparation
@@ -1287,7 +1296,7 @@ type Column
     text_length : Column
     text_length self =
         Value_Type.expect_text self <|
-            simple_unary_op self Java_Storage.Maps.TEXT_LENGTH
+            apply_unary_operation self TextLengthOperation.INSTANCE
 
     ## GROUP Standard.Base.Text
        ICON preparation
@@ -1473,7 +1482,7 @@ type Column
        Returns a column of `Integer` type.
     year : Column ! Invalid_Value_Type
     year self = Value_Type.expect_has_date self <|
-        simple_unary_op self Java_Storage.Maps.YEAR
+        apply_unary_operation self DatePartOperation.YEAR_INSTANCE
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1483,7 +1492,7 @@ type Column
        Returns a column of `Integer` type.
     month : Column ! Invalid_Value_Type
     month self = Value_Type.expect_has_date self <|
-        simple_unary_op self Java_Storage.Maps.MONTH
+        apply_unary_operation self DatePartOperation.MONTH_INSTANCE
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1494,7 +1503,7 @@ type Column
        Returns a column of `Integer` type.
     day : Column ! Invalid_Value_Type
     day self = Value_Type.expect_has_date self <|
-        simple_unary_op self Java_Storage.Maps.DAY
+        apply_unary_operation self DatePartOperation.DAY_INSTANCE
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1504,7 +1513,7 @@ type Column
        Returns a column of `Integer` type.
     hour : Column ! Invalid_Value_Type
     hour self = Value_Type.expect_has_time self <|
-        simple_unary_op self Java_Storage.Maps.HOUR
+        apply_unary_operation self DatePartOperation.HOUR_INSTANCE
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1514,7 +1523,7 @@ type Column
        Returns a column of `Integer` type.
     minute : Column ! Invalid_Value_Type
     minute self = Value_Type.expect_has_time self <|
-        simple_unary_op self Java_Storage.Maps.MINUTE
+        apply_unary_operation self DatePartOperation.MINUTE_INSTANCE
 
     ## GROUP Standard.Base.Selections
        ICON select_row
@@ -1524,7 +1533,7 @@ type Column
        Returns a column of `Integer` type.
     second : Column ! Invalid_Value_Type
     second self = Value_Type.expect_has_time self <|
-        simple_unary_op self Java_Storage.Maps.SECOND
+        apply_unary_operation self DatePartOperation.SECOND_INSTANCE
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1534,7 +1543,21 @@ type Column
     @period Date_Time_Helpers.make_period_selector_for_column
     date_part : Date_Period | Time_Period -> Column ! Invalid_Value_Type | Illegal_Argument
     date_part self period =
-        Date_Time_Helpers.make_date_part_function self period simple_unary_op naming_helper
+        date_part_operation col name =
+            operation = case name of
+                DatePartOperation.YEAR -> DatePartOperation.YEAR_INSTANCE
+                DatePartOperation.QUARTER -> DatePartOperation.QUARTER_INSTANCE
+                DatePartOperation.MONTH -> DatePartOperation.MONTH_INSTANCE
+                DatePartOperation.WEEK -> DatePartOperation.WEEK_INSTANCE
+                DatePartOperation.DAY -> DatePartOperation.DAY_INSTANCE
+                DatePartOperation.HOUR -> DatePartOperation.HOUR_INSTANCE
+                DatePartOperation.MINUTE -> DatePartOperation.MINUTE_INSTANCE
+                DatePartOperation.SECOND -> DatePartOperation.SECOND_INSTANCE
+                DatePartOperation.MILLISECOND -> DatePartOperation.MILLISECOND_INSTANCE
+                TruncatedTimePartOperation.MICROSECOND -> TruncatedTimePartOperation.MICROSECOND_INSTANCE
+                TruncatedTimePartOperation.NANOSECOND -> TruncatedTimePartOperation.NANOSECOND_INSTANCE
+            apply_unary_operation col operation
+        Date_Time_Helpers.make_date_part_function self period date_part_operation naming_helper
 
     ## GROUP Standard.Base.DateTime
        ICON date_and_time
@@ -1644,7 +1667,7 @@ type Column
                 run_vectorized_binary_op self op_name as_vector expected_result_type=Value_Type.Boolean skip_nulls=False new_name=result_name
             False ->
                 set = Set.from_vector as_vector error_on_duplicates=False
-                run_unary_op self set.contains_relational new_name=result_name skip_nulls=False expected_result_type=Value_Type.Boolean
+                apply_unary_map self result_name set.contains_relational Value_Type.Boolean nothing_unchanged=False
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -2063,7 +2086,7 @@ type Column
 
              example_count_nothing = Examples.text_column_2.count_nothing
     count_nothing : Integer
-    count_nothing self = self.java_column.getStorage.countMissing
+    count_nothing self = CountNothing.apply self.java_column
 
     ## GROUP Standard.Base.Metadata
        Returns the number of non-null items in this column.
@@ -2118,7 +2141,7 @@ type Column
         valid_index = (index >= 0) && (index < self.length)
         if valid_index.not then default else
             storage = self.java_column.getStorage
-            if storage.isNa index then Nothing else
+            if storage.isNothing index then Nothing else
                 storage.getItem index
 
     ## ICON data_input
@@ -2500,27 +2523,6 @@ run_binary_op column function operand new_name skip_nulls=True expected_result_t
                     s.binaryMap function operand skip_nulls storage_type problem_builder
         Column.Value (Java_Column.new new_name new_storage)
 
-## PRIVATE
-   Runs a unary operation over the provided column.
-
-   Arguments:
-   - column: The column to execute the operation over.
-   - function: The function to apply to each element of `column`.
-   - new_name: The name of the column created as the result of this operation.
-   - skip_nulls: Specifies if nulls should be skipped. If set to `True`, a null
-     value results in null without passing it to the function. If set to
-     `False`, the null values are passed as any other value and can have custom
-     handling logic.
-   - expected_result_type: The expected result type of the operation. If set to
-     `Nothing`, the result type is inferred from the values.
-run_unary_op column function new_name skip_nulls=True expected_result_type=Nothing =
-    s = column.java_column.getStorage
-    storage_type = resolve_storage_type expected_result_type
-    Java_Problems.with_map_operation_problem_aggregator column.name Problem_Behavior.Report_Warning problem_builder->
-        new_storage = Polyglot_Helpers.handle_polyglot_dataflow_errors <|
-            s.unaryMap function skip_nulls storage_type problem_builder
-        Column.Value (Java_Column.new new_name new_storage)
-
 ## PRIVATE
 
    Executes a vectorized binary operation over the provided column.
@@ -2560,30 +2562,6 @@ run_vectorized_binary_op_with_fallback_problem_handling column name operand fall
                     s1.vectorizedOrFallbackBinaryMap name problem_builder applied_fn operand skip_nulls storage_type
                 Column.Value (Java_Column.new new_name rs)
 
-## PRIVATE
-
-   Executes a vectorized unary operation over the provided column.
-
-   Arguments:
-   - column: The column to execute the operation over.
-   - name: The name of the vectorized operation.
-   - new_name: The name of the column created as the result of this operation.
-   - fallback_fn: The function to call if a vectorized operation is not
-     available. It should never raise dataflow errors.
-   - expected_result_type: The expected result type of the operation.
-   - skip_nulls: Specifies if nulls should be skipped. If set to `True`, a null
-     value results in null without passing it to the function. If set to
-     `False`, the null values are passed as any other value and can have custom
-     handling logic.
-run_vectorized_unary_op : Column -> Text -> Text -> (Any -> Any) -> Value_Type -> Any -> Column
-run_vectorized_unary_op column name new_name fallback_fn=Nothing expected_result_type=Nothing skip_nulls=True =
-    Java_Problems.with_map_operation_problem_aggregator column.name Problem_Behavior.Report_Warning problem_builder->
-        s = column.java_column.getStorage
-        storage_type = resolve_storage_type expected_result_type
-        rs = Polyglot_Helpers.handle_polyglot_dataflow_errors <|
-            s.vectorizedOrFallbackUnaryMap name problem_builder fallback_fn skip_nulls storage_type
-        Column.Value (Java_Column.new new_name rs)
-
 ## PRIVATE
 
    Gets a textual representation of the item at position `ix` in `column`.
@@ -2652,11 +2630,6 @@ run_vectorized_binary_case_text_op left op other case_sensitivity fallback new_n
                See: https://www.pivotaltracker.com/n/projects/2539304/stories/184093260
             run_binary_op left fallback other new_name=new_name skip_nulls=True expected_result_type=result_type
 
-## PRIVATE
-simple_unary_op column op_name =
-    new_name = naming_helper.function_name op_name [column]
-    run_vectorized_unary_op column op_name new_name
-
 ## PRIVATE
    Converts the value type to a storage type, passing `Nothing` through.
 
@@ -2719,3 +2692,34 @@ Column.from (that:Range) (name:Text="Range") = Column.from_vector name that.to_v
 ## PRIVATE
    Conversion method to a Column from a Vector.
 Column.from (that:Date_Range) (name:Text=that.default_column_name) = Column.from_vector name that.to_vector
+
+## PRIVATE
+   Applies a UnaryOperation to a column.
+
+   Arguments:
+   - column: The column to apply the operation to.
+   - operation: The UnaryOperation to apply.
+   - new_name: The name of the column created as the result of this operation.
+   - if_unsupported: The result if the operation is not supported for the column.
+apply_unary_operation column:Column operation:UnaryOperation new_name:Text|Nothing=Nothing ~if_unsupported=(Panic.throw (Illegal_State.Error "Unsupported unary operation for column called. This is a bug in the Table library.")) =
+    used_name = new_name.if_nothing (naming_helper.function_name operation.getName [column])
+    Java_Problems.with_map_operation_problem_aggregator column.name Problem_Behavior.Report_Warning java_problem_aggregator->
+        java_column = UnaryOperation.apply column.java_column operation used_name java_problem_aggregator
+        if java_column.is_nothing then if_unsupported else Column.Value java_column
+
+## PRIVATE
+   Applies a function to every row in the column.
+
+   Arguments:
+   - column: The column to apply the operation to.
+   - new_name: The name of the column created as the result of this operation.
+   - function: A function applied to every element. It should not raise errors.
+   - expected_result_type: The expected result type of the operation.
+   - nothing_unchanged: If set to `True`, `Nothing` values will be passed through
+     the operation without being changed. If set to `False`, `Nothing` values will
+     be passed to the function.
+apply_unary_map column:Column new_name:Text function expected_result_type:Value_Type|Nothing=Nothing nothing_unchanged:Boolean=True =
+    storage_type = resolve_storage_type expected_result_type
+    Java_Problems.with_map_operation_problem_aggregator column.name Problem_Behavior.Report_Warning java_problem_aggregator->
+        map_column = UnaryOperation.mapFunction column.java_column function nothing_unchanged storage_type new_name java_problem_aggregator
+        Column.Value map_column
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column_Ref.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column_Ref.enso
index 094dc46b49f4..1e8a7d98f451 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column_Ref.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Column_Ref.enso
@@ -6,7 +6,4 @@ type Column_Ref
     Name name:Text
 
     ## Reference to a column by index in a table.
-    Index index:Integer
-
-    ## Representation of an expression derived in a table.
-    Expression expression:Text
+    Index index:Integer=0
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Expression.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Expression.enso
index 9159825871c5..3e76b6368a72 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Expression.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Expression.enso
@@ -4,9 +4,19 @@ polyglot java import java.lang.IllegalArgumentException
 polyglot java import java.lang.UnsupportedOperationException
 polyglot java import org.enso.table.expressions.ExpressionVisitorImpl
 
+## Create an expression from a Text value.
+
+   Arguments:
+   - expression: the expression to create
+expr : Text -> Expression
+expr expression:Text -> Expression = Expression.Value expression
+
 ## PRIVATE
    Functions for parsing and handling Enso expressions.
 type Expression
+    ## Creates an expression from a Text value.
+    Value expression:Text
+
     ## PRIVATE
        ADVANCED
        Evaluates an expression and returns the result
@@ -23,14 +33,14 @@ type Expression
          evaluated against.
        - var_args_functions: a Vector of function names which take a single
          Vector argument but which should be exposed with variable parameters.
-    evaluate : Text -> (Text -> Any) -> (Any -> Any) -> Text -> Text -> Vector Text -> Any
-    evaluate expression get_column make_constant module_name type_name var_args_functions =
+    evaluate : Expression -> (Text -> Any) -> (Any -> Any) -> Text -> Text -> Vector Text -> Any
+    evaluate expression:Expression get_column make_constant module_name type_name var_args_functions =
         handle_parse_error = Panic.catch ExpressionVisitorImpl.SyntaxErrorException handler=(cause-> Error.throw (Expression_Error.Syntax_Error cause.payload.getMessage cause.payload.getLine cause.payload.getColumn))
         handle_unsupported = handle_java_error UnsupportedOperationException Expression_Error.Unsupported_Operation
         handle_arguments = handle_java_error IllegalArgumentException Expression_Error.Argument_Mismatch
 
         handle_parse_error <| handle_unsupported <| handle_arguments <|
-            ExpressionVisitorImpl.evaluate expression get_column make_constant module_name type_name var_args_functions
+            ExpressionVisitorImpl.evaluate expression.expression get_column make_constant module_name type_name var_args_functions
 
 type Expression_Error
     ## PRIVATE
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Join_Condition.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Join_Condition.enso
index d0f86825d281..80da948689fe 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Join_Condition.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Join_Condition.enso
@@ -9,7 +9,7 @@ type Join_Condition
        Arguments:
         - left: A name or index of a column in the left table.
         - right: A name or index of a column in the right table.
-    Equals (left : Text | Integer) (right : Text | Integer = left)
+    Equals (left : Text | Integer) (right : Text | Integer = "")
 
     ## Correlates rows from the two tables if the `left` element is equal to the
        `right` element, ignoring case. This is only supported for text columns.
@@ -24,7 +24,7 @@ type Join_Condition
         - right: A name or index of a column in the right table.
         - locale: The locale to use for case insensitive comparisons.
     @locale Locale.default_widget
-    Equals_Ignore_Case (left : Text | Integer) (right : Text | Integer = left) (locale : Locale = Locale.default)
+    Equals_Ignore_Case (left : Text | Integer) (right : Text | Integer = "") (locale : Locale = Locale.default)
 
     ## Correlates rows from the two tables if the `left` element fits between
        the `right_lower` and `right_upper` elements. The comparison is inclusive
@@ -39,4 +39,4 @@ type Join_Condition
           the lower bound for the check.
         - right_upper: A name or index of a column in the right table, used as
           the upper bound for the check.
-    Between (left : Text | Integer) (right_lower : Text | Integer) (right_upper : Text | Integer)
+    Between (left : Text | Integer) (right_lower : Text | Integer = "") (right_upper : Text | Integer = "")
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Simple_Expression.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Simple_Expression.enso
new file mode 100644
index 000000000000..21f1efe71ba5
--- /dev/null
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Simple_Expression.enso
@@ -0,0 +1,162 @@
+from Standard.Base import all
+import Standard.Base.Errors.Deprecated.Deprecated
+import Standard.Base.Metadata.Display
+import Standard.Base.Metadata.Widget
+from Standard.Base.Metadata.Choice import Option
+from Standard.Base.Metadata.Widget import Single_Choice
+
+import project.Data.Column_Ref.Column_Ref
+import project.Data.Expression.Expression
+import project.Extensions.Table_Ref.Table_Ref
+import project.Internal.Widget_Helpers
+from project.Internal.Filter_Condition_Helpers import make_filter_column
+
+## Defines a simple expression based off an input column and an operation to perform.
+type Simple_Expression
+    From (input : Column_Ref|Expression|Any = Column_Ref.Index) (operation : Simple_Calculation)
+
+    ## PRIVATE
+       Interprets the `Simple_Expression` as operation on columns of a provided
+       table, resolving the column references.
+       It creates a new column instance which can be added to the table.
+    evaluate : Table_Ref -> Boolean -> Problem_Behavior -> Any
+    evaluate self table:Table_Ref use_input_name:Boolean on_problems:Problem_Behavior =
+        input_column = table.resolve_as_column self.input
+        derived = case self.operation of
+            Simple_Calculation.Add rhs -> input_column + (table.resolve rhs)
+            Simple_Calculation.Subtract rhs -> input_column - (table.resolve rhs)
+            Simple_Calculation.Multiply rhs -> input_column * (table.resolve rhs)
+            Simple_Calculation.Divide rhs -> input_column / (table.resolve rhs)
+            Simple_Calculation.Mod rhs -> input_column % (table.resolve rhs)
+            Simple_Calculation.Power rhs -> input_column ^ (table.resolve rhs)
+            Simple_Calculation.Round precision use_bankers -> input_column.round precision use_bankers
+            Simple_Calculation.Ceil -> input_column.ceil
+            Simple_Calculation.Floor -> input_column.floor
+            Simple_Calculation.Truncate -> input_column.truncate
+            Simple_Calculation.Min rhs -> input_column.min (table.resolve rhs)
+            Simple_Calculation.Max rhs -> input_column.max (table.resolve rhs)
+            Simple_Calculation.Date_Add length period -> input_column.date_add (table.resolve length) period
+            Simple_Calculation.Date_Part period -> input_column.date_part period
+            Simple_Calculation.Date_Diff end period -> input_column.date_diff (table.resolve end) period
+            Simple_Calculation.Not -> input_column.not
+            Simple_Calculation.And rhs -> input_column && (table.resolve rhs)
+            Simple_Calculation.Or rhs -> input_column || (table.resolve rhs)
+            Simple_Calculation.Trim where what -> input_column.trim where (table.resolve what)
+            Simple_Calculation.If condition true_value false_value ->
+                condition_column =  make_filter_column input_column (table.resolve_condition condition) on_problems
+                condition_column.iif (table.resolve true_value) (table.resolve false_value)
+        if use_input_name then derived.rename input_column.name else derived
+
+    ## PRIVATE
+       Create a widget for operation
+    default_widget : Table_Ref -> Display -> Widget
+    default_widget table:Table_Ref display=Display.Always =
+        ## Constants
+        text = Option "<Text Value>" "''"
+        number = Option "<Number Value>" "0"
+        boolean = Option "<True/False>" "True"
+        expression = Option "<Expression>" "(expr '["+table.column_names.first+"]')"
+
+        col_names = Widget_Helpers.make_column_ref_by_name_selector table
+        with_all_types = Widget_Helpers.make_column_ref_by_name_selector table add_text=True add_number=True add_boolean=True
+        with_number_text = Widget_Helpers.make_column_ref_by_name_selector table add_text=True add_number=True
+        with_number = Widget_Helpers.make_column_ref_by_name_selector table add_number=True
+        with_boolean = Widget_Helpers.make_column_ref_by_name_selector table add_boolean=True
+        with_text = Widget_Helpers.make_column_ref_by_name_selector table add_text=True
+
+        filter_cond = Widget_Helpers.make_filter_condition_selector table
+
+        builder = Vector.new_builder
+        fqn = Meta.get_qualified_type_name Simple_Calculation
+        builder.append (Option "add" fqn+".Add" [["rhs", with_number_text]])
+        builder.append (Option "subtract" fqn+".Subtract" [["rhs", with_number]])
+        builder.append (Option "multiply" fqn+".Multiply" [["rhs", with_number]])
+        builder.append (Option "divide" fqn+".Divide" [["rhs", with_number]])
+        builder.append (Option "mod" fqn+".Mod" [["rhs", with_number]])
+        builder.append (Option "power" fqn+".Power" [["rhs", with_number]])
+        builder.append (Option "round" fqn+".Round")
+        builder.append (Option "ceil" fqn+".Ceil")
+        builder.append (Option "floor" fqn+".Floor")
+        builder.append (Option "truncate" fqn+".Truncate")
+        builder.append (Option "min" fqn+".Min" [["rhs", with_number_text]])
+        builder.append (Option "max" fqn+".Max" [["rhs", with_number_text]])
+        builder.append (Option "date add" fqn+".Date_Add" [["length", col_names]])
+        builder.append (Option "date part" fqn+".Date_Part")
+        builder.append (Option "date diff" fqn+".Date_Diff" [["end", col_names]])
+        builder.append (Option "not" fqn+".Not")
+        builder.append (Option "and" fqn+".And" [["rhs", with_boolean]])
+        builder.append (Option "or" fqn+".Or" [["rhs", with_boolean]])
+        builder.append (Option "if" fqn+".If" [["condition", filter_cond], ["true_value", with_all_types], ["false_value", with_all_types]])
+        builder.append (Option "trim" fqn+".Trim" [["what", with_text]])
+
+        fqn_column = Meta.get_qualified_type_name Simple_Expression
+        derived = Option "<Simple Expression>" fqn_column+".From" [["input", col_names], ["operation", Single_Choice builder.to_vector]]
+
+        Single_Choice [text, number, boolean, expression, derived] display=display
+
+## Defines the operation on a derived column.
+type Simple_Calculation
+    ## Add two values/columns.
+    Add (rhs : Column_Ref|Expression|Number|Text)
+
+    ## Subtract two values/columns.
+    Subtract (rhs : Column_Ref|Expression|Number = 0)
+
+    ## Multiply two values/columns.
+    Multiply (rhs : Column_Ref|Expression|Number = 1)
+
+    ## Divide a fixed value or column by another value or column.
+    Divide (rhs : Column_Ref|Expression|Number = 1)
+
+    ## Compute the remainder of a fixed value or column divided by another
+       value or column.
+    Mod (rhs : Column_Ref|Expression|Number = 1)
+
+    ## Raise a fixed value or column to the power of another value or column.
+    Power (rhs : Column_Ref|Expression|Number = 1)
+
+    ## Rounds values in the column to the specified precision.
+    Round (precision:Integer = 0) (use_bankers:Boolean = False)
+
+    ## Rounds values in the column up to the nearest integer.
+    Ceil
+
+    ## Rounds values in the column down to the nearest integer.
+    Floor
+
+    ## Truncates the fractional part of values in the column.
+       If a Date_Time, returns the Date.
+    Truncate
+
+    ## Returns the minimum value of two columns.
+    Min (rhs : Column_Ref|Expression|Any)
+
+    ## Returns the maximum value of two columns.
+    Max (rhs : Column_Ref|Expression|Any)
+
+    ## Adds a period to a date/time column.
+    Date_Add (length : Column_Ref|Expression|Integer) (period : Date_Period|Time_Period = Date_Period.Day)
+
+    ## Returns part of a date/time column.
+    Date_Part (period : Date_Period|Time_Period)
+
+    ## Returns the difference between two date/time columns.
+    Date_Diff (end : Column_Ref|Expression|Date_Time|Date|Time_Of_Day) (period:Date_Period|Time_Period = Date_Period.Day)
+
+    ## Negate a boolean column.
+    Not
+
+    ## Boolean AND on two boolean columns.
+    And (rhs : Column_Ref|Expression|Boolean = True)
+
+    ## Boolean OR on two boolean columns.
+    Or (rhs : Column_Ref|Expression|Boolean =  False)
+
+    ## If input meets a condition return true value, otherwise false value.
+
+       The `true_value` and `false_value` can be either a constant or a column.
+    If (condition:Filter_Condition=(Filter_Condition.Equal True)) (true_value:Column_Ref|Expression|Any = True) (false_value:Column_Ref|Expression|Any = False)
+
+    ## Removes the specified characters, by default any whitespace, from the
+       start, the end, or both ends of the input.
+    Trim (where:Location = Location.Both) (what:Column_Ref|Expression|Text = "")
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso
index 9bad5dacafe2..a67f3a096eb9 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Data/Table.enso
@@ -21,7 +21,6 @@ from Standard.Base.Widget_Helpers import make_delimiter_selector, make_format_ch
 
 import project.Data.Aggregate_Column.Aggregate_Column
 import project.Data.Blank_Selector.Blank_Selector
-import project.Data.Calculations.Column_Operation.Column_Operation
 import project.Data.Column as Column_Module
 import project.Data.Column.Column
 import project.Data.Column_Ref.Column_Ref
@@ -37,6 +36,7 @@ import project.Data.Position.Position
 import project.Data.Report_Unmatched.Report_Unmatched
 import project.Data.Row.Row
 import project.Data.Set_Mode.Set_Mode
+import project.Data.Simple_Expression.Simple_Expression
 import project.Data.Sort_Column.Sort_Column
 import project.Delimited.Delimited_Format.Delimited_Format
 import project.Extensions.Prefix_Name.Prefix_Name
@@ -185,7 +185,7 @@ type Table
         display_rows = num_rows.min show_rows
         rows = Vector.new display_rows row_num->
             cols = col_vals.map col->
-                if col.isNa row_num then "Nothing" else get_item_string col row_num
+                if col.isNothing row_num then "Nothing" else get_item_string col row_num
             [row_num.to_text] + cols
         table = print_table col_names rows 1 format_terminal
         if num_rows - display_rows <= 0 then table else
@@ -735,7 +735,7 @@ type Table
                     new_columns = validated.valid_columns.map c->(Aggregate_Column_Helper.java_aggregator c.first c.second)
                     java_table = index.makeTable new_columns
                     if validated.old_style.not then Table.Value java_table else
-                        Warning.attach (Deprecated.Warning "Standard.Database.Data.Aggregate_Column.Aggregate_Column" "Group_By" "Deprecated: `Group_By` constructor has been deprecated, use the `group_by` argument instead.") (Table.Value java_table)
+                        Warning.attach (Deprecated.Warning "Standard.Table.Data.Aggregate_Column.Aggregate_Column" "Group_By" "Deprecated: `Group_By` constructor has been deprecated, use the `group_by` argument instead.") (Table.Value java_table)
 
     ## ALIAS sort
        GROUP Standard.Base.Selections
@@ -823,7 +823,8 @@ type Table
                 self.java_table.orderBy java_columns directions comparator
             Table.Value java_table
 
-    ## GROUP Standard.Base.Selections
+    ## ALIAS unique, deduplicate
+       GROUP Standard.Base.Selections
        ICON preparation
        Returns the distinct set of rows within the specified columns from the
        input table.
@@ -1149,7 +1150,7 @@ type Table
         selected = self.columns_helper.select_columns columns Case_Sensitivity.Default reorder=False error_on_missing_columns=error_on_missing_columns on_problems=on_problems error_on_empty=False
         selected.fold self table-> column_to_cast->
             new_column = column_to_cast.cast value_type on_problems
-            table.set new_column new_name=column_to_cast.name set_mode=Set_Mode.Update
+            table.set new_column as=column_to_cast.name set_mode=Set_Mode.Update
 
     ## GROUP Standard.Base.Conversions
        ICON convert
@@ -1195,7 +1196,7 @@ type Table
         selected = self.columns_helper.select_columns columns Case_Sensitivity.Default reorder=False error_on_missing_columns=error_on_missing_columns on_problems=on_problems error_on_empty=False
         selected.fold self table-> column_to_cast->
             new_column = column_to_cast.auto_value_type shrink_types
-            table.set new_column new_name=column_to_cast.name set_mode=Set_Mode.Update
+            table.set new_column as=column_to_cast.name set_mode=Set_Mode.Update
 
     ## GROUP Standard.Base.Conversions
        ICON split_text
@@ -1413,9 +1414,9 @@ type Table
          Select people celebrating a jubilee.
 
              people.filter "age" (age -> (age%10 == 0))
-    @column Widget_Helpers.make_column_name_selector
+    @column (Widget_Helpers.make_column_name_selector add_expression=True)
     @filter Widget_Helpers.make_filter_condition_selector
-    filter : (Column | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
+    filter : (Column | Expression | Text | Integer) -> (Filter_Condition | (Any -> Boolean)) -> Problem_Behavior -> Table ! No_Such_Column | Index_Out_Of_Bounds | Invalid_Value_Type
     filter self column (filter : Filter_Condition | (Any -> Boolean) = Filter_Condition.Equal True) on_problems=Report_Warning = case column of
         _ : Column ->
             mask filter_column = Table.Value (self.java_table.filter filter_column.java_column)
@@ -1425,6 +1426,7 @@ type Table
                     mask (make_filter_column column resolved on_problems)
                 _ : Function -> Filter_Condition_Module.handle_constructor_missing_arguments filter <|
                     mask (column.map filter)
+        _ : Expression -> self.filter (self.evaluate_expression column on_problems) filter on_problems
         _ ->
             table_at = self.at column
             self.filter table_at filter on_problems
@@ -1464,8 +1466,9 @@ type Table
              people.filter_by_expression "[age] % 10 == 0"
     filter_by_expression : Text -> Problem_Behavior -> Table ! No_Such_Column | Invalid_Value_Type | Expression_Error
     filter_by_expression self expression on_problems=Report_Warning =
-        column = self.evaluate_expression expression on_problems
-        self.filter column Filter_Condition.Is_True
+        column = self.evaluate_expression (Expression.Value expression) on_problems
+        result = self.filter column Filter_Condition.Is_True
+        Warning.attach (Deprecated.Warning "Standard.Table.Data.Table.Table" "filter_by_expression" "Deprecated: use `filter` with an `Expression` instead.") result
 
     ## ALIAS first, last, sample, slice
        GROUP Standard.Base.Selections
@@ -1574,14 +1577,14 @@ type Table
     add_row_number self (name:Text="Row") (from:Integer=1) (step:Integer=1) (group_by:(Vector | Text | Integer | Regex)=[]) (order_by:(Vector | Text)=[]) (on_problems:Problem_Behavior=Problem_Behavior.Report_Warning) =
         Add_Row_Number.add_row_number self name from step group_by order_by on_problems
 
-    ## ALIAS add column, new column, update column
+    ## ALIAS add column, new column, update column, formula
        GROUP Standard.Base.Values
        ICON dataframe_map_column
        Sets the column value at the given name.
 
        Arguments:
-       - column: The new column or expression to create column.
-       - new_name: Optional new name for the column.
+       - value: The value, expression or column to create column.
+       - as: Optional new name for the column.
        - set_mode: Specifies the expected behaviour in regards to existing
          column with the same name.
        - on_problems: Specifies how to handle problems with expression
@@ -1615,28 +1618,29 @@ type Table
              example_set =
                  table = Examples.inventory_table
                  double_inventory = table.at "total_stock" * 2
-                 table.set double_inventory new_name="total_stock"
-                 table.set "2 * [total_stock]" new_name="total_stock_expr"
-    @column Column_Operation.default_widget
-    set : Text | Column | Constant_Column | Column_Operation -> Text -> Set_Mode -> Problem_Behavior -> Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
-    set self column:(Text | Column | Constant_Column | Column_Operation) (new_name : Text = "") (set_mode : Set_Mode = Set_Mode.Add_Or_Update) (on_problems : Problem_Behavior = Report_Warning) =
+                 table.set double_inventory as="total_stock"
+                 table.set (expr "2 * [total_stock]") as="total_stock_expr"
+    @value Simple_Expression.default_widget
+    set : Text | Expression | Column | Constant_Column | Simple_Expression -> Text -> Set_Mode -> Problem_Behavior -> Table ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
+    set self value:(Text | Expression | Column | Constant_Column | Simple_Expression) (as : Text = "") (set_mode : Set_Mode = Set_Mode.Add_Or_Update) (on_problems : Problem_Behavior = Report_Warning) =
         problem_builder = Problem_Builder.new
         unique = self.column_naming_helper.create_unique_name_strategy
         unique.mark_used self.column_names
 
-        resolved = case column of
-            _ : Text -> self.evaluate_expression column on_problems
-            _ : Column -> column
-            _ : Constant_Column -> self.make_constant_column column.value
-            _ : Column_Operation -> column.evaluate self (set_mode==Set_Mode.Update && new_name=="") on_problems
+        resolved = case value of
+            _ : Text -> self.make_constant_column value
+            _ : Expression -> self.evaluate_expression value on_problems
+            _ : Column -> value
+            _ : Constant_Column -> self.make_constant_column value.value
+            _ : Simple_Expression -> value.evaluate self (set_mode==Set_Mode.Update && as=="") on_problems
             _ -> Error.throw (Illegal_Argument.Error "Unsupported type for `Table.set`.")
 
-        ## If `new_name` was specified, use that. Otherwise, if `column` is a
+        ## If `as` was specified, use that. Otherwise, if `value` is a
            `Column`, use its name. In these two cases, do not make it unique.
            Otherwise, make it unique. If set_mode is Update, however, do not
            make it unique.
-        new_column_name = if new_name != "" then new_name else
-            if column.is_a Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
+        new_column_name = if as != "" then as else
+            if value.is_a Column || set_mode==Set_Mode.Update || set_mode==Set_Mode.Add_Or_Update then resolved.name else unique.make_unique resolved.name
         renamed = resolved.rename new_column_name
         renamed.if_not_error <| self.column_naming_helper.check_ambiguity self.column_names renamed.name <|
             check_add_mode = case set_mode of
@@ -1675,12 +1679,12 @@ type Table
              an `Arithmetic_Error`.
            - If more than 10 rows encounter computation issues,
              an `Additional_Warnings`.
-    evaluate_expression : Text -> Problem_Behavior -> Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
-    evaluate_expression self expression on_problems=Report_Warning =
+    evaluate_expression : Text | Expression -> Problem_Behavior -> Column ! No_Such_Column | Invalid_Value_Type | Expression_Error
+    evaluate_expression self (expression:Text|Expression) on_problems=Report_Warning = if expression.is_a Text then self.evaluate_expression (Expression.Value expression) on_problems else
         get_column name = self.at name
         new_column = Expression.evaluate expression get_column self.make_constant_column "Standard.Table.Data.Column" "Column" Column.var_args_functions
         problems = Warning.get_all new_column . map .value
-        result = new_column.rename (self.column_naming_helper.sanitize_name expression)
+        result = new_column.rename (self.column_naming_helper.sanitize_name expression.expression)
         on_problems.attach_problems_before problems <|
             Warning.set result []
 
@@ -2459,10 +2463,10 @@ type Table
            ----|---------|---------
             A  | Example | France
     @group_by Widget_Helpers.make_column_name_vector_selector
-    @name_column Widget_Helpers.make_column_name_selector
+    @names Widget_Helpers.make_column_name_selector
     @values Widget_Helpers.make_aggregate_column_selector
     cross_tab : Vector (Integer | Text | Regex | Aggregate_Column) | Text | Integer | Regex -> (Text | Integer) -> Aggregate_Column | Vector Aggregate_Column -> Problem_Behavior -> Table ! Missing_Input_Columns | Invalid_Aggregate_Column | Floating_Point_Equality | Invalid_Aggregation | Unquoted_Delimiter | Additional_Warnings | Invalid_Column_Names
-    cross_tab self group_by name_column values=Aggregate_Column.Count (on_problems=Report_Warning) = Out_Of_Memory.handle_java_exception "cross_tab" <|
+    cross_tab self group_by names values=Aggregate_Column.Count (on_problems=Report_Warning) = Out_Of_Memory.handle_java_exception "cross_tab" <|
         columns_helper = self.columns_helper
         problem_builder = Problem_Builder.new error_on_missing_columns=True
 
@@ -2474,7 +2478,7 @@ type Table
             _ -> input
 
         ## validate the name and group_by columns
-        name_column_selector = case name_column of
+        name_column_selector = case names of
             ix : Integer -> [ix]
             name : Text -> [name]
             _ -> Error.throw (Illegal_Argument.Error "name_column must be a column index or name.")
@@ -2502,7 +2506,7 @@ type Table
                     c -> Aggregate_Column_Helper.default_aggregate_column_name c include_column_name
 
             data_columns = validated_values.map c->
-                col_name = if c.new_name != "" then c.new_name else
+                col_name = if c.as != "" then c.as else
                     Aggregate_Column_Helper.default_aggregate_column_name c
                 Aggregate_Column_Helper.java_aggregator col_name c
 
@@ -2515,7 +2519,7 @@ type Table
                         Table.Value new_java_table
                     False ->
                         aggregate_names = validated_values.map c->
-                            if c.new_name != "" then c.new_name else (name_mapper c)
+                            if c.as != "" then c.as else (name_mapper c)
 
                         too_many_columns caught_panic =
                             inner_panic = caught_panic.payload
@@ -2721,7 +2725,7 @@ type Table
              fill_nothing = table.fill_nothing ["col0", "col1"] 20.5
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True add_number=True add_boolean=True)
-    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Previous_Value | Any -> Table
+    fill_nothing : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Expression | Previous_Value | Any -> Table
     fill_nothing self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_nothing resolved_default
@@ -2749,7 +2753,7 @@ type Table
              fill_empty = table.fill_empty ["col0", "col1"] "hello"
     @columns Widget_Helpers.make_column_name_vector_selector
     @default (self -> Widget_Helpers.make_fill_default_value_selector column_source=self add_text=True)
-    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Previous_Value | Any -> Table
+    fill_empty : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Column | Column_Ref | Expression | Previous_Value | Any -> Table
     fill_empty self (columns : Vector | Text | Integer | Regex) default =
         resolved_default = (self:Table_Ref).resolve default
         transformer col = col.fill_empty resolved_default
@@ -2790,8 +2794,8 @@ type Table
     @columns Widget_Helpers.make_column_name_vector_selector
     @term (Widget_Helpers.make_column_ref_by_name_selector add_regex=True add_text=True)
     @new_text (Widget_Helpers.make_column_ref_by_name_selector add_text=True)
-    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | Column | Column_Ref | Regex -> Text | Column | Column_Ref -> Case_Sensitivity -> Boolean -> Column
-    text_replace self columns (term : Text | Column | Column_Ref | Regex = "") (new_text : Text | Column | Column_Ref = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
+    text_replace : Vector (Integer | Text | Regex) | Text | Integer | Regex -> Text | Column | Column_Ref | Expression | Regex -> Text | Column | Column_Ref | Expression -> Case_Sensitivity -> Boolean -> Column
+    text_replace self columns (term : Text | Column | Column_Ref | Expression | Regex = "") (new_text : Text | Column | Column_Ref | Expression = "") case_sensitivity=Case_Sensitivity.Sensitive only_first=False =
         table_ref = Table_Ref.from self
         resolved_term = table_ref.resolve term
         resolved_new_text = table_ref.resolve new_text
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Ref.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Ref.enso
index 8ac458467ad2..ffd88360403e 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Ref.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Extensions/Table_Ref.enso
@@ -4,6 +4,7 @@ import Standard.Base.Errors.Common.Index_Out_Of_Bounds
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
 import project.Data.Column_Ref.Column_Ref
+import project.Data.Expression.Expression
 import project.Data.Expression.Expression_Error
 import project.Data.Set_Mode.Set_Mode
 import project.Data.Table.Table
@@ -31,8 +32,8 @@ type Table_Ref
        - expression: The expression to evaluate.
        - on_problems: Specifies how to handle non-fatal problems, attaching a
          warning by default.
-    evaluate_expression : Text -> Problem_Behavior -> Any ! No_Such_Column | Invalid_Value_Type | Expression_Error
-    evaluate_expression self expression on_problems=Report_Warning = self.underlying.evaluate_expression expression on_problems=on_problems
+    evaluate_expression : Expression -> Problem_Behavior -> Any ! No_Such_Column | Invalid_Value_Type | Expression_Error
+    evaluate_expression self expression:Expression on_problems=Report_Warning = self.underlying.evaluate_expression expression on_problems=on_problems
 
     ## PRIVATE
        Resolve a Column_Ref to a Column, keeping any other values as-is.
@@ -40,7 +41,7 @@ type Table_Ref
     resolve self value = case value of
         Column_Ref.Name name -> self.at name
         Column_Ref.Index index -> self.at index
-        Column_Ref.Expression expression -> self.evaluate_expression expression
+        Expression.Value _ -> self.evaluate_expression value
         _ -> value
 
     ## PRIVATE
@@ -50,7 +51,7 @@ type Table_Ref
     resolve_as_column self value = case value of
         Column_Ref.Name name -> self.at name
         Column_Ref.Index index -> self.at index
-        Column_Ref.Expression expression -> self.evaluate_expression expression
+        Expression.Value _ -> self.evaluate_expression value
         _ -> self.underlying.make_constant_column value
 
     ## PRIVATE
@@ -75,8 +76,8 @@ type Table_Ref
     ## PRIVATE
        Set a column.
     set : Any -> Text -> Set_Mode -> Problem_Behavior -> Table_Ref ! Existing_Column | Missing_Column | No_Such_Column | Expression_Error
-    set self column new_name:Text set_mode:Set_Mode=Set_Mode.Add_Or_Update on_problems:Problem_Behavior=Report_Warning =
-        new_underlying = self.underlying.set column new_name set_mode=set_mode on_problems=on_problems
+    set self column as:Text set_mode:Set_Mode=Set_Mode.Add_Or_Update on_problems:Problem_Behavior=Report_Warning =
+        new_underlying = self.underlying.set column as set_mode=set_mode on_problems=on_problems
         Table_Ref.from new_underlying
 
     ## PRIVATE
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Aggregate_Column_Helper.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Aggregate_Column_Helper.enso
index 0f49b397c5d9..de52c2b0d65b 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Aggregate_Column_Helper.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Aggregate_Column_Helper.enso
@@ -80,14 +80,14 @@ prepare_aggregate_columns naming_helper group_by aggregates table error_on_missi
                The second pass resolves the default names, ensuring that they do not
                clash with the user-specified names (ensuring that user-specified names
                take precedence).
-            pass_1 = valid_resolved_aggregate_columns.map on_problems=No_Wrap c-> if c.new_name == "" then "" else
+            pass_1 = valid_resolved_aggregate_columns.map on_problems=No_Wrap c-> if c.as == "" then "" else
                 # Verify if the user-provided name is valid and if not, throw an error.
-                naming_helper.ensure_name_is_valid c.new_name <|
-                    unique.make_unique c.new_name
+                naming_helper.ensure_name_is_valid c.as <|
+                    unique.make_unique c.as
             renamed_columns = pass_1.map_with_index i->name->
                 agg = valid_resolved_aggregate_columns.at i
-                new_name = if name != "" then name else unique.make_unique (default_aggregate_column_name agg)
-                Pair.new new_name agg
+                as = if name != "" then name else unique.make_unique (default_aggregate_column_name agg)
+                Pair.new as agg
 
             # Build Problems Output
             case renamed_columns.is_empty of
@@ -106,7 +106,7 @@ prepare_aggregate_columns naming_helper group_by aggregates table error_on_missi
 ## PRIVATE
    Defines the default name of an `Aggregate_Column`.
 
-   To be used when `new_name` is `Nothing`.
+   To be used when `as` is `Nothing`.
 
    Assumes that the `Aggregate_Column` is resolved. You may need to transform it
    with `resolve_aggregate` first.
@@ -189,28 +189,28 @@ resolve_aggregate table problem_builder aggregate_column =
             internal_column
 
     result = case aggregate_column of
-        Group_By c new_name -> Group_By (resolve c) new_name
-        Count new_name -> Count new_name
-        Count_Distinct c new_name ignore_nothing ->
+        Group_By c as -> Group_By (resolve c) as
+        Count as -> Count as
+        Count_Distinct c as ignore_nothing ->
             new_c = resolve_selector_to_vector c
-            Count_Distinct new_c new_name ignore_nothing
-        Count_Not_Nothing c new_name -> Count_Not_Nothing (resolve c) new_name
-        Count_Nothing c new_name -> Count_Nothing (resolve c) new_name
-        Count_Not_Empty c new_name -> Count_Not_Empty (resolve_text c) new_name
-        Count_Empty c new_name ->  Count_Empty (resolve_text c) new_name
-        Sum c new_name -> Sum (resolve_numeric c) new_name
-        Average c new_name -> Average (resolve_numeric c) new_name
-        Median c new_name -> Median (resolve_numeric c) new_name
-        Percentile p c new_name -> Percentile p (resolve_numeric c) new_name
-        Mode c new_name -> Mode (resolve c) new_name
-        Standard_Deviation c new_name population -> Standard_Deviation (resolve_numeric c) new_name population
-        Concatenate c new_name separator prefix suffix quote_char -> Concatenate (resolve_text c) new_name separator prefix suffix quote_char
-        First c new_name ignore_nothing order_by -> First (resolve c) new_name ignore_nothing (resolve_order_by order_by)
-        Last c new_name ignore_nothing order_by -> Last (resolve c) new_name ignore_nothing (resolve_order_by order_by)
-        Maximum c new_name -> Maximum (resolve c) new_name
-        Minimum c new_name -> Minimum (resolve c) new_name
-        Shortest c new_name -> Shortest (resolve_text c) new_name
-        Longest c new_name -> Longest (resolve_text c) new_name
+            Count_Distinct new_c as ignore_nothing
+        Count_Not_Nothing c as -> Count_Not_Nothing (resolve c) as
+        Count_Nothing c as -> Count_Nothing (resolve c) as
+        Count_Not_Empty c as -> Count_Not_Empty (resolve_text c) as
+        Count_Empty c as ->  Count_Empty (resolve_text c) as
+        Sum c as -> Sum (resolve_numeric c) as
+        Average c as -> Average (resolve_numeric c) as
+        Median c as -> Median (resolve_numeric c) as
+        Percentile p c as -> Percentile p (resolve_numeric c) as
+        Mode c as -> Mode (resolve c) as
+        Standard_Deviation c as population -> Standard_Deviation (resolve_numeric c) as population
+        Concatenate c as separator prefix suffix quote_char -> Concatenate (resolve_text c) as separator prefix suffix quote_char
+        First c as ignore_nothing order_by -> First (resolve c) as ignore_nothing (resolve_order_by order_by)
+        Last c as ignore_nothing order_by -> Last (resolve c) as ignore_nothing (resolve_order_by order_by)
+        Maximum c as -> Maximum (resolve c) as
+        Minimum c as -> Minimum (resolve c) as
+        Shortest c as -> Shortest (resolve_text c) as
+        Longest c as -> Longest (resolve_text c) as
 
     ## Downgrade the `Internal_Missing_Column_Error` error into a `Nothing`
        value, keeping any other dataflow errors intact.
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
index 23a4fb364704..8dc95c27bf88 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Expand_Objects_Helpers.enso
@@ -76,7 +76,6 @@ expand_column (table : Table) (column : Text | Integer) (fields : (Vector Text)
 
      table = Table.new [["aaa", [1, 2]], ["bbb", [[30, 31], [40, 41]]]]
      # => Table.new [["aaa", [1, 1, 2, 2]], ["bbb", [30, 31, 40, 41]]]
-@column Widget_Helpers.make_column_name_selector
 expand_to_rows : Table -> Text | Integer -> Boolean -> Table ! Type_Error | No_Such_Column | Index_Out_Of_Bounds
 expand_to_rows table column:(Text | Integer) at_least_one_row=False = if column.is_a Integer then expand_to_rows table (table.at column).name at_least_one_row else
     row_expander : Any -> Vector
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso
index 0e9656514937..07335fc29e3f 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Join_Helpers.enso
@@ -56,11 +56,13 @@ type Join_Condition_Resolver
                     self.make_equals problem_builder left right
         converted = conditions_vector.map on_problems=No_Wrap condition-> case condition of
             Join_Condition.Equals left_selector right_selector ->
-                handle_equals left_selector right_selector
+                right_resovled = if right_selector == "" then left_selector else right_selector
+                handle_equals left_selector right_resovled
             column_name : Text -> handle_equals column_name column_name
             Join_Condition.Equals_Ignore_Case left_selector right_selector locale ->
                 left = resolve_left left_selector
-                right = resolve_right right_selector
+                right_resovled = if right_selector == "" then left_selector else right_selector
+                right = resolve_right right_resovled
                 if is_nothing left || is_nothing right then Nothing else
                     Value_Type.expect_text left <|
                         Value_Type.expect_text right <|
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
index e3222ef7d562..ccb6d6f28202 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Table_Helpers.enso
@@ -6,6 +6,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State
 import project.Data.Aggregate_Column.Aggregate_Column
 import project.Data.Blank_Selector.Blank_Selector
 import project.Data.Column.Column
+import project.Data.Expression.Expression
 import project.Data.Position.Position
 import project.Data.Set_Mode.Set_Mode
 import project.Data.Sort_Column.Sort_Column
@@ -14,7 +15,7 @@ import project.Data.Type.Value_Type.Value_Type
 import project.Data.Type.Value_Type_Helpers
 import project.Internal.Column_Naming_Helper.Column_Naming_Helper
 import project.Internal.Problem_Builder.Problem_Builder
-from project.Errors import Ambiguous_Column_Rename, Column_Type_Mismatch, Invalid_Aggregate_Column, Missing_Input_Columns, No_Common_Type, No_Input_Columns_Selected, No_Output_Columns, Too_Many_Column_Names_Provided
+from project.Errors import Ambiguous_Column_Rename, Column_Type_Mismatch, Invalid_Aggregate_Column, Missing_Input_Columns, No_Common_Type, No_Input_Columns_Selected, No_Output_Columns, No_Such_Column, Too_Many_Column_Names_Provided
 
 polyglot java import java.util.HashSet
 
@@ -177,16 +178,18 @@ type Table_Column_Helper
 
        It may allow selection of columns by index, name or computing a derived
        expression.
-    resolve_column_or_expression : (Integer | Text) -> Problem_Builder -> Any | Nothing
+    resolve_column_or_expression : (Integer | Text | Expression) -> Problem_Builder -> Any | Nothing
     resolve_column_or_expression self selector problem_builder = case selector of
         _ : Text ->
             matched_columns = self.internal_columns.filter column->(column.name==selector)
             if matched_columns.length == 1 then matched_columns.first else
                 if matched_columns.length != 0 then Panic.throw (Illegal_State.Error "Bug in Table library: A single exact match should never match more than one column. Perhaps the table breaks the invariant of unique column names?") else
-                    (self.table.evaluate_expression selector).catch Any expression_error->
-                        invalid_column = Invalid_Aggregate_Column.Error selector expression_error
-                        problem_builder.report_other_warning invalid_column
-                        Nothing
+                    problem_builder.report_other_warning (Invalid_Aggregate_Column.Error selector (No_Such_Column.Error selector))
+                    Nothing
+        _ : Expression ->
+            (self.table.evaluate_expression selector).catch Any expression_error->
+                problem_builder.report_other_warning (Invalid_Aggregate_Column.Error selector.expression expression_error)
+                Nothing
         _ : Integer -> case is_index_valid self.internal_columns.length selector of
             True -> self.internal_columns.at selector
             False ->
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
index 24e562f55eb0..e957af0c5ae0 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Internal/Widget_Helpers.enso
@@ -2,7 +2,7 @@ from Standard.Base import all
 import Standard.Base.Metadata.Display
 import Standard.Base.Metadata.Widget
 from Standard.Base.Metadata.Choice import Option
-from Standard.Base.Metadata.Widget import Numeric_Input, Single_Choice, Vector_Editor
+from Standard.Base.Metadata.Widget import Numeric_Input, Single_Choice, Text_Input, Vector_Editor
 from Standard.Base.System.File_Format import format_types
 from Standard.Base.Widget_Helpers import make_format_chooser
 
@@ -68,11 +68,12 @@ make_aggregate_column_vector_selector table display=Display.Always =
 
 ## PRIVATE
    Make a column name selector.
-make_column_name_selector : Table -> Display -> Widget
-make_column_name_selector table display=Display.Always =
+make_column_name_selector : Table -> Boolean -> Display -> Widget
+make_column_name_selector table add_expression:Boolean=False display=Display.Always =
     col_names = table.column_names
     names = col_names.map n-> Option n n.pretty
-    Single_Choice display=display values=names
+    expression = if add_expression then [Option "<Expression>" "(expr '["+table.column_names.first+"]')"] else []
+    Single_Choice display=display values=(expression+names)
 
 ## PRIVATE
    Make a multiple column name selector.
@@ -86,10 +87,10 @@ make_column_name_vector_selector table display=Display.Always =
 make_column_ref_by_name_selector : Table -> Display -> Boolean -> Boolean -> Boolean -> Boolean -> Widget
 make_column_ref_by_name_selector table display:Display=Display.Always add_text:Boolean=False add_regex:Boolean=False add_number:Boolean=False add_boolean:Boolean=False =
     text = if add_text then [Option "<Text Value>" "''"] else []
-    regex = if add_regex then [Option "<Regular Expression>" "('').to_regex"] else []
+    regex = if add_regex then [Option "<Regular Expression>" "(regex '')"] else []
     number = if add_number then [Option "<Number Value>" "0"] else []
     boolean = if add_boolean then [Option "<True/False>" "True"] else []
-    expression = if table.is_nothing then [] else [Option "<Expression>" "(Column_Ref.Expression '["+table.column_names.first+"]')"]
+    expression = if table.is_nothing then [] else [Option "<Expression>" "(expr '["+table.column_names.first+"]')"]
     col_names = if table.is_nothing then [] else table.column_names.map (name -> Option name "(Column_Ref.Name "+name.pretty+")")
     values = text + regex + number + boolean + expression + col_names
     Single_Choice values=values display=display
@@ -143,14 +144,14 @@ make_join_condition_selector : Table -> Display -> Widget
 make_join_condition_selector table display=Display.Always =
     col_names_selector = make_column_name_selector table display=Display.Always
 
-    fqn = "Join_Condition"
-    equals = Option "Equals" fqn+".Equals" [["left", col_names_selector]]
-    equals_ci = Option "Equals (Ignore Case)" fqn+".Equals_Ignore_Case" [["left", col_names_selector]]
-    between = Option "Between" fqn+".Between" [["left", col_names_selector]]
+    fqn = Meta.get_qualified_type_name Join_Condition
+    equals = Option "Equals" fqn+".Equals" [["left", col_names_selector], ["right", Text_Input]]
+    equals_ci = Option "Equals (Ignore Case)" fqn+".Equals_Ignore_Case" [["left", col_names_selector], ["right", Text_Input]]
+    between = Option "Between" fqn+".Between" [["left", col_names_selector], ["right_lower", Text_Input], ["right_upper", Text_Input]]
     names=[equals, equals_ci, between]
 
     item_editor = Single_Choice display=display values=names
-    Vector_Editor item_editor=item_editor item_default="("+item_editor.values.first.value+")" display=display
+    Vector_Editor item_editor=item_editor item_default="(Join_Condition.Equals "+table.column_names.first.pretty+")" display=display
 
 ## PRIVATE
    Make a column name selector.
@@ -168,7 +169,7 @@ make_order_by_selector table display=Display.Always =
 make_rename_name_vector_selector : Table -> Display -> Widget
 make_rename_name_vector_selector table display=Display.Always =
     col_names = table.column_names
-    names = [Option "<Regular Expression>" "'^.*$'.to_regex"] + (col_names.map n-> Option n n.pretty)
+    names = [Option "<Regular Expression>" "(regex '^.*$')"] + (col_names.map n-> Option n n.pretty)
     fqn = Meta.get_qualified_type_name Pair
     name = Option "Name" fqn+".Value" [["first", Single_Choice values=names display=Display.Always]]
     item_editor = Single_Choice display=Display.Always values=[name]
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
index 52e2f85d110e..9cd80290d99c 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Main.enso
@@ -13,6 +13,8 @@ import project.Data.Match_Columns.Match_Columns
 import project.Data.Position.Position
 import project.Data.Report_Unmatched.Report_Unmatched
 import project.Data.Set_Mode.Set_Mode
+import project.Data.Simple_Expression.Simple_Expression
+import project.Data.Simple_Expression.Simple_Calculation
 import project.Data.Sort_Column.Sort_Column
 import project.Data.Table.Table
 import project.Data.Type.Value_Type.Auto
@@ -25,6 +27,7 @@ import project.Excel.Excel_Section.Excel_Section
 import project.Excel.Excel_Workbook.Excel_Workbook
 import project.Extensions.Prefix_Name.Prefix_Name
 from project.Data.Constants import all
+from project.Data.Expression import expr
 from project.Delimited.Delimited_Format.Delimited_Format import Delimited
 from project.Excel.Excel_Format.Excel_Format import Excel
 from project.Excel.Excel_Section.Excel_Section import Cell_Range, Range_Names, Sheet_Names, Worksheet
@@ -44,6 +47,8 @@ export project.Data.Match_Columns.Match_Columns
 export project.Data.Position.Position
 export project.Data.Report_Unmatched.Report_Unmatched
 export project.Data.Set_Mode.Set_Mode
+export project.Data.Simple_Expression.Simple_Expression
+export project.Data.Simple_Expression.Simple_Calculation
 export project.Data.Sort_Column.Sort_Column
 export project.Data.Table.Table
 export project.Data.Type.Value_Type.Auto
@@ -56,8 +61,8 @@ export project.Excel.Excel_Section.Excel_Section
 export project.Excel.Excel_Workbook.Excel_Workbook
 export project.Extensions.Prefix_Name.Prefix_Name
 from project.Data.Constants export all
+from project.Data.Expression export expr
 from project.Delimited.Delimited_Format.Delimited_Format export Delimited
 from project.Excel.Excel_Format.Excel_Format export Excel
 from project.Excel.Excel_Section.Excel_Section export Cell_Range, Range_Names, Sheet_Names, Worksheet
 from project.Extensions.Table_Conversions export all
-
diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso
index 1c7dd5f4076a..b0a4700ac1c0 100644
--- a/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso
+++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Extensions.enso
@@ -296,7 +296,7 @@ Number.should_equal : Float -> Float -> Integer -> Spec_Result
 Number.should_equal self that epsilon=0 frames_to_skip=0 =
     matches = case that of
         _ : Number -> self.equals that epsilon
-        _ -> False
+        _ -> self==that
     case matches of
         True -> Spec_Result.Success
         False ->
@@ -519,7 +519,7 @@ Error.should_contain_the_same_elements_as self that frames_to_skip=0 =
 
    It checks that all elements from `self` are also present in `that`. It does
    not require that all elements of `that` are contained in `self`. Arities of
-   elements are not checked, so `self` may still contain more elements than 
+   elements are not checked, so `self` may still contain more elements than
    `that` by containing duplicates.
 
    It will work on any collection which supports the methods
diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Group.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Group.enso
index 1349070c0fe9..d7a6d570d3b7 100644
--- a/distribution/lib/Standard/Test/0.0.0-dev/src/Group.enso
+++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Group.enso
@@ -48,3 +48,20 @@ type Group
         sb.append "]"
         sb.toString
 
+    is_pending self -> Boolean =
+        self.pending.is_nothing.not
+
+
+# Group is used as a key inside a map, so we define its comparator which uses only the
+# `name` field.
+type Group_Comparator
+    compare (g1 : Group) (g2 : Group) -> (Ordering | Nothing) =
+        text_comp = Comparable.from g1.name
+        text_comp.compare g1.name g2.name
+
+    hash (g : Group) =
+        text_comp = Comparable.from g.name
+        text_comp.hash g.name
+
+Comparable.from (_:Group) = Group_Comparator
+
diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Helpers.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Helpers.enso
index 1541295bc5cf..8a846d3d9b5a 100644
--- a/distribution/lib/Standard/Test/0.0.0-dev/src/Helpers.enso
+++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Helpers.enso
@@ -1,6 +1,7 @@
 private
 
 from Standard.Base import all
+from Standard.Base.Runtime import assert
 from Standard.Base.Runtime import State
 
 import project.Clue.Clue
@@ -13,27 +14,20 @@ import project.Test.Test
 import project.Test_Reporter
 import project.Test_Result.Test_Result
 
-run_group_with_filter : Group -> (Regex|Text|Nothing) -> Vector Test_Result
-run_group_with_filter (group : Group) (spec_filter : (Regex|Text|Nothing)) =
-    filtered_specs = group.specs.filter spec->
-        case spec_filter of
-            regex : Regex -> (regex.match spec.name) != Nothing
-            text : Text -> spec.name.contains text
-            Nothing -> True
-    run_specs_from_group filtered_specs group
-
-
 run_group : Group -> Vector Test_Result
 run_group (group : Group) =
+    assert group.is_pending.not
     run_specs_from_group group.specs group
 
 
 run_specs_from_group : Vector Spec -> Group -> Vector Test_Result
 run_specs_from_group (specs : Vector Spec) (group : Group) =
+    assert (group.is_pending.not)
     case specs.is_empty of
         True -> []
         False ->
             test_results = specs.map spec->
+                assert (group_contains_spec group spec)
                 pair = run_spec spec
                 spec_res = pair.second
                 time_taken = pair.first
@@ -43,7 +37,11 @@ run_specs_from_group (specs : Vector Spec) (group : Group) =
             test_results
 
 
-## PRIVATE
+group_contains_spec (group : Group) (spec : Spec) -> Boolean =
+    spec_names = group.specs.map (it-> it.name)
+    spec_names.contains spec.name
+
+
 run_spec : Spec -> Pair Duration Spec_Result
 run_spec (spec : Spec) =
     pair = case spec.pending of
diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Suite.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Suite.enso
index 39dafe735402..8561e8a410fe 100644
--- a/distribution/lib/Standard/Test/0.0.0-dev/src/Suite.enso
+++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Suite.enso
@@ -41,7 +41,6 @@ type Suite_Builder
                 self.builder.append group
 
 
-
 ## A testing suite that holds all the groups with test specs.
 
    Users are expected to build the suite via `Suite_Builder`. That is, via `Test.build` method.
@@ -49,51 +48,59 @@ type Suite
     ## PRIVATE
     Impl (groups : Vector Group)
 
-    ## Run only tests that match the provided filters.
-
-       A filter can be either Regex, Text, or Nothing. If Nothing, it matches all the names.
-       If Text, it matches only names that contains that text as a substring.
-       If a Regex, the `regex.match` method is invoked for every name.
-
-       Note that you can specify the regex such that it matches, e.g., exactly two test spec names
-       via something like `Regex.compile "(name1|name2)"`.
+    ## Run only tests that match the provided filter.
 
        Arguments:
-       - group_filter: Filter for group names.
-       - spec_filter: Filter for spec names.
-       - should_exit: If true, executes `System.exit` at the end.
-    run_with_filter : (Regex | Text | Nothing) -> (Regex | Text | Nothing) -> Boolean -> Nothing
-    run_with_filter self group_filter=Nothing spec_filter=Nothing should_exit=True =
+       - filter: Either text or Nothing. If Nothing, matches all the specs and all the groups.
+         If `filter` is text, it is first compiled into a regex and all the groups or the
+         specs that match the regex are run.
+       - should_exit: If true, executes `System.exit` at the end, so the method does not return.
+         If false, return boolean from the method indicating whether some tests failed.
+
+       Returns: Boolean if `should_exit` is False, otherwise exits the process.
+    run_with_filter self (filter : (Text | Nothing) = Nothing) should_exit=True -> (Boolean | Nothing) =
         config = Suite_Config.from_environment
 
-        groups_with_matching_names = self.groups.filter group->
-            case group_filter of
-                regex : Regex -> (regex.match group.name) != Nothing
-                text : Text -> group.name.contains text
-                Nothing -> True
-        pending_groups = groups_with_matching_names.filter group->
-            group.pending.is_nothing.not
-        groups_to_run = groups_with_matching_names.filter group->
-            pending_groups.contains group . not
-        assert (pending_groups.length <= groups_with_matching_names.length)
-        assert (groups_to_run.length <= groups_with_matching_names.length)
-        assert (groups_with_matching_names.length <= self.groups.length)
-
+        # Map of groups to vector of specs that match the filter
+        matching_specs = self.groups.fold Map.empty map-> group->
+            group_matches = name_matches group.name filter
+            case group_matches of
+                True ->
+                    # Include all the specs from the group
+                    map.insert group group.specs
+                False ->
+                    # Try to include only some specs from the group
+                    matched_specs = group.specs.filter spec->
+                        name_matches spec.name filter
+                    case matched_specs.is_empty of
+                        True -> map
+                        False ->
+                            assert (map.contains_key group . not)
+                            map.insert group matched_specs
+
+
+        all_results_bldr = Vector.new_builder
         junit_sb_builder = if config.should_output_junit then StringBuilder.new else Nothing
-        all_results = Test_Reporter.wrap_junit_testsuites config junit_sb_builder <|
-            groups_to_run.flat_map group->
-                results = Helpers.run_group_with_filter group spec_filter
-                Test_Reporter.print_report results config junit_sb_builder
-                results
-        succ_tests = all_results.filter (_.is_success) . length
-        failed_tests = all_results.filter (_.is_fail) . length
-        skipped_tests = all_results.filter (_.is_pending) . length
+        Test_Reporter.wrap_junit_testsuites config junit_sb_builder <|
+            matching_specs.each_with_key group-> specs->
+                if group.is_pending.not then
+                    results = Helpers.run_specs_from_group specs group
+                    Test_Reporter.print_report results config junit_sb_builder
+                    all_results_bldr.append_vector_range results
+        all_results = all_results_bldr.to_vector
+        succ_tests = all_results.filter (r-> r.is_success) . length
+        failed_tests = all_results.filter (r-> r.is_fail) . length
+        skipped_tests = all_results.filter (r-> r.is_pending) . length
         case should_exit of
             True ->
                 IO.println <| succ_tests.to_text + " tests succeeded."
                 IO.println <| failed_tests.to_text + " tests failed."
                 IO.println <| skipped_tests.to_text + " tests skipped."
-                IO.println <| pending_groups.length.to_text + " groups skipped."
+                pending_groups = matching_specs.keys.filter (group-> group.is_pending)
+                pending_groups_details = case pending_groups.is_empty of
+                    True -> "."
+                    False -> ": " + (pending_groups.map (it-> it.name) . to_text)
+                IO.println <| pending_groups.length.to_text + " groups skipped" + pending_groups_details
                 exit_code = if failed_tests > 0 then 1 else 0
                 System.exit exit_code
             False ->
@@ -110,3 +117,13 @@ type Suite
             IO.println <| "  Group '" + group.name + "':"
             group.specs.each spec->
                 IO.println <| "    " + spec.name
+
+
+## PRIVATE
+name_matches (name : Text) (filter : (Text | Nothing)) -> Boolean =
+    case filter of
+        text : Text ->
+            regex = Regex.compile text
+            if regex.is_error.not then regex.match name != Nothing else
+                Panic.throw (Illegal_Argument.Error ("Filter '" + text + "' cannot be converted to regex"))
+        Nothing -> True
diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/SQL/Visualization.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/SQL/Visualization.enso
index e175093b64d4..bbca28c8f48d 100644
--- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/SQL/Visualization.enso
+++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/SQL/Visualization.enso
@@ -1,7 +1,7 @@
 from Standard.Base import all
 
 import Standard.Database.Data.SQL_Type.SQL_Type
-import Standard.Database.Data.Table.Table
+import Standard.Database.Data.DB_Table.DB_Table
 
 import project.Helpers
 
@@ -18,7 +18,7 @@ import project.Helpers
 
    Expected Enso types are inferred based on known SQL types and their mapping
    to Enso types.
-prepare_visualization : Table -> Text
+prepare_visualization : DB_Table -> Text
 prepare_visualization x =
     prepared = x.to_sql.prepare
     code = prepared.first
diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
index fd30d86e5310..b072c1ba479a 100644
--- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
+++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
@@ -3,10 +3,10 @@ import Standard.Base.Data.Vector.Builder
 
 import Standard.Table.Data.Column.Column
 import Standard.Table.Data.Row.Row
-import Standard.Table.Data.Table.Table as Dataframe_Table
+import Standard.Table.Data.Table.Table
 
 import Standard.Database.Data.DB_Column.DB_Column
-import Standard.Database.Data.Table.Table as Database_Table
+import Standard.Database.Data.DB_Table.DB_Table
 
 import project.Helpers
 
@@ -32,13 +32,13 @@ prepare_visualization y max_rows=1000 =
         _ : JS_Object -> make_json_for_js_object x max_rows
         _ : Row -> make_json_for_map x.to_map max_rows "column"
         _ : Column -> prepare_visualization x.to_table max_rows
-        _ : Dataframe_Table ->
+        _ : Table ->
             dataframe = x.take max_rows
             all_rows_count = x.row_count
             index = Column.from_vector "#" (Vector.new dataframe.row_count i->i)
             make_json_for_table dataframe [index] all_rows_count
         _ : DB_Column -> prepare_visualization x.to_table max_rows
-        _ : Database_Table ->
+        _ : DB_Table ->
             dataframe = x.read max_rows warn_if_more_rows=False
             all_rows_count = x.row_count
             make_json_for_table dataframe [] all_rows_count
@@ -149,7 +149,7 @@ make_json_for_js_object js_object max_items =
      `dataframe`.
    - all_rows_count: the number of all rows in the underlying data, useful if
      only a fragment is displayed.
-make_json_for_table : Dataframe_Table -> Vector Column -> Integer -> JS_Object
+make_json_for_table : Table -> Vector Column -> Integer -> JS_Object
 make_json_for_table dataframe indices all_rows_count =
     get_vector c = Warning.set (c.to_vector.map v-> make_json_for_value v) []
     columns     = dataframe.columns
@@ -186,12 +186,12 @@ make_json_for_value val level=0 = case val of
             "{" + (prepared.join ", ") + "}"
     _ : Column -> make_json_for_value val.to_table level
     _ : DB_Column -> make_json_for_value val.to_table level
-    _ : Dataframe_Table ->
+    _ : Table ->
         if level != 0 then "Table{" + val.row_count + " rows x " + val.column_count + " columns}" else
             truncated = val.columns.take 5 . map _.name
             prepared = if val.column_count > 5 then truncated + ["… " + (val.column_count - 5).to_text+ " more"] else truncated
             "Table{" + val.row_count.to_text + " rows x [" + (prepared.join ", ") + "]}"
-    _ : Database_Table ->
+    _ : DB_Table ->
         if level != 0 then "Table{" + val.row_count + " rows x " + val.column_count + " columns}" else
             truncated = val.columns.take 5 . map _.name
             prepared = if val.column_count > 5 then truncated + ["… " + (val.column_count - 5).to_text+ " more"] else truncated
diff --git a/distribution/project-manager/THIRD-PARTY/NOTICE b/distribution/project-manager/THIRD-PARTY/NOTICE
index baebff70cde4..9a0b7856a11f 100644
--- a/distribution/project-manager/THIRD-PARTY/NOTICE
+++ b/distribution/project-manager/THIRD-PARTY/NOTICE
@@ -156,11 +156,21 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `commons-cli.commons-cli-1.5.0`.
 
 
+'commons-codec', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-codec.commons-codec-1.9`.
+
+
 'commons-io', licensed under the Apache-2.0, is distributed with the project-manager.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `commons-io.commons-io-2.12.0`.
 
 
+'commons-logging', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `commons-logging.commons-logging-1.2`.
+
+
 'izumi-reflect-thirdparty-boopickle-shaded_2.13', licensed under the Apache-2.0, is distributed with the project-manager.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `dev.zio.izumi-reflect-thirdparty-boopickle-shaded_2.13-2.3.8`.
@@ -231,11 +241,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `io.spray.spray-json_2.13-1.3.6`.
 
 
-'bump_2.13', licensed under the MIT, is distributed with the project-manager.
-The license information can be found along with the copyright notices.
-Copyright notices related to this dependency can be found in the directory `nl.gn0s1s.bump_2.13-0.1.3`.
-
-
 'commons-compress', licensed under the Apache-2.0, is distributed with the project-manager.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-compress-1.23.0`.
@@ -246,29 +251,44 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-lang3-3.12.0`.
 
 
+'commons-text', licensed under the Apache License, Version 2.0, is distributed with the project-manager.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-text-1.10.0`.
+
+
+'httpclient', licensed under the Apache License, Version 2.0, is distributed with the project-manager.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpclient-4.4.1`.
+
+
+'httpcore', licensed under the Apache License, Version 2.0, is distributed with the project-manager.
+The license information can be found along with the copyright notices.
+Copyright notices related to this dependency can be found in the directory `org.apache.httpcomponents.httpcore-4.4.1`.
+
+
 'polyglot', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.polyglot.polyglot-23.1.2`.
 
 
 'collections', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-23.1.2`.
 
 
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-23.1.2`.
 
 
 'word', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.word-23.1.2`.
 
 
 'truffle-api', licensed under the Universal Permissive License, Version 1.0, is distributed with the project-manager.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
-Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-23.1.2`.
 
 
 'reactive-streams', licensed under the CC0, is distributed with the project-manager.
diff --git a/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
new file mode 100644
index 000000000000..75b52484ea47
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
new file mode 100644
index 000000000000..147f78a298e5
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICE.txt
@@ -0,0 +1,9 @@
+Apache Commons Codec
+Copyright 2002-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+contains test data from http://aspell.net/test/orig/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
diff --git a/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-codec.commons-codec-1.9/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
new file mode 100644
index 000000000000..556bd03951d4
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/commons-logging.commons-logging-1.2/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/project-manager/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md b/distribution/project-manager/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
deleted file mode 100644
index 59eab77058a2..000000000000
--- a/distribution/project-manager/THIRD-PARTY/nl.gn0s1s.bump_2.13-0.1.3/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018-2021 Philippus Baalman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
new file mode 100644
index 000000000000..4e1f8dbb8dec
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICE.txt
@@ -0,0 +1,5 @@
+Apache Commons Text
+Copyright 2014-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.commons.commons-text-1.10.0/NOTICES
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
new file mode 100644
index 000000000000..d64569567334
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
new file mode 100644
index 000000000000..c05d4e6e933f
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICE
@@ -0,0 +1,8 @@
+
+Apache HttpClient
+Copyright 1999-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpclient-4.4.1/NOTICES
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
new file mode 100644
index 000000000000..54e4285f2d6a
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/LICENSE
@@ -0,0 +1,266 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+=========================================================================
+
+This project contains annotations in the package org.apache.http.annotation
+which are derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls.
+See http://www.jcip.net and the Creative Commons Attribution License
+(http://creativecommons.org/licenses/by/2.5)
+Full text: http://creativecommons.org/licenses/by/2.5/legalcode
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+    "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
+    "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
+    "Licensor" means the individual or entity that offers the Work under the terms of this License.
+    "Original Author" means the individual or entity who created the Work.
+    "Work" means the copyrightable work of authorship offered under the terms of this License.
+    "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+    to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
+    to create and reproduce Derivative Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
+    to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
+
+    For the avoidance of doubt, where the work is a musical composition:
+        Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
+        Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights agency or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
+    Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+    You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(b), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(b), as requested.
+    If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+    This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+    Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+    Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+    Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+    If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+    No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+    This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
new file mode 100644
index 000000000000..976db53ee327
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICE
@@ -0,0 +1,10 @@
+
+Apache HttpCore
+Copyright 2005-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+This project contains annotations derived from JCIP-ANNOTATIONS
+Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
diff --git a/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/distribution/project-manager/THIRD-PARTY/org.apache.httpcomponents.httpcore-4.4.1/NOTICES
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES
deleted file mode 100644
index a6b2e1fc0d0b..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.0/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.polyglot.polyglot-23.1.2/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES
deleted file mode 100644
index b1d39d405064..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.collections-23.1.0/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.collections-23.1.2/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES
deleted file mode 100644
index b2f56cdae464..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
-
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.0/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.nativeimage-23.1.2/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES
deleted file mode 100644
index 4cfb61c1c481..000000000000
--- a/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-
-Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
similarity index 100%
rename from distribution/lib/Standard/Base/0.0.0-dev/THIRD-PARTY/org.graalvm.sdk.word-23.1.0/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.sdk.word-23.1.2/NOTICES
diff --git a/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES b/distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
similarity index 100%
rename from distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.0/NOTICES
rename to distribution/project-manager/THIRD-PARTY/org.graalvm.truffle.truffle-api-23.1.2/NOTICES
diff --git a/docs/polyglot/java.md b/docs/polyglot/java.md
index 10e819c04f3a..9efb70568ddc 100644
--- a/docs/polyglot/java.md
+++ b/docs/polyglot/java.md
@@ -164,7 +164,7 @@ build tool_ - to download
 [google-analytics-data library](https://central.sonatype.com/artifact/com.google.analytics/google-analytics-data/0.44.0)
 library version `0.44.0` and all _its dependencies_ into your `polyglot/java`
 directory. Of course, _feel free to find different library_ on
-[Maven central](http://maven.apache.org) to download - edit `pom.xml`
+[Maven central](https://search.maven.org/) to download - edit `pom.xml`
 appropriately. Once your files are ready execute:
 
 ```bash
diff --git a/docs/runtime/ir-caching.md b/docs/runtime/ir-caching.md
index 152cdbe6ba80..b4a8a6c07e59 100644
--- a/docs/runtime/ir-caching.md
+++ b/docs/runtime/ir-caching.md
@@ -171,6 +171,10 @@ Every `Persistance` class has a unique identifier. In order to keep definitions
 consistent one should not attempt to use smaller `id`s than previously assigned.
 One should also not delete any `Persistance` classes.
 
+Additionally, `PerMap.serialVersionUID` version provides a seed to the version
+stamp calculated from all `Persistance` classes. Increasing the
+`serialVersionUID` will invalidate all caches.
+
 ## Loading the IR
 
 Loading the IR is a multi-stage process that involves performing integrity
diff --git a/docs/syntax/functions.md b/docs/syntax/functions.md
index a4e332bb53cf..7554d395871f 100644
--- a/docs/syntax/functions.md
+++ b/docs/syntax/functions.md
@@ -304,6 +304,44 @@ the addition by invoking `Num.+`. This behavior allows one to write libraries
 that extend existing number types with `Complex_Number`, `Rational_Number` and
 make them behave as first class citizen numbers.
 
+### Custom Equality
+
+The `==` operator is special. A consistency with hash code is necessary to make
+any Enso object behave correctly and work effectively in `Set` and `Map`
+implementations. To guarantee such level of consistency there is a `Any.==`
+definition providing _universal equality_ that **shall not be overriden**.
+
+The `==` behavior is predefined for builtin types, atoms and other Enso objects.
+In addition to that it remains possible to define own _comparators_, including a
+comparator capable to work with already existing types. To create such
+comparator define:
+
+- conversion between existing type and the new type (as described in
+  [previous section](#type-ascriptions-and-operator-resolution))
+- comparator (see documentation of `Ordering` type)
+- define **two conversion method** that return the same comparator
+
+To extend the previous definition of `Num` also for equality one might do for
+example:
+
+```ruby
+type Num_Comparator
+    compare a:Num b:Num = # compare somehow
+    hash a:Num = # hash somehow
+
+Num.from (that:Integer) = # convert somehow
+Comparable.from (_:Num) = Num_Comparator
+Comparable.from (_:Integer) = Num_Comparator
+```
+
+with such a structure the internal implementation of `Any.==` performs necessary
+conversions of `Integer` argument in case the other argument is `Num` and
+invokes the `Num_Comparator.compare` to handle the comparision.
+
+A care must be taken to keep consistency between `hash` values of original and
+converted types - e.g. hash of `n:Integer` and hash of `Num.from n` must be the
+same (otherwise consistency required for `Set` and `Map` would be compromised).
+
 ### Precedence
 
 Operator precedence in Enso is a collection of rules that reflect conventions
diff --git a/docs/types/dynamic-dispatch.md b/docs/types/dynamic-dispatch.md
index f715b8d9a27f..013ddfc42fa8 100644
--- a/docs/types/dynamic-dispatch.md
+++ b/docs/types/dynamic-dispatch.md
@@ -63,10 +63,13 @@ another.
 
 ## Multiple Dispatch
 
-It is an open question as to whether we want to support proper multiple dispatch
-in Enso. Multiple dispatch refers to the dynamic dispatch target being
-determined based not only on the type of the `this` argument, but the types of
-the other arguments to the function.
+Multiple dispatch is currently used for
+[binary operators](../syntax/functions.md#type-ascriptions-and-operator-resolution).
+
+Supporting it for general functions remains an open question as to whether we
+want to support proper multiple dispatch in Enso. Multiple dispatch refers to
+the dynamic dispatch target being determined based not only on the type of the
+`this` argument, but the types of the other arguments to the function.
 
 To do multiple dispatch properly, it is very important to get a rigorous
 specification of the specificity algorithm. It must account for:
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/EditionsResolveHandler.scala b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/EditionsResolveHandler.scala
index edd0222d94bb..fce6bf3f7a28 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/EditionsResolveHandler.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/EditionsResolveHandler.scala
@@ -3,7 +3,7 @@ package org.enso.languageserver.libraries.handler
 import akka.actor.{Actor, ActorRef, Props, Status}
 import akka.pattern.pipe
 import com.typesafe.scalalogging.LazyLogging
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.jsonrpc.{Id, Request, ResponseError, ResponseResult}
 import org.enso.languageserver.filemanager.FileManagerApi.FileSystemError
 import org.enso.languageserver.libraries.LibraryApi._
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetMetadataHandler.scala b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetMetadataHandler.scala
index 0abf8ff98310..e257e6dc9f42 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetMetadataHandler.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetMetadataHandler.scala
@@ -5,7 +5,7 @@ import akka.actor.{Actor, ActorRef, Cancellable, Props, Status}
 import scala.util.{Success, Try}
 import akka.pattern.pipe
 import com.typesafe.scalalogging.LazyLogging
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.Editions.Repository
 import org.enso.editions.LibraryName
 import org.enso.jsonrpc._
@@ -53,14 +53,14 @@ class LibraryGetMetadataHandler(
             libraryName
           )
         case LibraryEntry.PublishedLibraryVersion(version, repositoryUrl) =>
-          SemVer(version) match {
-            case Some(semVerVersion) =>
+          SemVer.parse(version) match {
+            case Success(semVerVersion) =>
               getOrFetchPublishedMetadata(
                 libraryName,
                 semVerVersion,
                 repositoryUrl
               ) pipeTo self
-            case None =>
+            case _ =>
               self ! LocalLibraryManagerProtocol.InvalidSemverVersionError(
                 version
               )
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetPackageHandler.scala b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetPackageHandler.scala
index f263e342d099..a7d175e9d49f 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetPackageHandler.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/libraries/handler/LibraryGetPackageHandler.scala
@@ -3,7 +3,7 @@ package org.enso.languageserver.libraries.handler
 import akka.actor.{Actor, ActorRef, Cancellable, Props, Status}
 import akka.pattern.pipe
 import com.typesafe.scalalogging.LazyLogging
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.Editions.Repository
 import org.enso.editions.LibraryName
 import org.enso.jsonrpc._
@@ -16,7 +16,7 @@ import org.enso.librarymanager.published.repository.RepositoryHelper.RepositoryM
 
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
-import scala.util.Try
+import scala.util.{Success, Try}
 
 /** A request handler for the `library/getPackage` endpoint.
   *
@@ -48,14 +48,14 @@ class LibraryGetPackageHandler(
             libraryName
           )
         case LibraryEntry.PublishedLibraryVersion(version, repositoryUrl) =>
-          SemVer(version) match {
-            case Some(semVerVersion) =>
+          SemVer.parse(version) match {
+            case Success(semVerVersion) =>
               getOrFetchPublishedPackage(
                 libraryName,
                 semVerVersion,
                 repositoryUrl
               ) pipeTo self
-            case None =>
+            case _ =>
               self ! LocalLibraryManagerProtocol.InvalidSemverVersionError(
                 version
               )
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/search/SearchProtocol.scala b/engine/language-server/src/main/scala/org/enso/languageserver/search/SearchProtocol.scala
index a4c4a737abc3..5d636a34c71a 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/search/SearchProtocol.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/search/SearchProtocol.scala
@@ -493,6 +493,9 @@ object SearchProtocol {
     updates: Seq[SuggestionsDatabaseUpdate]
   )
 
+  /** A request to clear the suggestions database. */
+  case object ClearSuggestionsDatabase
+
   /** The request to receive contents of the suggestions database. */
   case object GetSuggestionsDatabase
 
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/search/SuggestionsHandler.scala b/engine/language-server/src/main/scala/org/enso/languageserver/search/SuggestionsHandler.scala
index 86e58510f5d1..ba5c85eca2ec 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/search/SuggestionsHandler.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/search/SuggestionsHandler.scala
@@ -110,6 +110,8 @@ final class SuggestionsHandler(
     )
     context.system.eventStream
       .subscribe(self, classOf[Api.LibraryLoaded])
+    context.system.eventStream
+      .subscribe(self, classOf[Api.BackgroundJobsStartedNotification])
     context.system.eventStream.subscribe(self, classOf[FileDeletedEvent])
     context.system.eventStream
       .subscribe(self, InitializedEvent.SuggestionsRepoInitialized.getClass)
@@ -186,13 +188,29 @@ final class SuggestionsHandler(
 
     case msg: Api.SuggestionsDatabaseSuggestionsLoadedNotification
         if state.isSuggestionLoadingRunning =>
-      state.suggestionLoadingQueue.enqueue(msg)
+      logger.trace(
+        "SuggestionsDatabaseSuggestionsLoadedNotification [shouldStartBackgroundProcessing={}].",
+        state.shouldStartBackgroundProcessing
+      )
+      if (state.shouldStartBackgroundProcessing) {
+        state.suggestionLoadingQueue.clear()
+      } else {
+        state.suggestionLoadingQueue.enqueue(msg)
+      }
 
     case msg: Api.SuggestionsDatabaseSuggestionsLoadedNotification =>
       logger.debug(
         "Starting loading suggestions for library [{}].",
         msg.libraryName
       )
+      context.become(
+        initialized(
+          projectName,
+          graph,
+          clients,
+          state.suggestionLoadingRunning()
+        )
+      )
       applyLoadedSuggestions(msg.suggestions)
         .onComplete {
           case Success(notification) =>
@@ -214,14 +232,6 @@ final class SuggestionsHandler(
             )
             self ! SuggestionsHandler.SuggestionLoadingCompleted
         }
-      context.become(
-        initialized(
-          projectName,
-          graph,
-          clients,
-          state.suggestionLoadingRunning()
-        )
-      )
 
     case msg: Api.SuggestionsDatabaseModuleUpdateNotification
         if state.isSuggestionUpdatesRunning =>
@@ -304,39 +314,65 @@ final class SuggestionsHandler(
         )
       )
 
+    case Api.BackgroundJobsStartedNotification() =>
+      self ! SuggestionLoadingCompleted
+      context.become(
+        initialized(
+          projectName,
+          graph,
+          clients,
+          state.backgroundProcessingStarted()
+        )
+      )
+
     case GetSuggestionsDatabaseVersion =>
       suggestionsRepo.currentVersion
         .map(GetSuggestionsDatabaseVersionResult)
         .pipeTo(sender())
 
-    case GetSuggestionsDatabase =>
-      val responseAction = for {
-        _       <- suggestionsRepo.clean
-        version <- suggestionsRepo.currentVersion
-      } yield GetSuggestionsDatabaseResult(version, Seq())
-
-      responseAction.pipeTo(sender())
-
-      val handlerAction = for {
-        _ <- responseAction
-      } yield SearchProtocol.InvalidateModulesIndex
+    case ClearSuggestionsDatabase =>
+      if (state.isSuggestionLoadingRunning) stash()
+      else {
+        context.become(
+          initialized(
+            projectName,
+            graph,
+            clients,
+            state.suggestionLoadingRunning()
+          )
+        )
+        for {
+          _ <- suggestionsRepo.clean
+        } yield {
+          logger.trace(
+            "ClearSuggestionsDatabase [{}].",
+            state.suggestionLoadingQueue
+          )
+          state.suggestionLoadingQueue.clear()
+          runtimeConnector ! Api.Request(Api.StartBackgroundProcessing())
+        }
+      }
 
+    case GetSuggestionsDatabase =>
       val handler = context.system.actorOf(
         InvalidateModulesIndexHandler.props(
           RuntimeFailureMapper(contentRootManager),
           timeout,
-          runtimeConnector
+          runtimeConnector,
+          self
         )
       )
 
-      handlerAction.pipeTo(handler)
+      handler ! SearchProtocol.InvalidateModulesIndex
+
+      sender() ! GetSuggestionsDatabaseResult(0, Seq())
 
       context.become(
         initialized(
           projectName,
           graph,
           clients,
-          state.backgroundProcessingStarted()
+          state.backgroundProcessingStopped()
         )
       )
 
@@ -419,7 +455,8 @@ final class SuggestionsHandler(
         InvalidateModulesIndexHandler.props(
           runtimeFailureMapper,
           timeout,
-          runtimeConnector
+          runtimeConnector,
+          self
         )
       )
       action.pipeTo(handler)(sender())
@@ -450,6 +487,7 @@ final class SuggestionsHandler(
       )
 
     case SuggestionLoadingCompleted =>
+      unstashAll()
       if (state.suggestionLoadingQueue.nonEmpty) {
         self ! state.suggestionLoadingQueue.dequeue()
       }
diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/search/handler/InvalidateModulesIndexHandler.scala b/engine/language-server/src/main/scala/org/enso/languageserver/search/handler/InvalidateModulesIndexHandler.scala
index 899eb958de27..69e9dd2dacad 100644
--- a/engine/language-server/src/main/scala/org/enso/languageserver/search/handler/InvalidateModulesIndexHandler.scala
+++ b/engine/language-server/src/main/scala/org/enso/languageserver/search/handler/InvalidateModulesIndexHandler.scala
@@ -17,11 +17,13 @@ import scala.concurrent.duration.FiniteDuration
   * @param runtimeFailureMapper mapper for runtime failures
   * @param timeout request timeout
   * @param runtime reference to the runtime connector
+  * @param suggestionsHandler reference to the suggestions handler
   */
 final class InvalidateModulesIndexHandler(
   runtimeFailureMapper: RuntimeFailureMapper,
   timeout: FiniteDuration,
-  runtime: ActorRef
+  runtime: ActorRef,
+  suggestionsHandler: ActorRef
 ) extends Actor
     with LazyLogging
     with UnhandledLogging {
@@ -50,6 +52,7 @@ final class InvalidateModulesIndexHandler(
       context.stop(self)
 
     case Api.Response(_, Api.InvalidateModulesIndexResponse()) =>
+      suggestionsHandler ! SearchProtocol.ClearSuggestionsDatabase
       replyTo ! SearchProtocol.InvalidateSuggestionsDatabaseResult
       cancellable.cancel()
       context.stop(self)
@@ -67,14 +70,21 @@ object InvalidateModulesIndexHandler {
     *
     * @param runtimeFailureMapper mapper for runtime failures
     * @param timeout request timeout
-    * @param runtime reference to the runtime conector
+    * @param runtime reference to the runtime connector
+    * @param suggestionsHandler reference to the suggestions handler
     */
   def props(
     runtimeFailureMapper: RuntimeFailureMapper,
     timeout: FiniteDuration,
-    runtime: ActorRef
+    runtime: ActorRef,
+    suggestionsHandler: ActorRef
   ): Props =
     Props(
-      new InvalidateModulesIndexHandler(runtimeFailureMapper, timeout, runtime)
+      new InvalidateModulesIndexHandler(
+        runtimeFailureMapper,
+        timeout,
+        runtime,
+        suggestionsHandler
+      )
     )
 }
diff --git a/engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/LibrariesTest.scala b/engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/LibrariesTest.scala
index 1dad854a5735..e5b681e36884 100644
--- a/engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/LibrariesTest.scala
+++ b/engine/language-server/src/test/scala/org/enso/languageserver/websocket/json/LibrariesTest.scala
@@ -3,7 +3,7 @@ package org.enso.languageserver.websocket.json
 import akka.testkit._
 import io.circe.literal._
 import io.circe.{Json, JsonObject}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.FileSystem
 import org.enso.editions.{Editions, LibraryName}
 import org.enso.languageserver.libraries.LibraryEntry.PublishedLibraryVersion
@@ -41,7 +41,7 @@ class LibrariesTest
     override def libraries: Seq[DummyLibrary] = Seq(
       DummyLibrary(
         LibraryName("Foo", "Bar"),
-        SemVer(1, 0, 0),
+        SemVer.of(1, 0, 0),
         """import Standard.Base
           |
           |baz = 42
@@ -657,7 +657,7 @@ class LibrariesTest
         val cachedLibraryRoot = readOnlyCache
           .findCachedLibrary(
             LibraryName("Foo", "Bar"),
-            SemVer(1, 0, 0)
+            SemVer.of(1, 0, 0)
           )
           .value
 
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/Constants.scala b/engine/launcher/src/main/scala/org/enso/launcher/Constants.scala
index 3c036af13b55..802a6490c396 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/Constants.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/Constants.scala
@@ -1,6 +1,6 @@
 package org.enso.launcher
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 object Constants {
 
@@ -10,7 +10,7 @@ object Constants {
     * and provide better error messages if it cannot.
     */
   val uploadIntroducedVersion: SemVer =
-    SemVer(0, 2, 17, Some("SNAPSHOT"))
+    SemVer.of(0, 2, 17, "SNAPSHOT")
 
   /** The engine version in which the dependency preinstall command has been
     * introduced.
@@ -19,7 +19,7 @@ object Constants {
     * and provide better error messages if it cannot.
     */
   val preinstallDependenciesIntroducedVersion: SemVer =
-    SemVer(0, 2, 28, Some("SNAPSHOT"))
+    SemVer.of(0, 2, 28, "SNAPSHOT")
 
   /** The upload URL associated with the main Enso library repository. */
   val defaultUploadUrl = "https://publish.libraries.release.enso.org/"
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/Launcher.scala b/engine/launcher/src/main/scala/org/enso/launcher/Launcher.scala
index bdca701c7c87..8a525ee3744c 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/Launcher.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/Launcher.scala
@@ -3,7 +3,7 @@ package org.enso.launcher
 import java.nio.file.Path
 import com.typesafe.scalalogging.Logger
 import io.circe.Json
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.config.DefaultVersion
 import org.enso.editions.updater.EditionManager
 import org.enso.runtimeversionmanager.CurrentVersion
@@ -565,7 +565,9 @@ case class Launcher(cliOptions: GlobalCLIOptions) {
     if (targetVersion == CurrentVersion.version) {
       InfoLogger.info("Already up-to-date.")
       0
-    } else if (targetVersion < CurrentVersion.version && !isManuallyRequested) {
+    } else if (
+      targetVersion.isLessThan(CurrentVersion.version) && !isManuallyRequested
+    ) {
       logger.warn(
         s"The latest available version is $targetVersion, but you are " +
         s"running ${CurrentVersion.version} which is more recent."
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala b/engine/launcher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala
index dcff6c0a0afc..7e96132388bc 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala
@@ -1,7 +1,7 @@
 package org.enso.launcher.cli
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.CLIOutput
 import org.enso.distribution.locking.Resource
 import org.enso.launcher.InfoLogger
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/cli/InternalOpts.scala b/engine/launcher/src/main/scala/org/enso/launcher/cli/InternalOpts.scala
index b286ee07ef70..b67071a877d4 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/cli/InternalOpts.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/cli/InternalOpts.scala
@@ -3,7 +3,7 @@ package org.enso.launcher.cli
 import java.io.IOException
 import java.nio.file.{Files, NoSuchFileException, Path}
 import cats.implicits._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.OS
 import org.enso.cli.arguments.Opts
 import org.enso.cli.arguments.Opts.implicits._
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/cli/LauncherApplication.scala b/engine/launcher/src/main/scala/org/enso/launcher/cli/LauncherApplication.scala
index 8b018733a3bc..2d737f1d2b48 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/cli/LauncherApplication.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/cli/LauncherApplication.scala
@@ -2,7 +2,7 @@ package org.enso.launcher.cli
 
 import cats.data.NonEmptyList
 import cats.implicits._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli._
 import org.enso.cli.arguments.Opts.implicits._
 import org.enso.cli.arguments._
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/components/LauncherRunner.scala b/engine/launcher/src/main/scala/org/enso/launcher/components/LauncherRunner.scala
index 0c7115438a01..0ba483e45efb 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/components/LauncherRunner.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/components/LauncherRunner.scala
@@ -1,6 +1,6 @@
 package org.enso.launcher.components
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.{DistributionManager, Environment}
 import org.enso.editions.updater.EditionManager
 import org.enso.launcher.Constants
@@ -220,7 +220,7 @@ class LauncherRunner(
       }
 
       val version = resolveVersion(None, Some(project))
-      if (version < Constants.uploadIntroducedVersion) {
+      if (version.isLessThan(Constants.uploadIntroducedVersion)) {
         throw RunnerError(
           s"Library Upload feature is not available in Enso $version. " +
           s"Please upgrade your project to a newer version."
@@ -266,7 +266,9 @@ class LauncherRunner(
       }
 
       val version = resolveVersion(versionOverride, Some(project))
-      if (version < Constants.preinstallDependenciesIntroducedVersion) {
+      if (
+        version.isLessThan(Constants.preinstallDependenciesIntroducedVersion)
+      ) {
         throw RunnerError(
           s"Project dependency installation feature is not available in Enso " +
           s"$version. Please upgrade your project to a newer version to use it."
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherManifest.scala b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherManifest.scala
index 30d40ce53f86..5238a90c11e2 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherManifest.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherManifest.scala
@@ -1,9 +1,9 @@
 package org.enso.launcher.releases.launcher
 
 import io.circe.{yaml, Decoder}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.runtimeversionmanager.releases.ReleaseProviderException
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 
 import scala.util.{Failure, Try}
 
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherRelease.scala b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherRelease.scala
index ad133d0e6b91..cb97fce8ca96 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherRelease.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherRelease.scala
@@ -2,7 +2,7 @@ package org.enso.launcher.releases.launcher
 
 import java.nio.file.Path
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.runtimeversionmanager.CurrentVersion
 
@@ -44,5 +44,7 @@ trait LauncherRelease {
     * If false, a multi-step upgrade must be performed.
     */
   def canPerformUpgradeFromCurrentVersion: Boolean =
-    CurrentVersion.version >= minimumVersionToPerformUpgrade
+    CurrentVersion.version.isGreaterThanOrEqual(
+      minimumVersionToPerformUpgrade
+    )
 }
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherReleaseProvider.scala b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherReleaseProvider.scala
index e40b25e4495c..2626964c5447 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherReleaseProvider.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/releases/launcher/LauncherReleaseProvider.scala
@@ -2,7 +2,7 @@ package org.enso.launcher.releases.launcher
 
 import java.nio.file.Path
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.runtimeversionmanager.releases.{
   EnsoReleaseProvider,
diff --git a/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala b/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala
index 18e9419daf5a..e12f377cc8ad 100644
--- a/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala
+++ b/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala
@@ -2,7 +2,8 @@ package org.enso.launcher.upgrade
 
 import java.nio.file.{Files, Path}
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
+import org.enso.semver.SemVerOrdering._
 import org.enso.cli.{CLIOutput, OS}
 import org.enso.distribution.{DistributionManager, FileSystem}
 import org.enso.distribution.locking.{
@@ -220,7 +221,9 @@ class LauncherUpgrader(
     availableVersions: Seq[SemVer]
   ): LauncherRelease = {
     val recentEnoughVersions =
-      availableVersions.filter(_ >= release.minimumVersionToPerformUpgrade)
+      availableVersions.filter(
+        _.isGreaterThanOrEqual(release.minimumVersionToPerformUpgrade)
+      )
     val minimumValidVersion = recentEnoughVersions.sorted.headOption.getOrElse {
       throw UpgradeError(
         s"Upgrade failed: To continue upgrade, a version at least " +
@@ -338,7 +341,8 @@ class LauncherUpgrader(
       replaceLauncherExecutable(temporaryExecutable)
 
       val verb =
-        if (release.version >= CurrentVersion.version) "upgraded"
+        if (release.version.isGreaterThanOrEqual(CurrentVersion.version))
+          "upgraded"
         else "downgraded"
       InfoLogger.info(s"Successfully $verb the launcher to ${release.version}.")
     }
diff --git a/engine/launcher/src/test/scala/org/enso/launcher/DefaultVersionSpec.scala b/engine/launcher/src/test/scala/org/enso/launcher/DefaultVersionSpec.scala
index e9c21bc388fc..03be9c35b2c3 100644
--- a/engine/launcher/src/test/scala/org/enso/launcher/DefaultVersionSpec.scala
+++ b/engine/launcher/src/test/scala/org/enso/launcher/DefaultVersionSpec.scala
@@ -1,6 +1,6 @@
 package org.enso.launcher
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.config.DefaultVersion.{Exact, LatestInstalled}
 import org.enso.runtimeversionmanager.components.RuntimeVersionManager
 import org.enso.runtimeversionmanager.config.GlobalRunnerConfigurationManager
@@ -21,7 +21,7 @@ class DefaultVersionSpec extends RuntimeVersionManagerTest {
   def makeConfigurationManager(): GlobalRunnerConfigurationManager =
     makeConfigAndComponentsManagers()._2
 
-  private val latestAvailable = SemVer(0, 1, 0)
+  private val latestAvailable = SemVer.of(0, 1, 0)
 
   "enso default" should {
     "fallback to latest available version if none is installed" in {
@@ -31,12 +31,12 @@ class DefaultVersionSpec extends RuntimeVersionManagerTest {
     "fallback to latest installed version" in {
       val (componentsManager, configManager) =
         makeConfigAndComponentsManagers()
-      componentsManager.findOrInstallEngine(SemVer(0, 0, 0))
-      configManager.defaultVersion shouldEqual SemVer(0, 0, 0)
+      componentsManager.findOrInstallEngine(SemVer.of(0, 0, 0))
+      configManager.defaultVersion shouldEqual SemVer.of(0, 0, 0)
     }
 
     "set an exact version in the config" in {
-      val version              = SemVer(0, 1, 0, Some("test"))
+      val version              = SemVer.of(0, 1, 0, "test")
       val configurationManager = makeConfigurationManager()
       configurationManager.updateConfig { config =>
         config.copy(defaultVersion = Exact(version))
diff --git a/engine/launcher/src/test/scala/org/enso/launcher/components/LauncherRunnerSpec.scala b/engine/launcher/src/test/scala/org/enso/launcher/components/LauncherRunnerSpec.scala
index cc2bee40db6b..d99d55a2b633 100644
--- a/engine/launcher/src/test/scala/org/enso/launcher/components/LauncherRunnerSpec.scala
+++ b/engine/launcher/src/test/scala/org/enso/launcher/components/LauncherRunnerSpec.scala
@@ -3,7 +3,7 @@ package org.enso.launcher.components
 import java.nio.file.{Files, Path}
 import java.net.URI
 import java.util.UUID
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.editions.updater.EditionManager
 import org.enso.runtimeversionmanager.config.GlobalRunnerConfigurationManager
@@ -21,7 +21,7 @@ import scala.concurrent.Future
   * [[LauncherRunner]] in a single suite.
   */
 class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
-  private val defaultEngineVersion = SemVer(0, 0, 0, Some("default"))
+  private val defaultEngineVersion = SemVer.of(0, 0, 0, "default")
 
   private val fakeUri = URI.create("ws://test:1234/")
 
@@ -62,7 +62,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
         makeFakeRunner(extraEnv = Map("ENSO_JVM_OPTS" -> envOptions))
 
       val runSettings = RunSettings(
-        SemVer(0, 0, 0),
+        SemVer.of(0, 0, 0),
         Seq("arg1", "--flag2"),
         connectLoggerIfAvailable = true
       )
@@ -170,7 +170,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     "warn when creating a project using a nightly version" taggedAs Flaky in {
       val runner         = makeFakeRunner()
       val projectPath    = getTestDirectory / "project2"
-      val nightlyVersion = SemVer(0, 0, 0, Some("SNAPSHOT.2000-01-01"))
+      val nightlyVersion = SemVer.of(0, 0, 0, "SNAPSHOT.2000-01-01")
       val (_, logs) = TestLogger.gather[Any, Runner](
         classOf[Runner], {
           runner
@@ -217,7 +217,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     "run repl in project context" in {
       val runnerOutside = makeFakeRunner()
 
-      val version = SemVer(0, 0, 0, Some("repl-test"))
+      val version = SemVer.of(0, 0, 0, "repl-test")
       version should not equal defaultEngineVersion // sanity check
 
       val projectPath    = getTestDirectory / "project"
@@ -253,7 +253,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
       insideProject.runnerArguments.mkString(" ") should
       (include(s"--in-project $normalizedPath") and include("--repl"))
 
-      val overridden = SemVer(0, 0, 0, Some("overridden"))
+      val overridden = SemVer.of(0, 0, 0, "overridden")
       val overriddenRun = runnerInside
         .repl(
           projectPath         = Some(projectPath),
@@ -272,7 +272,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     "run language server" in {
       val runner = makeFakeRunner()
 
-      val version     = SemVer(0, 0, 0, Some("language-server-test"))
+      val version     = SemVer.of(0, 0, 0, "language-server-test")
       val projectPath = getTestDirectory / "project"
       newProject("test", projectPath, version)
 
@@ -305,7 +305,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
       commandLine should include(s"--path $normalizedPath")
       runSettings.runnerArguments.lastOption.value shouldEqual "additional"
 
-      val overridden = SemVer(0, 0, 0, Some("overridden"))
+      val overridden = SemVer.of(0, 0, 0, "overridden")
       runner
         .languageServer(
           options,
@@ -322,7 +322,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     "run a project" in {
       val runnerOutside = makeFakeRunner()
 
-      val version        = SemVer(0, 0, 0, Some("run-test"))
+      val version        = SemVer.of(0, 0, 0, "run-test")
       val projectPath    = getTestDirectory / "project"
       val normalizedPath = projectPath.toAbsolutePath.normalize.toString
       newProject("test", projectPath, version)
@@ -356,7 +356,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
       insideProject.runnerArguments.mkString(" ") should
       include(s"--run $normalizedPath")
 
-      val overridden = SemVer(0, 0, 0, Some("overridden"))
+      val overridden = SemVer.of(0, 0, 0, "overridden")
       val overriddenRun = runnerInside
         .run(
           path                = Some(projectPath),
@@ -386,7 +386,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     }
 
     "run a script outside of a project even if cwd is inside project" in {
-      val version     = SemVer(0, 0, 0, Some("run-test"))
+      val version     = SemVer.of(0, 0, 0, "run-test")
       val projectPath = getTestDirectory / "project"
       val runnerInside =
         makeFakeRunner(cwdOverride = Some(projectPath))
@@ -415,7 +415,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     }
 
     "run a script inside of a project" in {
-      val version               = SemVer(0, 0, 0, Some("run-test"))
+      val version               = SemVer.of(0, 0, 0, "run-test")
       val projectPath           = getTestDirectory / "project"
       val normalizedProjectPath = projectPath.toAbsolutePath.normalize.toString
       val runnerOutside         = makeFakeRunner()
@@ -454,7 +454,7 @@ class LauncherRunnerSpec extends RuntimeVersionManagerTest with FlakySpec {
     }
 
     "get project version inside of project" in {
-      val version      = SemVer(0, 0, 0, Some("version-test"))
+      val version      = SemVer.of(0, 0, 0, "version-test")
       val projectPath  = getTestDirectory / "project"
       val name         = "Testname"
       val runnerInside = makeFakeRunner(cwdOverride = Some(projectPath))
diff --git a/engine/launcher/src/test/scala/org/enso/launcher/components/UploadVersionCheck.scala b/engine/launcher/src/test/scala/org/enso/launcher/components/UploadVersionCheck.scala
index 4d54be924b9c..a9a9ab084f8b 100644
--- a/engine/launcher/src/test/scala/org/enso/launcher/components/UploadVersionCheck.scala
+++ b/engine/launcher/src/test/scala/org/enso/launcher/components/UploadVersionCheck.scala
@@ -1,6 +1,6 @@
 package org.enso.launcher.components
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.launcher.Constants
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
@@ -9,18 +9,30 @@ class UploadVersionCheck extends AnyWordSpec with Matchers {
   "Constants.uploadIntroducedVersion" should {
     "correctly compare with nearby versions" in {
       assert(
-        SemVer("0.2.17-SNAPSHOT.2021-07-23").get >=
-        Constants.uploadIntroducedVersion
+        SemVer
+          .parse("0.2.17-SNAPSHOT.2021-07-23")
+          .get
+          .isGreaterThanOrEqual(
+            Constants.uploadIntroducedVersion
+          )
       )
 
       assert(
-        SemVer("0.2.17").get >
-        Constants.uploadIntroducedVersion
+        SemVer
+          .parse("0.2.17")
+          .get
+          .isGreaterThan(
+            Constants.uploadIntroducedVersion
+          )
       )
 
       assert(
-        SemVer("0.2.16").get <
-        Constants.uploadIntroducedVersion
+        SemVer
+          .parse("0.2.16")
+          .get
+          .isLessThan(
+            Constants.uploadIntroducedVersion
+          )
       )
     }
   }
diff --git a/engine/launcher/src/test/scala/org/enso/launcher/project/ProjectManagerSpec.scala b/engine/launcher/src/test/scala/org/enso/launcher/project/ProjectManagerSpec.scala
index f3da2a14f471..aea2c701555e 100644
--- a/engine/launcher/src/test/scala/org/enso/launcher/project/ProjectManagerSpec.scala
+++ b/engine/launcher/src/test/scala/org/enso/launcher/project/ProjectManagerSpec.scala
@@ -1,6 +1,6 @@
 package org.enso.launcher.project
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.DistributionManager
 import org.enso.runtimeversionmanager.config.GlobalRunnerConfigurationManager
 import org.enso.runtimeversionmanager.test.RuntimeVersionManagerTest
@@ -11,7 +11,7 @@ class ProjectManagerSpec
     extends RuntimeVersionManagerTest
     with Inside
     with OptionValues {
-  private val defaultEnsoVersion = SemVer(0, 0, 0, Some("default"))
+  private val defaultEnsoVersion = SemVer.of(0, 0, 0, "default")
   def makeProjectManager()
     : (GlobalRunnerConfigurationManager, ProjectManager) = {
     val env                 = fakeInstalledEnvironment()
diff --git a/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala b/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala
index 52900cdc660f..963dd822eeba 100644
--- a/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala
+++ b/engine/launcher/src/test/scala/org/enso/launcher/upgrade/UpgradeSpec.scala
@@ -2,7 +2,7 @@ package org.enso.launcher.upgrade
 
 import java.nio.file.{Files, Path, StandardCopyOption}
 import io.circe.parser
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.FileSystem
 import org.enso.distribution.locking.{FileLockManager, LockType}
 import FileSystem.PathSyntax
@@ -64,11 +64,11 @@ class UpgradeSpec
 
   override def beforeAll(): Unit = {
     super.beforeAll()
-    prepareLauncherBinary(SemVer(0, 0, 0))
-    prepareLauncherBinary(SemVer(0, 0, 1))
-    prepareLauncherBinary(SemVer(0, 0, 2))
-    prepareLauncherBinary(SemVer(0, 0, 3))
-    prepareLauncherBinary(SemVer(0, 0, 4))
+    prepareLauncherBinary(SemVer.of(0, 0, 0))
+    prepareLauncherBinary(SemVer.of(0, 0, 1))
+    prepareLauncherBinary(SemVer.of(0, 0, 2))
+    prepareLauncherBinary(SemVer.of(0, 0, 3))
+    prepareLauncherBinary(SemVer.of(0, 0, 4))
   }
 
   /** Prepares a launcher distribution in the temporary test location.
@@ -120,7 +120,9 @@ class UpgradeSpec
         1
       )
     }
-    SemVer(version.asObject.value.apply("version").value.asString.value).value
+    SemVer
+      .parse(version.asObject.value.apply("version").value.asString.value)
+      .get
   }
 
   /** Runs the launcher in the temporary distribution.
@@ -165,16 +167,19 @@ class UpgradeSpec
     "upgrade to latest version (excluding broken)" taggedAs Flaky in {
       prepareDistribution(
         portable        = true,
-        launcherVersion = Some(SemVer(0, 0, 2))
+        launcherVersion = Some(SemVer.of(0, 0, 2))
       )
       run(Seq("upgrade")) should returnSuccess
 
-      checkVersion() shouldEqual SemVer(0, 0, 4)
+      checkVersion() shouldEqual SemVer.of(0, 0, 4)
     }
 
     "not downgrade without being explicitly asked to do so" taggedAs Flaky in {
       // precondition for the test to make sense
-      SemVer(buildinfo.Info.ensoVersion).value should be > SemVer(0, 0, 4)
+      SemVer
+        .parse(buildinfo.Info.ensoVersion)
+        .get
+        .isGreaterThan(SemVer.of(0, 0, 4)) shouldBe true
 
       prepareDistribution(
         portable = true
@@ -185,7 +190,10 @@ class UpgradeSpec
     "upgrade/downgrade to a specific version " +
     "(and update necessary files)" taggedAs Flaky in {
       // precondition for the test to make sense
-      SemVer(buildinfo.Info.ensoVersion).value should be > SemVer(0, 0, 4)
+      SemVer
+        .parse(buildinfo.Info.ensoVersion)
+        .get
+        .isGreaterThan(SemVer.of(0, 0, 4)) shouldBe true
 
       prepareDistribution(
         portable = true
@@ -193,7 +201,7 @@ class UpgradeSpec
       val root = launcherPath.getParent.getParent
       FileSystem.writeTextFile(root / "README.md", "Old readme")
       run(Seq("upgrade", "0.0.1")) should returnSuccess
-      checkVersion() shouldEqual SemVer(0, 0, 1)
+      checkVersion() shouldEqual SemVer.of(0, 0, 1)
       TestHelpers.readFileContent(root / "README.md").trim shouldEqual "Content"
       TestHelpers
         .readFileContent(root / "THIRD-PARTY" / "test-license.txt")
@@ -203,11 +211,11 @@ class UpgradeSpec
     "upgrade also in installed mode" taggedAs Flaky in {
       prepareDistribution(
         portable        = false,
-        launcherVersion = Some(SemVer(0, 0, 0))
+        launcherVersion = Some(SemVer.of(0, 0, 0))
       )
       val dataRoot   = getTestDirectory / "data"
       val configRoot = getTestDirectory / "config"
-      checkVersion() shouldEqual SemVer(0, 0, 0)
+      checkVersion() shouldEqual SemVer.of(0, 0, 0)
       val env = Map(
         "ENSO_DATA_DIRECTORY"    -> dataRoot.toString,
         "ENSO_CONFIG_DIRECTORY"  -> configRoot.toString,
@@ -215,7 +223,7 @@ class UpgradeSpec
       )
 
       run(Seq("upgrade", "0.0.1"), extraEnv = env) should returnSuccess
-      checkVersion() shouldEqual SemVer(0, 0, 1)
+      checkVersion() shouldEqual SemVer.of(0, 0, 1)
       TestHelpers
         .readFileContent(dataRoot / "README.md")
         .trim shouldEqual "Content"
@@ -230,15 +238,15 @@ class UpgradeSpec
       // 0.0.0 -> 0.0.1 -> 0.0.2 -> 0.0.3
       prepareDistribution(
         portable        = true,
-        launcherVersion = Some(SemVer(0, 0, 0))
+        launcherVersion = Some(SemVer.of(0, 0, 0))
       )
 
-      checkVersion() shouldEqual SemVer(0, 0, 0)
+      checkVersion() shouldEqual SemVer.of(0, 0, 0)
       val process = startLauncher(Seq("upgrade", "0.0.3"))
       try {
         process.join(timeoutSeconds = 30) should returnSuccess
 
-        checkVersion() shouldEqual SemVer(0, 0, 3)
+        checkVersion() shouldEqual SemVer.of(0, 0, 3)
 
         val launchedVersions = Seq(
           "0.0.0",
@@ -281,7 +289,7 @@ class UpgradeSpec
     "that action with the upgraded launcher" ignore {
       prepareDistribution(
         portable        = true,
-        launcherVersion = Some(SemVer(0, 0, 2))
+        launcherVersion = Some(SemVer.of(0, 0, 2))
       )
       val enginesPath = getTestDirectory / "enso" / "dist"
       Files.createDirectories(enginesPath)
@@ -318,7 +326,7 @@ class UpgradeSpec
     "fail if another upgrade is running in parallel" taggedAs Flaky in {
       prepareDistribution(
         portable        = true,
-        launcherVersion = Some(SemVer(0, 0, 1))
+        launcherVersion = Some(SemVer.of(0, 0, 1))
       )
 
       val syncLocker = new FileLockManager(getTestDirectory / "enso" / "lock")
@@ -364,7 +372,7 @@ class UpgradeSpec
       }
 
       firstSuspended.join(timeoutSeconds = 20) should returnSuccess
-      checkVersion() shouldEqual SemVer(0, 0, 2)
+      checkVersion() shouldEqual SemVer.of(0, 0, 2)
     }
   }
 }
diff --git a/engine/runner/src/main/scala/org/enso/runner/CurrentVersion.scala b/engine/runner/src/main/scala/org/enso/runner/CurrentVersion.scala
index a0392bc9f26f..c7adb0d92c42 100644
--- a/engine/runner/src/main/scala/org/enso/runner/CurrentVersion.scala
+++ b/engine/runner/src/main/scala/org/enso/runner/CurrentVersion.scala
@@ -1,6 +1,6 @@
 package org.enso.runner
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** A helper object that allows to access current version of the runner.
   *
@@ -15,17 +15,18 @@ object CurrentVersion {
   lazy val version: SemVer = computeVersion()
 
   private def computeVersion(): SemVer = {
-    val buildVersion = SemVer(buildinfo.Info.ensoVersion).getOrElse {
-      throw new IllegalStateException(
-        "Fatal error: Enso version included in buildinfo is not a valid " +
-        "semver string, this should never happen."
-      )
-    }
+    val buildVersion =
+      SemVer.parse(buildinfo.Info.ensoVersion).getOrElse {
+        throw new IllegalStateException(
+          "Fatal error: Enso version included in buildinfo is not a valid " +
+          "semver string, this should never happen."
+        )
+      }
     if (buildinfo.Info.isRelease) buildVersion
     else
       sys.props
         .get("enso.version.override")
-        .flatMap(SemVer(_))
+        .flatMap(v => SemVer.parse(v).toOption)
         .getOrElse(buildVersion)
   }
 }
diff --git a/engine/runner/src/main/scala/org/enso/runner/ProjectUploader.scala b/engine/runner/src/main/scala/org/enso/runner/ProjectUploader.scala
index 11632bfdbac1..28ad2a67091c 100644
--- a/engine/runner/src/main/scala/org/enso/runner/ProjectUploader.scala
+++ b/engine/runner/src/main/scala/org/enso/runner/ProjectUploader.scala
@@ -33,7 +33,6 @@ object ProjectUploader {
     showProgress: Boolean,
     logLevel: Level
   ): Unit = {
-    import scala.concurrent.ExecutionContext.Implicits.global
     val progressReporter = new ProgressReporter {
       override def trackProgress(
         message: String,
diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java
index 7b7c9d8e1300..0b739c96731d 100644
--- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java
+++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/EqualsBenchmarks.java
@@ -75,6 +75,21 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception {
         new StringBuilder(
             """
         import Standard.Base.Data.Range.Extensions
+        import Standard.Base.Data.Numbers.Number
+        import Standard.Base.Data.Ordering.Ordering
+        import Standard.Base.Data.Ordering.Comparable
+        import Standard.Base.Data.Ordering.Default_Comparator
+
+        type Num
+            Value n
+
+        Num.from (that:Number) = Num.Value that
+        Comparable.from (_:Number) = Num_Comparator
+        Comparable.from (_:Num) = Num_Comparator
+
+        type Num_Comparator
+            compare x:Num y:Num = Ordering.compare x.n y.n
+            hash x:Num = Default_Comparator.hash x.n
 
         type Node
             C1 f1
@@ -87,7 +102,9 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception {
 
         eq_vec vec1 vec2 =
             (0.up_to vec1.length).map idx->
-                (vec1.at idx) == (vec2.at idx)
+                v1 = vec1.at idx
+                v2 = vec2.at idx
+                v1 == v2
 
         eq x y = x == y
         """);
@@ -108,10 +125,37 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception {
                 primitiveVectorSize / 64);
         codeBuilder
             .append(
-                generateVectorOfPrimitives(primitiveVectorSize, "vec1", 42, trueExpectedAt, random))
+                generateVectorOfPrimitives(
+                    primitiveVectorSize, "vec1", 42, trueExpectedAt, random, "%d", "%f"))
+            .append("\n")
+            .append(
+                generateVectorOfPrimitives(
+                    primitiveVectorSize, "vec2", 42, trueExpectedAt, random, "%d", "%f"))
+            .append("\n");
+      }
+      case "equalsWithConversion" -> {
+        trueExpectedAt =
+            Set.of(
+                primitiveVectorSize / 2,
+                primitiveVectorSize / 4,
+                primitiveVectorSize / 8,
+                primitiveVectorSize / 16,
+                primitiveVectorSize / 32,
+                primitiveVectorSize / 64);
+        codeBuilder
+            .append(
+                generateVectorOfPrimitives(
+                    primitiveVectorSize, "vec1", 42, trueExpectedAt, random, "%d", "%f"))
             .append("\n")
             .append(
-                generateVectorOfPrimitives(primitiveVectorSize, "vec2", 42, trueExpectedAt, random))
+                generateVectorOfPrimitives(
+                    primitiveVectorSize,
+                    "vec2",
+                    42,
+                    trueExpectedAt,
+                    random,
+                    "Num.Value %d",
+                    "Num.Value %f"))
             .append("\n");
       }
       case "equalsStrings" -> {
@@ -141,7 +185,7 @@ public void initializeBenchmark(BenchmarkParams params) throws Exception {
     }
 
     codeBuilder.append("""
-        bench x = eq_vec vec1 vec2
+        bench _ = eq_vec vec1 vec2
         """);
 
     module = ctx.eval(SrcUtil.source(benchmarkName, codeBuilder.toString()));
@@ -171,6 +215,11 @@ public void equalsPrimitives(Blackhole blackHole) {
     performBenchmark(blackHole);
   }
 
+  @Benchmark
+  public void equalsWithConversion(Blackhole blackHole) {
+    performBenchmark(blackHole);
+  }
+
   @Benchmark
   public void equalsStrings(Blackhole blackhole) {
     performBenchmark(blackhole);
@@ -207,7 +256,9 @@ private static String generateVectorOfPrimitives(
       String vecName,
       Object identityElem,
       Collection<Integer> constantIdxs,
-      Random random) {
+      Random random,
+      String intFormat,
+      String doubleFormat) {
     var partSize = totalSize / 2;
     List<Object> primitiveValues = new ArrayList<>();
     random.ints(partSize).forEach(primitiveValues::add);
@@ -221,9 +272,9 @@ private static String generateVectorOfPrimitives(
     sb.append(vecName).append(" = [");
     for (Object primitiveValue : primitiveValues) {
       if (primitiveValue instanceof Double dbl) {
-        sb.append(String.format("%f", dbl)).append(",");
+        sb.append(String.format(doubleFormat, dbl)).append(",");
       } else {
-        sb.append(primitiveValue).append(",");
+        sb.append(String.format(intFormat, primitiveValue)).append(",");
       }
     }
     // Replace last comma
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/data/BindingsMap.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/data/BindingsMap.scala
index 1ac006718507..ed8010912e64 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/data/BindingsMap.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/data/BindingsMap.scala
@@ -21,10 +21,6 @@ import scala.annotation.unused
   * @param definedEntities the list of entities defined in the current module
   * @param currentModule the module holding these bindings
   */
-
-@SerialVersionUID(
-  9057L // Use BindingsMap
-)
 case class BindingsMap(
   definedEntities: List[DefinedEntity],
   currentModule: ModuleReference
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/ExecuteExpressionCommand.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/ExecuteExpressionCommand.java
index cc0996b01b71..632b48c37b33 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/ExecuteExpressionCommand.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/ExecuteExpressionCommand.java
@@ -4,14 +4,13 @@
 import org.enso.interpreter.instrument.execution.RuntimeContext;
 import org.enso.interpreter.instrument.job.ExecuteExpressionJob;
 import org.enso.interpreter.instrument.job.ExecuteJob;
+import org.enso.polyglot.runtime.Runtime$Api$ContextNotExistError;
 import org.enso.polyglot.runtime.Runtime$Api$VisualizationAttached;
 import scala.Option;
 import scala.concurrent.ExecutionContext;
-import scala.concurrent.Future;
-import scala.runtime.BoxedUnit;
 
 /** The command that handles the execute expression request. */
-public final class ExecuteExpressionCommand extends ContextCmd {
+public final class ExecuteExpressionCommand extends SynchronousCommand {
 
   private final UUID contextId;
   private final UUID visualizationId;
@@ -33,7 +32,7 @@ public ExecuteExpressionCommand(
       UUID visualizationId,
       UUID expressionId,
       String expression) {
-    super(contextId, maybeRequestId);
+    super(maybeRequestId);
     this.contextId = contextId;
     this.visualizationId = visualizationId;
     this.expressionId = expressionId;
@@ -41,10 +40,15 @@ public ExecuteExpressionCommand(
   }
 
   @Override
-  public Future<BoxedUnit> executeCmd(RuntimeContext ctx, ExecutionContext ec) {
-    reply(new Runtime$Api$VisualizationAttached(), ctx);
-    return ctx.jobProcessor()
-        .run(new ExecuteExpressionJob(contextId, visualizationId, expressionId, expression))
-        .flatMap(executable -> ctx.jobProcessor().run(ExecuteJob.apply(executable)), ec);
+  public void executeSynchronously(RuntimeContext ctx, ExecutionContext ec) {
+    if (ctx.contextManager().contains(contextId)) {
+      reply(new Runtime$Api$VisualizationAttached(), ctx);
+      ctx.jobControlPlane().abortJobs(contextId);
+      ctx.jobProcessor()
+          .run(new ExecuteExpressionJob(contextId, visualizationId, expressionId, expression))
+          .flatMap(executable -> ctx.jobProcessor().run(ExecuteJob.apply(executable)), ec);
+    } else {
+      reply(new Runtime$Api$ContextNotExistError(contextId), ctx);
+    }
   }
 }
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/InvalidateModulesIndexCommand.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/InvalidateModulesIndexCommand.java
index 7edaa2710840..3e61838cacd7 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/InvalidateModulesIndexCommand.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/command/InvalidateModulesIndexCommand.java
@@ -5,7 +5,6 @@
 import java.util.logging.Level;
 import org.enso.interpreter.instrument.execution.RuntimeContext;
 import org.enso.interpreter.instrument.job.DeserializeLibrarySuggestionsJob;
-import org.enso.interpreter.instrument.job.StartBackgroundProcessingJob;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.polyglot.runtime.Runtime$Api$InvalidateModulesIndexResponse;
 import scala.Option;
@@ -33,6 +32,7 @@ public Future<BoxedUnit> executeAsynchronously(RuntimeContext ctx, ExecutionCont
           TruffleLogger logger = ctx.executionService().getLogger();
           long writeCompilationLockTimestamp = ctx.locking().acquireWriteCompilationLock();
           try {
+            ctx.jobControlPlane().stopBackgroundJobs();
             ctx.jobControlPlane().abortBackgroundJobs(DeserializeLibrarySuggestionsJob.class);
 
             EnsoContext context = ctx.executionService().getContext();
@@ -48,7 +48,6 @@ public Future<BoxedUnit> executeAsynchronously(RuntimeContext ctx, ExecutionCont
                       return BoxedUnit.UNIT;
                     });
 
-            StartBackgroundProcessingJob.startBackgroundJobs(ctx);
             reply(new Runtime$Api$InvalidateModulesIndexResponse(), ctx);
           } finally {
             ctx.locking().releaseWriteCompilationLock();
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/BackgroundJob.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/BackgroundJob.java
index 3ecac0f03651..23bf01a84d45 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/BackgroundJob.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/BackgroundJob.java
@@ -22,6 +22,17 @@ public BackgroundJob(int priority) {
     this.priority = priority;
   }
 
+  /**
+   * Create a background job with priority.
+   *
+   * @param priority the job priority. Lower number indicates higher priority.
+   * @param mayInterruptIfRunning the flag indicating if the running job may be interrupted.
+   */
+  public BackgroundJob(int priority, boolean mayInterruptIfRunning) {
+    super(List$.MODULE$.empty(), true, mayInterruptIfRunning);
+    this.priority = priority;
+  }
+
   /**
    * @return the job priority.
    */
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/ExecuteExpressionJob.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/ExecuteExpressionJob.java
index 2ef4f30f3582..c86b581b7785 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/ExecuteExpressionJob.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/ExecuteExpressionJob.java
@@ -3,13 +3,13 @@
 import com.oracle.truffle.api.TruffleLogger;
 import java.util.UUID;
 import java.util.logging.Level;
-import org.enso.interpreter.instrument.Visualization;
+import org.enso.interpreter.instrument.OneshotExpression;
 import org.enso.interpreter.instrument.execution.Executable;
 import org.enso.interpreter.instrument.execution.RuntimeContext;
 import org.enso.interpreter.util.ScalaConversions;
 
 /** The job that schedules the execution of the expression. */
-public class ExecuteExpressionJob extends Job<Executable> {
+public class ExecuteExpressionJob extends Job<Executable> implements UniqueJob<Executable> {
 
   private final UUID contextId;
   private final UUID visualizationId;
@@ -26,7 +26,7 @@ public class ExecuteExpressionJob extends Job<Executable> {
    */
   public ExecuteExpressionJob(
       UUID contextId, UUID visualizationId, UUID expressionId, String expression) {
-    super(ScalaConversions.cons(contextId, ScalaConversions.nil()), false, false);
+    super(ScalaConversions.cons(contextId, ScalaConversions.nil()), true, false);
     this.contextId = contextId;
     this.visualizationId = visualizationId;
     this.expressionId = expressionId;
@@ -39,9 +39,9 @@ public Executable run(RuntimeContext ctx) {
     long lockTimestamp = ctx.locking().acquireContextLock(contextId);
 
     try {
-      Visualization visualization =
-          new Visualization.OneshotExpression(visualizationId, expressionId, contextId, expression);
-      ctx.contextManager().upsertVisualization(contextId, visualization);
+      OneshotExpression oneshotExpression =
+          new OneshotExpression(visualizationId, expressionId, contextId, expression);
+      ctx.contextManager().setOneshotExpression(contextId, oneshotExpression);
 
       var stack = ctx.contextManager().getStack(contextId);
       return new Executable(contextId, stack);
@@ -55,4 +55,9 @@ public Executable run(RuntimeContext ctx) {
           });
     }
   }
+
+  @Override
+  public boolean equalsTo(UniqueJob<?> that) {
+    return that instanceof ExecuteExpressionJob;
+  }
 }
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionCallbacks.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionCallbacks.java
index ccec934ea0bc..a5db5144f24e 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionCallbacks.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionCallbacks.java
@@ -6,9 +6,9 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 import org.enso.interpreter.instrument.MethodCallsCache;
+import org.enso.interpreter.instrument.OneshotExpression;
 import org.enso.interpreter.instrument.RuntimeCache;
 import org.enso.interpreter.instrument.UpdatesSynchronizationState;
-import org.enso.interpreter.instrument.Visualization;
 import org.enso.interpreter.instrument.VisualizationHolder;
 import org.enso.interpreter.instrument.profiling.ExecutionTime;
 import org.enso.interpreter.instrument.profiling.ProfilingInfo;
@@ -22,7 +22,6 @@
 import org.enso.interpreter.service.ExecutionService.FunctionCallInfo;
 import org.enso.polyglot.debugger.ExecutedVisualization;
 import org.enso.polyglot.debugger.IdExecutionService;
-import scala.collection.Iterator;
 
 final class ExecutionCallbacks implements IdExecutionService.Callbacks {
 
@@ -164,24 +163,21 @@ private void callOnCachedCallback(UUID nodeId, Object result) {
   }
 
   private void executeOneshotExpressions(UUID nodeId, Object result, IdExecutionService.Info info) {
-    Iterator<Visualization> visualizations = findVisualizations(nodeId);
-    while (visualizations.hasNext()) {
-      Visualization visualization = visualizations.next();
-
-      if (visualization instanceof Visualization.OneshotExpression oneshotExpression) {
-        Object visualizationResult = null;
-        Throwable visualizationError = null;
-        try {
-          visualizationResult = info.eval(oneshotExpression.expression());
-        } catch (Exception exception) {
-          visualizationError = exception;
-        }
-
-        ExecutedVisualization executedVisualization =
-            new ExecutedVisualization(
-                visualizationResult, visualizationError, visualization.id(), nodeId, result);
-        callOnExecutedVisualizationCallback(executedVisualization);
+    OneshotExpression oneshotExpression = getOneshotExpression(nodeId);
+
+    if (oneshotExpression != null) {
+      Object visualizationResult = null;
+      Throwable visualizationError = null;
+      try {
+        visualizationResult = info.eval(oneshotExpression.expression());
+      } catch (Exception exception) {
+        visualizationError = exception;
       }
+
+      ExecutedVisualization executedVisualization =
+          new ExecutedVisualization(
+              visualizationResult, visualizationError, oneshotExpression.id(), nodeId, result);
+      callOnExecutedVisualizationCallback(executedVisualization);
     }
   }
 
@@ -196,8 +192,8 @@ private Object getCachedResult(UUID nodeId) {
   }
 
   @CompilerDirectives.TruffleBoundary
-  private Iterator<Visualization> findVisualizations(UUID nodeId) {
-    return visualizationHolder.find(nodeId).iterator();
+  private OneshotExpression getOneshotExpression(UUID nodeId) {
+    return visualizationHolder.getOneshotExpression(nodeId);
   }
 
   @CompilerDirectives.TruffleBoundary
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/CacheInvalidation.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/CacheInvalidation.scala
index 8c501ddfbba0..8b209a7ebab3 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/CacheInvalidation.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/CacheInvalidation.scala
@@ -153,9 +153,8 @@ object CacheInvalidation {
     command: Command,
     indexes: Set[IndexSelector] = Set()
   ): Unit =
-    visualizations.collect {
-      case visualization: Visualization.AttachedVisualization =>
-        run(visualization.cache, command, indexes)
+    visualizations.foreach { visualization =>
+      run(visualization.cache, command, indexes)
     }
 
   /** Run a cache invalidation instruction on an execution stack.
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/ExecutionContextManager.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/ExecutionContextManager.scala
index ca10d4d142ea..e56a7a2b4d01 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/ExecutionContextManager.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/ExecutionContextManager.scala
@@ -90,6 +90,20 @@ class ExecutionContextManager {
       contexts.contains(contextId)
     }
 
+  /** Set oneshot expression for the specified context.
+    *
+    * @param contextId the identifier of the execution context
+    * @param oneshotExpression the oneshot visualization
+    */
+  def setOneshotExpression(
+    contextId: ContextId,
+    oneshotExpression: OneshotExpression
+  ): Unit =
+    synchronized {
+      val state = contexts(contextId)
+      state.visualizations.setOneshotExpression(oneshotExpression)
+    }
+
   /** Upserts a visualization for the specified context.
     *
     * @param contextId the identifier of the execution context
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/Visualization.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/Visualization.scala
index d1c31dfc3169..74ae1a70fe53 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/Visualization.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/Visualization.scala
@@ -8,41 +8,34 @@ import org.enso.polyglot.runtime.Runtime.Api.{
   VisualizationId
 }
 
-sealed trait Visualization {
-  def id:           VisualizationId
-  def expressionId: ExpressionId
-}
-object Visualization {
-
-  /** An object containing visualization data.
-    *
-    * @param id the unique identifier of visualization
-    * @param expressionId the identifier of expression that the visualization is
-    *                     attached to
-    * @param callback the callable expression used to generate visualization data
-    */
-  case class AttachedVisualization(
-    id: VisualizationId,
-    expressionId: ExpressionId,
-    cache: RuntimeCache,
-    module: Module,
-    config: VisualizationConfiguration,
-    visualizationExpressionId: Option[ExpressionId],
-    callback: AnyRef,
-    arguments: Vector[AnyRef]
-  ) extends Visualization
+/** An object containing visualization data.
+  *
+  * @param id the unique identifier of visualization
+  * @param expressionId the identifier of expression that the visualization is
+  *                     attached to
+  * @param callback the callable expression used to generate visualization data
+  */
+case class Visualization(
+  id: VisualizationId,
+  expressionId: ExpressionId,
+  cache: RuntimeCache,
+  module: Module,
+  config: VisualizationConfiguration,
+  visualizationExpressionId: Option[ExpressionId],
+  callback: AnyRef,
+  arguments: Vector[AnyRef]
+)
 
-  /** An expression that will be executed in the local scope.
-    *
-    * @param id the unique identifier of visualization
-    * @param expressionId the identifier of expression that provides the execution scope
-    * @param executionContextId the identifier of the execution context
-    * @param expression the expression to execute
-    */
-  case class OneshotExpression(
-    id: VisualizationId,
-    expressionId: ExpressionId,
-    executionContextId: ContextId,
-    expression: String
-  ) extends Visualization
-}
+/** An expression that will be executed in the local scope.
+  *
+  * @param id the unique identifier of visualization
+  * @param expressionId the identifier of expression that provides the execution scope
+  * @param executionContextId the identifier of the execution context
+  * @param expression the expression to execute
+  */
+case class OneshotExpression(
+  id: VisualizationId,
+  expressionId: ExpressionId,
+  executionContextId: ContextId,
+  expression: String
+)
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/VisualizationHolder.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/VisualizationHolder.scala
index 60ea14868f42..01065ee58802 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/VisualizationHolder.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/VisualizationHolder.scala
@@ -9,6 +9,8 @@ import scala.collection.mutable
   */
 class VisualizationHolder {
 
+  private var oneshotExpression: OneshotExpression = _
+
   private val visualizationMap: mutable.Map[ExpressionId, List[Visualization]] =
     mutable.Map.empty.withDefaultValue(List.empty)
 
@@ -52,9 +54,9 @@ class VisualizationHolder {
     */
   def findByModule(
     module: QualifiedName
-  ): Iterable[Visualization.AttachedVisualization] =
+  ): Iterable[Visualization] =
     visualizationMap.values.flatten.collect {
-      case visualization: Visualization.AttachedVisualization
+      case visualization: Visualization
           if visualization.module.getName == module =>
         visualization
     }
@@ -70,6 +72,24 @@ class VisualizationHolder {
   /** @return all available visualizations. */
   def getAll: Iterable[Visualization] =
     visualizationMap.values.flatten
+
+  /** @return the oneshot expression attached to the `expressionId`. */
+  def getOneshotExpression(
+    expressionId: ExpressionId
+  ): OneshotExpression = {
+    if (
+      oneshotExpression != null && oneshotExpression.expressionId == expressionId
+    ) {
+      return oneshotExpression
+    }
+
+    null
+  }
+
+  /** Set oneshot expression for execution. */
+  def setOneshotExpression(oneshotExpression: OneshotExpression): Unit = {
+    this.oneshotExpression = oneshotExpression
+  }
 }
 
 object VisualizationHolder {
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/command/StartBackgroundProcessingCmd.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/command/StartBackgroundProcessingCmd.scala
index 5194accc483a..bde3651c8e37 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/command/StartBackgroundProcessingCmd.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/command/StartBackgroundProcessingCmd.scala
@@ -19,8 +19,7 @@ final class StartBackgroundProcessingCmd(
     ctx: RuntimeContext,
     ec: ExecutionContext
   ): Future[Unit] = {
-    StartBackgroundProcessingJob.startBackgroundJobs()
-    Future.successful(())
+    Future(StartBackgroundProcessingJob.startBackgroundJobs())
   }
 
 }
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala
index 7f9277f19bdb..2e1bbe71763e 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/DeserializeLibrarySuggestionsJob.scala
@@ -14,7 +14,7 @@ import scala.jdk.CollectionConverters._
   */
 final class DeserializeLibrarySuggestionsJob(
   val libraryName: LibraryName
-) extends BackgroundJob[Unit](DeserializeLibrarySuggestionsJob.Priority)
+) extends BackgroundJob[Unit](DeserializeLibrarySuggestionsJob.Priority, true)
     with UniqueJob[Unit] {
 
   /** @inheritdoc */
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala
index a36e2c5b995b..4613e58be57d 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/EnsureCompiledJob.scala
@@ -532,14 +532,10 @@ final class EnsureCompiledJob(
 
   private def getCacheMetadata(
     visualization: Visualization
-  ): Option[CachePreferenceAnalysis.Metadata] =
-    visualization match {
-      case visualization: Visualization.AttachedVisualization =>
-        val module = visualization.module
-        module.getIr.getMetadata(CachePreferenceAnalysis)
-      case _: Visualization.OneshotExpression =>
-        None
-    }
+  ): Option[CachePreferenceAnalysis.Metadata] = {
+    val module = visualization.module
+    module.getIr.getMetadata(CachePreferenceAnalysis)
+  }
 
   /** Get all project modules in the current compiler scope. */
   private def getProjectModulesInScope(implicit
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
index b22b7b4ac07c..6140da55f799 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
@@ -483,22 +483,21 @@ object ProgramExecutionSupport {
           contextId,
           value.getExpressionId
         )
-      visualizations.collect {
-        case visualization: Visualization.AttachedVisualization =>
-          executeAndSendVisualizationUpdate(
-            contextId,
-            syncState,
-            visualization,
-            value.getExpressionId,
-            value.getValue
-          )
+      visualizations.foreach { visualization =>
+        executeAndSendVisualizationUpdate(
+          contextId,
+          syncState,
+          visualization,
+          value.getExpressionId,
+          value.getValue
+        )
       }
     }
   }
 
   private def executeVisualization(
     contextId: ContextId,
-    visualization: Visualization.AttachedVisualization,
+    visualization: Visualization,
     expressionId: UUID,
     expressionValue: AnyRef
   )(implicit ctx: RuntimeContext): Either[Throwable, AnyRef] =
@@ -614,25 +613,23 @@ object ProgramExecutionSupport {
     visualization: Visualization,
     expressionId: UUID,
     expressionValue: AnyRef
-  )(implicit ctx: RuntimeContext): Unit =
-    visualization match {
-      case visualization: Visualization.AttachedVisualization =>
-        val visualizationResult = executeVisualization(
-          contextId,
-          visualization,
-          expressionId,
-          expressionValue
-        )
-        sendVisualizationUpdate(
-          visualizationResult,
-          contextId,
-          syncState,
-          visualization.id,
-          expressionId,
-          expressionValue
-        )
-      case _: Visualization.OneshotExpression =>
-    }
+  )(implicit ctx: RuntimeContext): Unit = {
+    val visualizationResult =
+      executeVisualization(
+        contextId,
+        visualization,
+        expressionId,
+        expressionValue
+      )
+    sendVisualizationUpdate(
+      visualizationResult,
+      contextId,
+      syncState,
+      visualization.id,
+      expressionId,
+      expressionValue
+    )
+  }
 
   /** Convert the result of Enso visualization function to a byte array.
     *
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/UpsertVisualizationJob.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/UpsertVisualizationJob.scala
index 1ad8aaa58071..78ac32396e58 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/UpsertVisualizationJob.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/UpsertVisualizationJob.scala
@@ -210,39 +210,30 @@ object UpsertVisualizationJob {
     */
   def upsertVisualization(
     visualization: Visualization
-  )(implicit ctx: RuntimeContext): Unit =
-    visualization match {
-      case visualization: Visualization.AttachedVisualization =>
-        val visualizationConfig = visualization.config
-        val expressionId        = visualization.expressionId
-        val visualizationId     = visualization.id
-        val maybeCallable =
-          evaluateVisualizationExpression(
-            visualizationConfig.visualizationModule,
-            visualizationConfig.expression
-          )
-
-        maybeCallable.foreach { result =>
-          updateAttachedVisualization(
-            visualizationId,
-            expressionId,
-            result.module,
-            visualizationConfig,
-            result.callback,
-            result.arguments
-          )
-          val stack =
-            ctx.contextManager.getStack(visualizationConfig.executionContextId)
-          requireVisualizationSynchronization(stack, expressionId)
-        }
-
-      case visualization: Visualization.OneshotExpression =>
-        ctx.contextManager.upsertVisualization(
-          visualization.executionContextId,
-          visualization
-        )
+  )(implicit ctx: RuntimeContext): Unit = {
+    val visualizationConfig = visualization.config
+    val expressionId        = visualization.expressionId
+    val visualizationId     = visualization.id
+    val maybeCallable =
+      evaluateVisualizationExpression(
+        visualizationConfig.visualizationModule,
+        visualizationConfig.expression
+      )
 
+    maybeCallable.foreach { result =>
+      updateAttachedVisualization(
+        visualizationId,
+        expressionId,
+        result.module,
+        visualizationConfig,
+        result.callback,
+        result.arguments
+      )
+      val stack =
+        ctx.contextManager.getStack(visualizationConfig.executionContextId)
+      requireVisualizationSynchronization(stack, expressionId)
     }
+  }
 
   /** Find module by name.
     *
@@ -509,7 +500,7 @@ object UpsertVisualizationJob {
     val visualizationExpressionId =
       findVisualizationExpressionId(module, visualizationConfig.expression)
     val visualization =
-      Visualization.AttachedVisualization(
+      Visualization(
         visualizationId,
         expressionId,
         new RuntimeCache(),
@@ -603,19 +594,16 @@ object UpsertVisualizationJob {
     *
     * @param visualization the visualization to update
     */
-  private def setCacheWeights(visualization: Visualization): Unit =
-    visualization match {
-      case visualization: Visualization.AttachedVisualization =>
-        visualization.module.getIr
-          .getMetadata(CachePreferenceAnalysis)
-          .foreach { metadata =>
-            CacheInvalidation.runVisualizations(
-              Seq(visualization),
-              CacheInvalidation.Command.SetMetadata(metadata)
-            )
-          }
-      case _: Visualization.OneshotExpression =>
-    }
+  private def setCacheWeights(visualization: Visualization): Unit = {
+    visualization.module.getIr
+      .getMetadata(CachePreferenceAnalysis)
+      .foreach { metadata =>
+        CacheInvalidation.runVisualizations(
+          Seq(visualization),
+          CacheInvalidation.Command.SetMetadata(metadata)
+        )
+      }
+  }
 
   /** Invalidate the first cached dependent node of the provided expression.
     *
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java
new file mode 100644
index 000000000000..c47144e646c7
--- /dev/null
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java
@@ -0,0 +1,174 @@
+package org.enso.interpreter.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class EqualsConversionsTest extends TestBase {
+  private static Context context;
+
+  @BeforeClass
+  public static void initContextAndData() {
+    context = createDefaultContext();
+  }
+
+  @AfterClass
+  public static void disposeContext() {
+    context.close();
+  }
+
+  @Test
+  public void testBasicInequalities() {
+    var results =
+        TestBase.evalModule(
+                context,
+                """
+    from Standard.Base import all
+
+    Text.from (that:Number) = that.to_text
+
+    main =
+        r0 = "4"+"2" == "42"
+        r1 = 42 == "42"
+        r2 = "42" == 42
+        [ r0, r1, r2 ]
+    """)
+            .as(List.class);
+
+    assertTrue("strings are equal: " + results, (boolean) results.get(0));
+    assertFalse("string is not equal to number: " + results, (boolean) results.get(1));
+    assertFalse("number is not equal to string: " + results, (boolean) results.get(2));
+  }
+
+  @Test
+  public void testNumWrapperAroundIntegerIsEqualToInteger() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = true;
+    gen.intComparator = true;
+    gen.numComparator = true;
+    assertTrue("Num.Value equal to Integer: ", gen.evaluate());
+  }
+
+  @Test
+  public void testMissingIntegerNumConversion() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = false;
+    gen.intComparator = true;
+    gen.numComparator = true;
+    assertFalse("Num.Value not equal to Integer: ", gen.evaluate());
+  }
+
+  @Test
+  public void testMissingIntComparator() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = true;
+    gen.intComparator = false;
+    gen.numComparator = true;
+    assertFalse("Num.Value not equal to Integer: ", gen.evaluate());
+  }
+
+  @Test
+  public void testMissingNumComparator() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = true;
+    gen.intComparator = true;
+    gen.numComparator = false;
+    assertFalse("Num.Value not equal to Integer: ", gen.evaluate());
+  }
+
+  @Test
+  public void testDifferentComparators() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = true;
+    gen.intComparator = true;
+    gen.numComparator = false;
+    gen.extraBlock =
+        """
+    type Second_Comparator
+        compare a:Num b:Num = Num_Comparator.compare a b
+        hash a:Num = Num_Comparator.hash a
+
+    Comparable.from (_:Num) = Second_Comparator
+    """;
+    assertFalse("Num.Value not equal to Integer: ", gen.evaluate());
+  }
+
+  @Test
+  public void testInconsistentHashFunction() {
+    var gen = new DefineComparableWrapper();
+    gen.intNumConversion = true;
+    gen.intComparator = true;
+    gen.numComparator = true;
+    gen.hashFn = "x.n*31";
+
+    boolean r;
+    try {
+      r = gen.evaluate();
+    } catch (PolyglotException ex) {
+      assertTrue(ex.getMessage(), ex.getMessage().contains("Different hash code!"));
+      return;
+    }
+    fail("Expecting assertion error, not: " + r);
+  }
+
+  private static final class DefineComparableWrapper {
+    boolean intNumConversion;
+    boolean numComparator;
+    boolean intComparator;
+    String hashFn = "Default_Comparator.hash x.n";
+    String extraBlock = "";
+
+    boolean evaluate() {
+      var block0 =
+          """
+          from Standard.Base import all
+
+          type Num
+              Value n:Integer
+
+          type Num_Comparator
+              compare x:Num y:Num = Ordering.compare x.n y.n
+              hash x:Num = {hashFn}
+          """
+              .replace("{hashFn}", hashFn);
+
+      var block1 =
+          !intNumConversion
+              ? ""
+              : """
+          Num.from (that:Integer) = Num.Value that
+          """;
+
+      var block2 =
+          !numComparator
+              ? ""
+              : """
+          Comparable.from (_:Num) = Num_Comparator
+          """;
+
+      var block3 =
+          !intComparator ? "" : """
+      Comparable.from (_:Integer) = Num_Comparator
+      """;
+
+      var mainBlock =
+          """
+      main =
+          num42 = Num.Value 42
+
+          r0 = 42 == num42
+          r0
+      """;
+      var res =
+          TestBase.evalModule(context, block0 + block1 + block2 + block3 + mainBlock + extraBlock);
+      return res.asBoolean();
+    }
+  }
+}
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
index fa9c8803e0bd..7ea7b87feb6f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.oracle.truffle.api.frame.VirtualFrame;
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -16,7 +17,6 @@
 import java.util.stream.Collectors;
 import org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode;
 import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
-import org.enso.interpreter.node.expression.builtin.meta.EqualsNodeGen;
 import org.enso.interpreter.runtime.callable.UnresolvedConversion;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 import org.enso.polyglot.MethodNames;
@@ -44,8 +44,8 @@ public static void initContextAndData() {
     executeInContext(
         context,
         () -> {
-          testRootNode = new TestRootNode();
-          equalsNode = EqualsNode.build();
+          testRootNode = new TestRootNode(EqualsTest::equalityCheck);
+          equalsNode = EqualsNode.create();
           hostValueToEnsoNode = HostValueToEnsoNode.build();
           testRootNode.insertChildren(equalsNode, hostValueToEnsoNode);
           return null;
@@ -88,13 +88,22 @@ private static Object[] fetchAllUnwrappedValues() {
     }
   }
 
+  private static boolean equalityCheck(VirtualFrame frame) {
+    var args = frame.getArguments();
+    return equalsNode.execute(frame, args[0], args[1]);
+  }
+
+  private boolean equalityCheck(Object first, Object second) {
+    return (Boolean) testRootNode.getCallTarget().call(first, second);
+  }
+
   @Theory
   public void equalsOperatorShouldBeSymmetric(Object firstValue, Object secondValue) {
     executeInContext(
         context,
         () -> {
-          boolean firstResult = equalsNode.execute(firstValue, secondValue);
-          boolean secondResult = equalsNode.execute(secondValue, firstValue);
+          boolean firstResult = equalityCheck(firstValue, secondValue);
+          boolean secondResult = equalityCheck(secondValue, firstValue);
           assertEquals("equals should be symmetric", firstResult, secondResult);
           return null;
         });
@@ -105,8 +114,8 @@ public void equalsOperatorShouldBeConsistent(Object value) {
     executeInContext(
         context,
         () -> {
-          Object firstResult = equalsNode.execute(value, value);
-          Object secondResult = equalsNode.execute(value, value);
+          Object firstResult = equalityCheck(value, value);
+          Object secondResult = equalityCheck(value, value);
           assertEquals("equals should be consistent", firstResult, secondResult);
           return null;
         });
@@ -117,8 +126,8 @@ public void equalsNodeCachedIsConsistentWithUncached(Object firstVal, Object sec
     executeInContext(
         context,
         () -> {
-          Object uncachedRes = EqualsNodeGen.getUncached().execute(firstVal, secondVal);
-          Object cachedRes = equalsNode.execute(firstVal, secondVal);
+          Object uncachedRes = EqualsNode.getUncached().execute(null, firstVal, secondVal);
+          Object cachedRes = equalityCheck(firstVal, secondVal);
           assertEquals(
               "Result from uncached EqualsNode should be the same as result from its cached"
                   + " variant",
@@ -140,7 +149,7 @@ public void testDateEquality() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoDate, javaDate));
+          assertTrue(equalityCheck(ensoDate, javaDate));
           return null;
         });
   }
@@ -158,7 +167,7 @@ public void testTimeEquality() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoTime, javaDate));
+          assertTrue(equalityCheck(ensoTime, javaDate));
           return null;
         });
   }
@@ -181,7 +190,7 @@ public void testDateTimeEquality() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoDateTime, javaDateTime));
+          assertTrue(equalityCheck(ensoDateTime, javaDateTime));
           return null;
         });
   }
@@ -194,7 +203,7 @@ public void testDoubleEqualsEnsoBigInteger() {
     executeInContext(
         context,
         () -> {
-          assertTrue(javaNumber + " == " + ensoNumber, equalsNode.execute(javaNumber, ensoNumber));
+          assertTrue(javaNumber + " == " + ensoNumber, equalityCheck(javaNumber, ensoNumber));
           return null;
         });
   }
@@ -207,7 +216,7 @@ public void testEnsoBigIntegerEqualsDoubleEquals() {
     executeInContext(
         context,
         () -> {
-          assertTrue(ensoNumber + " == " + javaNumber, equalsNode.execute(ensoNumber, javaNumber));
+          assertTrue(ensoNumber + " == " + javaNumber, equalityCheck(ensoNumber, javaNumber));
           return null;
         });
   }
@@ -220,7 +229,7 @@ public void testDoubleEqualsJavaBigInteger() {
     executeInContext(
         context,
         () -> {
-          assertTrue(javaNumber + " == " + hostNumber, equalsNode.execute(javaNumber, hostNumber));
+          assertTrue(javaNumber + " == " + hostNumber, equalityCheck(javaNumber, hostNumber));
           return null;
         });
   }
@@ -233,7 +242,7 @@ public void testJavaBigIntegerEqualsDoubleEquals() {
     executeInContext(
         context,
         () -> {
-          assertTrue(hostNumber + " == " + javaNumber, equalsNode.execute(hostNumber, javaNumber));
+          assertTrue(hostNumber + " == " + javaNumber, equalityCheck(hostNumber, javaNumber));
           return null;
         });
   }
@@ -246,7 +255,7 @@ public void testVectorsEquality() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoVector, javaVector));
+          assertTrue(equalityCheck(ensoVector, javaVector));
           return null;
         });
   }
@@ -258,9 +267,9 @@ public void testTruffleNumberLong() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoNumber, foreignNumber.asDirect()));
-          assertTrue(equalsNode.execute(ensoNumber, foreignNumber));
-          assertTrue(equalsNode.execute(foreignNumber, ensoNumber));
+          assertTrue(equalityCheck(ensoNumber, foreignNumber.asDirect()));
+          assertTrue(equalityCheck(ensoNumber, foreignNumber));
+          assertTrue(equalityCheck(foreignNumber, ensoNumber));
           return null;
         });
   }
@@ -272,9 +281,9 @@ public void testTruffleNumberDouble() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoNumber, foreignNumber.asDirect()));
-          assertTrue(equalsNode.execute(ensoNumber, foreignNumber));
-          assertTrue(equalsNode.execute(foreignNumber, ensoNumber));
+          assertTrue(equalityCheck(ensoNumber, foreignNumber.asDirect()));
+          assertTrue(equalityCheck(ensoNumber, foreignNumber));
+          assertTrue(equalityCheck(foreignNumber, ensoNumber));
           return null;
         });
   }
@@ -287,8 +296,8 @@ public void testTruffleNumberBigInt() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoNumber, foreignNumber));
-          assertTrue(equalsNode.execute(foreignNumber, ensoNumber));
+          assertTrue(equalityCheck(ensoNumber, foreignNumber));
+          assertTrue(equalityCheck(foreignNumber, ensoNumber));
           return null;
         });
   }
@@ -301,9 +310,9 @@ public void testTruffleBoolean() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoBoolean, foreignBoolean.asDirect()));
-          assertTrue(equalsNode.execute(ensoBoolean, foreignBoolean));
-          assertTrue(equalsNode.execute(foreignBoolean, ensoBoolean));
+          assertTrue(equalityCheck(ensoBoolean, foreignBoolean.asDirect()));
+          assertTrue(equalityCheck(ensoBoolean, foreignBoolean));
+          assertTrue(equalityCheck(foreignBoolean, ensoBoolean));
           return null;
         });
   }
@@ -315,9 +324,9 @@ public void testTruffleString() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(ensoText, foreignString.asDirect()));
-          assertTrue(equalsNode.execute(ensoText, foreignString));
-          assertTrue(equalsNode.execute(foreignString, ensoText));
+          assertTrue(equalityCheck(ensoText, foreignString.asDirect()));
+          assertTrue(equalityCheck(ensoText, foreignString));
+          assertTrue(equalityCheck(foreignString, ensoText));
           return null;
         });
   }
@@ -336,8 +345,8 @@ public void testTruffleNumberPlus() {
     executeInContext(
         context,
         () -> {
-          assertTrue(equalsNode.execute(142L, hundred42));
-          assertTrue(equalsNode.execute(hundred42, 142L));
+          assertTrue(equalityCheck(142L, hundred42));
+          assertTrue(equalityCheck(hundred42, 142L));
           return null;
         });
   }
@@ -375,15 +384,12 @@ && unwrapValue(context, mod2) instanceof org.enso.interpreter.runtime.Module m2)
       executeInContext(
           context,
           () -> {
-            assertTrue(
-                "Conversions from same module are the same", equalsNode.execute(conv1, conv1_2));
-            assertTrue(
-                "Conversions from same module are the same", equalsNode.execute(conv2, conv2_2));
+            assertTrue("Conversions from same module are the same", equalityCheck(conv1, conv1_2));
+            assertTrue("Conversions from same module are the same", equalityCheck(conv2, conv2_2));
             assertFalse(
-                "Conversions from other modules aren't the same", equalsNode.execute(conv1, conv2));
+                "Conversions from other modules aren't the same", equalityCheck(conv1, conv2));
             assertFalse(
-                "Conversions from other modueles aren't the same",
-                equalsNode.execute(conv2_2, conv1_2));
+                "Conversions from other modueles aren't the same", equalityCheck(conv2_2, conv1_2));
             return null;
           });
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
index ade0d7fda03f..cfe04819640e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
@@ -38,7 +38,7 @@ public static void initContextAndData() {
         context,
         () -> {
           hashCodeNode = HashCodeNode.build();
-          equalsNode = EqualsNode.build();
+          equalsNode = EqualsNode.create();
           hostValueToEnsoNode = HostValueToEnsoNode.build();
           testRootNode = new TestRootNode();
           testRootNode.insertChildren(hashCodeNode, equalsNode, hostValueToEnsoNode);
@@ -94,7 +94,7 @@ public void hashCodeContractTheory(Object firstValue, Object secondValue) {
         () -> {
           long firstHash = hashCodeNode.execute(firstValue);
           long secondHash = hashCodeNode.execute(secondValue);
-          Object valuesAreEqual = equalsNode.execute(firstValue, secondValue);
+          Object valuesAreEqual = equalsNode.execute(null, firstValue, secondValue);
           // if o1 == o2 then hash(o1) == hash(o2)
           if (isTrue(valuesAreEqual)) {
             assertEquals(
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java
index 34e2e475270e..b80e06e218c1 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TestBase.java
@@ -13,6 +13,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.function.Function;
 import java.util.logging.Level;
 import org.enso.interpreter.EnsoLanguage;
 import org.enso.polyglot.MethodNames.Module;
@@ -45,6 +46,7 @@ protected static Context.Builder defaultContextBuilder(String... languages) {
         .allowIO(IOAccess.ALL)
         .allowAllAccess(true)
         .option(RuntimeOptions.LOG_LEVEL, Level.WARNING.getName())
+        .option(RuntimeOptions.DISABLE_IR_CACHES, "true")
         .logHandler(System.err)
         .option(RuntimeOptions.STRICT_ERRORS, "true")
         .option(
@@ -152,8 +154,15 @@ protected static Value getMethodFromModule(Context ctx, String moduleSrc, String
    * #insertChildren(Node...)}.
    */
   static class TestRootNode extends RootNode {
+    private final Function<VirtualFrame, Object> callback;
+
     TestRootNode() {
+      this(null);
+    }
+
+    TestRootNode(Function<VirtualFrame, Object> callback) {
       super(EnsoLanguage.get(null));
+      this.callback = callback;
     }
 
     void insertChildren(Node... children) {
@@ -165,7 +174,11 @@ void insertChildren(Node... children) {
     /** In the tests, do not execute this root node, but execute directly the child nodes. */
     @Override
     public Object execute(VirtualFrame frame) {
-      throw new AssertionError("should not reach here");
+      if (callback == null) {
+        throw new AssertionError("should not reach here");
+      } else {
+        return callback.apply(frame);
+      }
     }
   }
 
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala
index f1ac5c801e57..2ee40cf8b6e4 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeExecutionEnvironmentTest.scala
@@ -184,7 +184,10 @@ class RuntimeExecutionEnvironmentTest
         idRes,
         IF_ENABLED_METH_CALL,
         Api.ExpressionUpdate.Payload
-          .Panic("Forbidden operation: Output.", Seq(idRes)),
+          .Panic(
+            "Forbidden operation: The Output context is disabled.",
+            Seq(idRes)
+          ),
         false
       ),
       context.executionComplete(contextId)
@@ -285,7 +288,10 @@ class RuntimeExecutionEnvironmentTest
         idRes,
         IF_ENABLED_METH_CALL,
         Api.ExpressionUpdate.Payload
-          .Panic("Forbidden operation: Input.", Seq(idRes)),
+          .Panic(
+            "Forbidden operation: The Input context is disabled.",
+            Seq(idRes)
+          ),
         false
       ),
       context.executionComplete(contextId)
@@ -342,6 +348,6 @@ object RuntimeExecutionEnvironmentTest {
         "Standard.Base.Runtime.Context",
         "if_enabled"
       ),
-      Vector(2)
+      Vector(2, 3, 4)
     )
 }
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/TestEdition.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/TestEdition.scala
index 3ea48be6443a..3e45b2a31373 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/TestEdition.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/TestEdition.scala
@@ -1,17 +1,17 @@
 package org.enso.interpreter.test.instrument
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.{Editions, LibraryName}
 
 import java.io.File
 
 object TestEdition {
 
-  val testLibraryVersion: SemVer = SemVer(0, 0, 0, Some("dev"))
+  val testLibraryVersion: SemVer = SemVer.of(0, 0, 0, "dev")
 
   val empty: Editions.RawEdition =
     Editions.Raw.Edition(
-      engineVersion = Some(SemVer(buildinfo.Info.ensoVersion).get),
+      engineVersion = Some(SemVer.parse(buildinfo.Info.ensoVersion).get),
       repositories =
         Map("main" -> Editions.Repository("main", "http://example.com/")),
       libraries = Map()
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/DesignExecutionEnvironmentTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/DesignExecutionEnvironmentTest.scala
index 888bb6de33b9..d6bbe3cbf257 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/DesignExecutionEnvironmentTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/DesignExecutionEnvironmentTest.scala
@@ -24,7 +24,9 @@ class DesignExecutionEnvironmentTest extends InterpreterTest {
           |
           |main = Panic.catch Any (input_action 2) p-> p.payload.to_text
           |""".stripMargin
-      eval(code) shouldEqual "(Forbidden_Operation.Error 'Input')"
+      eval(
+        code
+      ) shouldEqual "(Forbidden_Operation.Error 'The Input context is disabled.')"
     }
 
     "error on invalid context actions" in {
@@ -37,7 +39,9 @@ class DesignExecutionEnvironmentTest extends InterpreterTest {
           |
           |main = Panic.catch Any (Runtime.with_enabled_context Output (input_action 2)) p-> p.payload.to_text
           |""".stripMargin
-      eval(code) shouldEqual "(Forbidden_Operation.Error 'Input')"
+      eval(
+        code
+      ) shouldEqual "(Forbidden_Operation.Error 'The Input context is disabled.')"
     }
 
     "error on invalid environment actions" in {
@@ -78,7 +82,9 @@ class DesignExecutionEnvironmentTest extends InterpreterTest {
           |
           |main = Panic.catch Any (output_action 2) p-> p.payload.to_text
           |""".stripMargin
-      eval(code) shouldEqual "(Forbidden_Operation.Error 'Output')"
+      eval(
+        code
+      ) shouldEqual "(Forbidden_Operation.Error 'The Output context is disabled.')"
     }
 
     "scope of context is limited" in {
@@ -93,7 +99,9 @@ class DesignExecutionEnvironmentTest extends InterpreterTest {
           |    res = Runtime.with_enabled_context Input action=(input_action 2)
           |    Panic.catch Any (input_action 2) p-> res.to_text+" and "+p.payload.to_text
           |""".stripMargin
-      eval(code) shouldEqual "2 and (Forbidden_Operation.Error 'Input')"
+      eval(
+        code
+      ) shouldEqual "2 and (Forbidden_Operation.Error 'The Input context is disabled.')"
     }
 
     "allow locally running IO" in {
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/LiveExecutionEnvironmentTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/LiveExecutionEnvironmentTest.scala
index 84c3f3aad6e3..abefb5f39fa3 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/LiveExecutionEnvironmentTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/LiveExecutionEnvironmentTest.scala
@@ -37,7 +37,9 @@ class LiveExecutionEnvironmentTest extends InterpreterTest {
           |
           |main = Panic.catch Any (Runtime.with_disabled_context Input action=(input_action 2)) p-> p.payload.to_text
           |""".stripMargin
-      eval(code) shouldEqual "(Forbidden_Operation.Error 'Input')"
+      eval(
+        code
+      ) shouldEqual "(Forbidden_Operation.Error 'The Input context is disabled.')"
     }
 
     "error on invalid environment actions" in {
diff --git a/engine/runtime-parser/src/main/java/org/enso/compiler/core/IR.java b/engine/runtime-parser/src/main/java/org/enso/compiler/core/IR.java
index f209b534de0e..1f446a948fc2 100644
--- a/engine/runtime-parser/src/main/java/org/enso/compiler/core/IR.java
+++ b/engine/runtime-parser/src/main/java/org/enso/compiler/core/IR.java
@@ -1,6 +1,5 @@
 package org.enso.compiler.core;
 
-import java.io.Serializable;
 import java.util.UUID;
 import java.util.function.Function;
 import org.enso.compiler.core.ir.DiagnosticStorage;
@@ -28,9 +27,7 @@
  *
  * <p>See also: Note [IR Equality and hashing]
  */
-public interface IR extends Serializable {
-
-  long serialVersionUID = 9057L; // Scala to Java
+public interface IR {
 
   /**
    * Storage for metadata that the node has been tagged with as the result of various compiler
diff --git a/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Module.scala b/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Module.scala
index 3bf03f2465fe..6c02caccbce9 100644
--- a/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Module.scala
+++ b/engine/runtime-parser/src/main/scala/org/enso/compiler/core/ir/Module.scala
@@ -19,9 +19,6 @@ import java.util.UUID
   * @param passData    the pass metadata associated with this node
   * @param diagnostics compiler diagnostics for this node
   */
-@SerialVersionUID(
-  9057L // Use BindingsMap
-)       // prevents reading broken caches, see PR-3692 for details
 final case class Module(
   imports: List[Import],
   exports: List[Export],
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/ForbiddenOperation.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/ForbiddenOperation.java
index 28d0556dea3a..b0c0f648abda 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/ForbiddenOperation.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/ForbiddenOperation.java
@@ -14,6 +14,6 @@ protected String getConstructorName() {
 
   @Override
   protected List<String> getConstructorParamNames() {
-    return List.of("operation");
+    return List.of("message");
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/AtomWithAHoleNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/AtomWithAHoleNode.java
index e2b4c12b5363..e4facd67c82d 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/AtomWithAHoleNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/AtomWithAHoleNode.java
@@ -197,12 +197,17 @@ int findHoleIndex(Atom atom, HoleInAtom lazy) {
 
     @CompilerDirectives.TruffleBoundary
     private int findHoleIndexLoop(Atom atom, HoleInAtom lazy) {
+      int holeIdx = -1;
       for (int i = 0; i < atom.getConstructor().getArity(); i++) {
         if (structs.getField(atom, i) == lazy) {
-          return i;
+          if (holeIdx != -1) {
+            // More than one hole found - this is an error
+            return -1;
+          }
+          holeIdx = i;
         }
       }
-      return -1;
+      return holeIdx;
     }
 
     Function createFn(HoleInAtom lazy) {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsAtomNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsAtomNode.java
index c65921194ab3..8914feaabb42 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsAtomNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsAtomNode.java
@@ -7,6 +7,8 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.MaterializedFrame;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
@@ -32,7 +34,7 @@ public static EqualsAtomNode build() {
     return EqualsAtomNodeGen.create();
   }
 
-  public abstract boolean execute(Atom left, Atom right);
+  public abstract boolean execute(VirtualFrame frame, Atom left, Atom right);
 
   static EqualsNode[] createEqualsNodes(int size) {
     EqualsNode[] nodes = new EqualsNode[size];
@@ -48,6 +50,7 @@ static EqualsNode[] createEqualsNodes(int size) {
       limit = "10")
   @ExplodeLoop
   boolean equalsAtomsWithDefaultComparator(
+      VirtualFrame frame,
       Atom self,
       Atom other,
       @Cached("self.getConstructor()") AtomConstructor selfCtorCached,
@@ -65,7 +68,7 @@ boolean equalsAtomsWithDefaultComparator(
     for (int i = 0; i < fieldsLenCached; i++) {
       var selfValue = structsLib.getField(self, i);
       var otherValue = structsLib.getField(other, i);
-      var fieldsAreEqual = fieldEqualsNodes[i].execute(selfValue, otherValue);
+      var fieldsAreEqual = fieldEqualsNodes[i].execute(frame, selfValue, otherValue);
       if (!fieldsAreEqual) {
         return false;
       }
@@ -116,13 +119,18 @@ private static boolean orderingOrNull(Node where, EnsoContext ctx, Object obj, F
     }
   }
 
-  @CompilerDirectives.TruffleBoundary
   @Specialization(
       replaces = {"equalsAtomsWithDefaultComparator", "equalsAtomsWithCustomComparator"})
-  boolean equalsAtomsUncached(Atom self, Atom other) {
+  boolean equalsAtomsUncached(VirtualFrame frame, Atom self, Atom other) {
     if (self.getConstructor() != other.getConstructor()) {
       return false;
+    } else {
+      return equalsAtomsUncached(frame == null ? null : frame.materialize(), self, other);
     }
+  }
+
+  @CompilerDirectives.TruffleBoundary
+  private boolean equalsAtomsUncached(MaterializedFrame frame, Atom self, Atom other) {
     Type customComparator = CustomComparatorNode.getUncached().execute(self);
     if (customComparator != null) {
       Function compareFunc = findCompareMethod(customComparator);
@@ -139,7 +147,7 @@ boolean equalsAtomsUncached(Atom self, Atom other) {
     for (int i = 0; i < self.getConstructor().getArity(); i++) {
       var selfField = StructsLibrary.getUncached().getField(self, i);
       var otherField = StructsLibrary.getUncached().getField(other, i);
-      boolean areFieldsSame = EqualsNodeGen.getUncached().execute(selfField, otherField);
+      boolean areFieldsSame = EqualsNode.getUncached().execute(frame, selfField, otherField);
       if (!areFieldsSame) {
         return false;
       }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
index ff580800227e..bada651826ad 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
@@ -6,6 +6,7 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -18,9 +19,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
-import org.enso.interpreter.dsl.AcceptsError;
 import org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode;
-import org.enso.interpreter.node.expression.builtin.ordering.CustomComparatorNode;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.Module;
 import org.enso.interpreter.runtime.callable.UnresolvedConversion;
@@ -39,24 +38,26 @@ public static EqualsComplexNode build() {
     return EqualsComplexNodeGen.create();
   }
 
-  public abstract boolean execute(@AcceptsError Object left, @AcceptsError Object right);
+  public abstract boolean execute(VirtualFrame frame, Object left, Object right);
 
   /** Enso specific types */
   @Specialization
   boolean equalsUnresolvedSymbols(
+      VirtualFrame frame,
       UnresolvedSymbol self,
       UnresolvedSymbol otherSymbol,
       @Shared("equalsNode") @Cached EqualsNode equalsNode) {
     return self.getName().equals(otherSymbol.getName())
-        && equalsNode.execute(self.getScope(), otherSymbol.getScope());
+        && equalsNode.execute(frame, self.getScope(), otherSymbol.getScope());
   }
 
   @Specialization
   boolean equalsUnresolvedConversion(
+      VirtualFrame frame,
       UnresolvedConversion selfConversion,
       UnresolvedConversion otherConversion,
       @Shared("equalsNode") @Cached EqualsNode equalsNode) {
-    return equalsNode.execute(selfConversion.getScope(), otherConversion.getScope());
+    return equalsNode.execute(frame, selfConversion.getScope(), otherConversion.getScope());
   }
 
   @Specialization
@@ -71,8 +72,11 @@ boolean equalsModules(Module selfModule, Module otherModule) {
 
   @Specialization
   boolean equalsFiles(
-      EnsoFile selfFile, EnsoFile otherFile, @Shared("equalsNode") @Cached EqualsNode equalsNode) {
-    return equalsNode.execute(selfFile.getPath(), otherFile.getPath());
+      VirtualFrame frame,
+      EnsoFile selfFile,
+      EnsoFile otherFile,
+      @Shared("equalsNode") @Cached EqualsNode equalsNode) {
+    return equalsNode.execute(frame, selfFile.getPath(), otherFile.getPath());
   }
 
   /**
@@ -82,12 +86,13 @@ boolean equalsFiles(
    */
   @Specialization(guards = {"typesLib.hasType(selfType)", "typesLib.hasType(otherType)"})
   boolean equalsTypes(
+      VirtualFrame frame,
       Type selfType,
       Type otherType,
       @Shared("equalsNode") @Cached EqualsNode equalsNode,
       @Shared("typesLib") @CachedLibrary(limit = "10") TypesLibrary typesLib) {
     return equalsNode.execute(
-        selfType.getQualifiedName().toString(), otherType.getQualifiedName().toString());
+        frame, selfType.getQualifiedName().toString(), otherType.getQualifiedName().toString());
   }
 
   /**
@@ -99,6 +104,7 @@ boolean equalsTypes(
       },
       limit = "3")
   boolean equalsWithWarnings(
+      VirtualFrame frame,
       Object selfWithWarnings,
       Object otherWithWarnings,
       @CachedLibrary("selfWithWarnings") WarningsLibrary selfWarnLib,
@@ -113,7 +119,7 @@ boolean equalsWithWarnings(
           otherWarnLib.hasWarnings(otherWithWarnings)
               ? otherWarnLib.removeWarnings(otherWithWarnings)
               : otherWithWarnings;
-      return equalsNode.execute(self, other);
+      return equalsNode.execute(frame, self, other);
     } catch (UnsupportedMessageException e) {
       throw EnsoContext.get(this).raiseAssertionPanic(this, null, e);
     }
@@ -278,12 +284,12 @@ boolean equalsDuration(
       },
       limit = "3")
   boolean equalsArrays(
+      VirtualFrame frame,
       Object selfArray,
       Object otherArray,
       @CachedLibrary("selfArray") InteropLibrary selfInterop,
       @CachedLibrary("otherArray") InteropLibrary otherInterop,
       @Shared("equalsNode") @Cached EqualsNode equalsNode,
-      @Cached CustomComparatorNode hasCustomComparatorNode,
       @Shared("hostValueToEnsoNode") @Cached HostValueToEnsoNode valueToEnsoNode) {
     try {
       long selfSize = selfInterop.getArraySize(selfArray);
@@ -293,7 +299,7 @@ boolean equalsArrays(
       for (long i = 0; i < selfSize; i++) {
         Object selfElem = valueToEnsoNode.execute(selfInterop.readArrayElement(selfArray, i));
         Object otherElem = valueToEnsoNode.execute(otherInterop.readArrayElement(otherArray, i));
-        boolean elemsAreEqual = equalsNode.execute(selfElem, otherElem);
+        boolean elemsAreEqual = equalsNode.execute(frame, selfElem, otherElem);
         if (!elemsAreEqual) {
           return false;
         }
@@ -313,6 +319,7 @@ boolean equalsArrays(
       },
       limit = "3")
   boolean equalsHashMaps(
+      VirtualFrame frame,
       Object selfHashMap,
       Object otherHashMap,
       @CachedLibrary("selfHashMap") InteropLibrary selfInterop,
@@ -337,7 +344,7 @@ boolean equalsHashMaps(
             && otherInterop.isHashEntryReadable(otherHashMap, key)) {
           Object otherValue =
               valueToEnsoNode.execute(otherInterop.readHashValue(otherHashMap, key));
-          if (!equalsNode.execute(selfValue, otherValue)) {
+          if (!equalsNode.execute(frame, selfValue, otherValue)) {
             return false;
           }
         } else {
@@ -391,13 +398,14 @@ boolean equalsHostObjects(
   // It has well-defined equality based on the qualified name.
   @Specialization(guards = {"isJavaFunction(selfHostFunc)", "isJavaFunction(otherHostFunc)"})
   boolean equalsHostFunctions(
+      VirtualFrame frame,
       Object selfHostFunc,
       Object otherHostFunc,
       @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
       @Shared("equalsNode") @Cached EqualsNode equalsNode) {
     Object selfFuncStrRepr = interop.toDisplayString(selfHostFunc);
     Object otherFuncStrRepr = interop.toDisplayString(otherHostFunc);
-    return equalsNode.execute(selfFuncStrRepr, otherFuncStrRepr);
+    return equalsNode.execute(frame, selfFuncStrRepr, otherFuncStrRepr);
   }
 
   @Specialization(guards = "fallbackGuard(left, right, interop, warningsLib)")
@@ -419,7 +427,8 @@ boolean equalsGeneric(
   // all the other guards on purpose.
   boolean fallbackGuard(
       Object left, Object right, InteropLibrary interop, WarningsLibrary warnings) {
-    if (EqualsNode.isPrimitive(left, interop) && EqualsNode.isPrimitive(right, interop)) {
+    if (EqualsSimpleNode.isPrimitive(left, interop)
+        && EqualsSimpleNode.isPrimitive(right, interop)) {
       return false;
     }
     if (isJavaObject(left) && isJavaObject(right)) {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsNode.java
index eec00c5f2c08..b368fb7fe802 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsNode.java
@@ -1,27 +1,29 @@
 package org.enso.interpreter.node.expression.builtin.meta;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.nodes.Node;
-import java.math.BigInteger;
 import org.enso.interpreter.dsl.AcceptsError;
 import org.enso.interpreter.dsl.BuiltinMethod;
-import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.EnsoRootNode;
+import org.enso.interpreter.node.callable.InteropConversionCallNode;
+import org.enso.interpreter.node.callable.InvokeCallableNode.ArgumentsExecutionMode;
+import org.enso.interpreter.node.callable.InvokeCallableNode.DefaultsExecutionMode;
+import org.enso.interpreter.node.callable.dispatch.InvokeFunctionNode;
 import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.data.EnsoMultiValue;
-import org.enso.interpreter.runtime.data.atom.Atom;
-import org.enso.interpreter.runtime.data.atom.AtomConstructor;
-import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.number.EnsoBigInteger;
-import org.enso.polyglot.common_utils.Core_Text_Utils;
+import org.enso.interpreter.runtime.callable.UnresolvedConversion;
+import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
+import org.enso.interpreter.runtime.callable.function.Function;
+import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.runtime.scope.ModuleScope;
+import org.enso.interpreter.runtime.state.State;
 
 @BuiltinMethod(
     type = "Any",
@@ -40,367 +42,252 @@
       references point to the same object on the heap. Moreover, `Meta.is_same_object`
       implies `Any.==` for all object with the exception of `Number.nan`.
       """)
-@GenerateUncached
-public abstract class EqualsNode extends Node {
-
-  public static EqualsNode build() {
-    return EqualsNodeGen.create();
-  }
-
-  public abstract boolean execute(@AcceptsError Object self, @AcceptsError Object right);
-
-  @Specialization
-  boolean equalsBoolBool(boolean self, boolean other) {
-    return self == other;
-  }
-
-  @Specialization
-  boolean equalsBoolDouble(boolean self, double other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsBoolLong(boolean self, long other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsBoolBigInt(boolean self, EnsoBigInteger other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsBoolText(boolean self, Text other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsBoolInterop(
-      boolean self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
-    try {
-      return self == interop.asBoolean(other);
-    } catch (UnsupportedMessageException ex) {
-      return false;
+public final class EqualsNode extends Node {
+  @Child private EqualsSimpleNode node;
+  @Child private TypeOfNode types;
+  @Child private WithConversionNode convert;
+
+  private static final EqualsNode UNCACHED =
+      new EqualsNode(EqualsSimpleNodeGen.getUncached(), TypeOfNode.getUncached(), true);
+
+  private EqualsNode(EqualsSimpleNode node, TypeOfNode types, boolean uncached) {
+    this.node = node;
+    this.types = types;
+    if (uncached) {
+      convert = EqualsNodeFactory.WithConversionNodeGen.getUncached();
     }
   }
 
-  @Specialization
-  boolean equalsLongLong(long self, long other) {
-    return self == other;
-  }
-
-  @Specialization
-  boolean equalsLongBool(long self, boolean other) {
-    return false;
+  @NeverDefault
+  static EqualsNode build() {
+    return create();
   }
 
-  @Specialization
-  boolean equalsLongDouble(long self, double other) {
-    return (double) self == other;
+  @NeverDefault
+  public static EqualsNode create() {
+    return new EqualsNode(EqualsSimpleNode.build(), TypeOfNode.build(), false);
   }
 
-  @Specialization
-  boolean equalsLongText(long self, Text other) {
-    return false;
+  @NeverDefault
+  public static EqualsNode getUncached() {
+    return UNCACHED;
   }
 
-  @Specialization
-  @TruffleBoundary
-  boolean equalsLongBigInt(long self, EnsoBigInteger other) {
-    if (BigIntegerOps.fitsInLong(other.getValue())) {
-      return BigInteger.valueOf(self).compareTo(other.getValue()) == 0;
-    } else {
-      return false;
+  /**
+   * Compares two objects for equality. If the {@link EqualsSimpleNode simple check} fails, it tries
+   * to convert first argument to the second one and compare again.
+   *
+   * @param frame the stack frame we are executing at
+   * @param self the self object
+   * @param other the other object
+   * @return {@code true} if {@code self} and {@code that} seem equal
+   */
+  public boolean execute(
+      VirtualFrame frame, @AcceptsError Object self, @AcceptsError Object other) {
+    var areEqual = node.execute(frame, self, other);
+    if (!areEqual) {
+      var selfType = types.execute(self);
+      var otherType = types.execute(other);
+      if (selfType != otherType) {
+        if (convert == null) {
+          CompilerDirectives.transferToInterpreter();
+          convert = insert(WithConversionNode.create());
+        }
+        return convert.executeWithConversion(frame, other, self);
+      }
     }
+    return areEqual;
   }
 
-  @Specialization
-  boolean equalsLongInterop(
-      long self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
-    try {
-      return self == interop.asLong(other);
-    } catch (UnsupportedMessageException ex) {
-      return false;
-    }
-  }
+  /**
+   * A node that checks the type of {@code that} argument, performs conversion of {@code self} to
+   * {@code that} type, and executes equality check again.
+   */
+  @GenerateUncached
+  abstract static class WithConversionNode extends Node {
 
-  @Specialization
-  boolean equalsDoubleDouble(double self, double other) {
-    if (Double.isNaN(self) || Double.isNaN(other)) {
-      return false;
-    } else {
-      return self == other;
+    @NeverDefault
+    static WithConversionNode create() {
+      return EqualsNodeFactory.WithConversionNodeGen.create();
     }
-  }
 
-  @Specialization
-  boolean equalsDoubleLong(double self, long other) {
-    return self == (double) other;
-  }
+    /**
+     * @return {code false} if the conversion makes no sense or result of equality check after doing
+     *     the conversion
+     */
+    abstract boolean executeWithConversion(VirtualFrame frame, Object self, Object that);
 
-  @Specialization
-  boolean equalsDoubleBool(double self, boolean other) {
-    return false;
-  }
+    static Type findType(TypeOfNode typeOfNode, Object obj) {
+      var rawType = typeOfNode.execute(obj);
+      return rawType instanceof Type type ? type : null;
+    }
 
-  @Specialization
-  boolean equalsDoubleText(double self, Text other) {
-    return false;
-  }
+    static Type findTypeUncached(Object obj) {
+      return findType(TypeOfNode.getUncached(), obj);
+    }
 
-  @Specialization
-  boolean equalsDoubleInterop(
-      double self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
-    try {
-      if (interop.fitsInDouble(other)) {
-        return self == interop.asDouble(other);
+    private static boolean isDefinedIn(ModuleScope scope, Function fn) {
+      if (fn.getCallTarget().getRootNode() instanceof EnsoRootNode ensoRoot) {
+        return ensoRoot.getModuleScope() == scope;
+      } else {
+        return false;
       }
-      var otherBig = interop.asBigInteger(other);
-      return self == asDouble(otherBig);
-    } catch (UnsupportedMessageException ex) {
-      return false;
     }
-  }
 
-  @TruffleBoundary
-  private static double asDouble(BigInteger big) {
-    return big.doubleValue();
-  }
-
-  @Specialization(guards = {"isBigInteger(iop, self)", "isBigInteger(iop, other)"})
-  @TruffleBoundary
-  boolean other(
-      Object self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
-    return asBigInteger(iop, self).equals(asBigInteger(iop, other));
-  }
-
-  @Specialization(guards = "isBigInteger(iop, self)")
-  @TruffleBoundary
-  boolean equalsBigIntDouble(
-      Object self,
-      double other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
-    return asBigInteger(iop, self).doubleValue() == other;
-  }
-
-  @Specialization(guards = "isBigInteger(iop, self)")
-  @TruffleBoundary
-  boolean equalsBigIntLong(
-      Object self, long other, @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
-    var v = asBigInteger(iop, self);
-    if (BigIntegerOps.fitsInLong(v)) {
-      return v.compareTo(BigInteger.valueOf(other)) == 0;
-    } else {
-      return false;
+    @CompilerDirectives.TruffleBoundary
+    private static Object convertor(EnsoContext ctx, Function convFn, Object value) {
+      var argSchema = new CallArgumentInfo[] {new CallArgumentInfo(), new CallArgumentInfo()};
+      var node =
+          InvokeFunctionNode.build(
+              argSchema, DefaultsExecutionMode.EXECUTE, ArgumentsExecutionMode.EXECUTE);
+      var state = State.create(ctx);
+      return node.execute(
+          convFn, null, state, new Object[] {ctx.getBuiltins().comparable(), value});
     }
-  }
-
-  @Specialization
-  boolean equalsBigIntBool(EnsoBigInteger self, boolean other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsBigIntText(EnsoBigInteger self, Text other) {
-    return false;
-  }
 
-  @TruffleBoundary
-  @Specialization(guards = {"isBigInteger(iop, self)", "!isPrimitiveValue(other)"})
-  boolean equalsBigIntInterop(
-      Object self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
-    try {
-      var otherBigInteger = InteropLibrary.getUncached().asBigInteger(other);
-      return asBigInteger(iop, self).equals(otherBigInteger);
-    } catch (UnsupportedMessageException ex) {
-      return false;
+    /**
+     * @return {@code null} if no conversion found
+     */
+    Boolean findConversions(Type selfType, Type thatType, Object self, Object that) {
+      if (selfType == null || thatType == null) {
+        return null;
+      }
+      var ctx = EnsoContext.get(this);
+
+      if (findConversionImpl(ctx, selfType, thatType, self, that)) {
+        return false;
+      } else {
+        if (findConversionImpl(ctx, thatType, selfType, that, self)) {
+          return true;
+        } else {
+          return null;
+        }
+      }
     }
-  }
-
-  @Specialization(guards = {"selfText.is_normalized()", "otherText.is_normalized()"})
-  boolean equalsTextText(Text selfText, Text otherText) {
-    return selfText.toString().compareTo(otherText.toString()) == 0;
-  }
-
-  @Specialization
-  boolean equalsTextBool(Text self, boolean other) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsTextLong(Text selfText, long otherLong) {
-    return false;
-  }
 
-  @Specialization
-  boolean equalsTextDouble(Text selfText, double otherDouble) {
-    return false;
-  }
-
-  @Specialization
-  boolean equalsTextBigInt(Text self, EnsoBigInteger other) {
-    return false;
-  }
-
-  /**
-   * Compares interop string with other object. If the other object doesn't support conversion to
-   * String, it is not equal. Otherwise the two strings are compared according to the
-   * lexicographical order, handling Unicode normalization. See {@code Text_Utils.compare_to}.
-   */
-  @TruffleBoundary
-  @Specialization(
-      guards = {"selfInterop.isString(selfString)"},
-      limit = "3")
-  boolean equalsStrings(
-      Object selfString,
-      Object otherString,
-      @CachedLibrary("selfString") InteropLibrary selfInterop,
-      @CachedLibrary("otherString") InteropLibrary otherInterop) {
-    String selfJavaString;
-    String otherJavaString;
-    try {
-      selfJavaString = selfInterop.asString(selfString);
-      otherJavaString = otherInterop.asString(otherString);
-    } catch (UnsupportedMessageException e) {
-      return false;
+    private static boolean findConversionImpl(
+        EnsoContext ctx, Type selfType, Type thatType, Object self, Object that) {
+      var selfScope = selfType.getDefinitionScope();
+      var comparableType = ctx.getBuiltins().comparable().getType();
+
+      var fromSelfType =
+          UnresolvedConversion.build(selfScope).resolveFor(ctx, comparableType, selfType);
+      var fromThatType =
+          UnresolvedConversion.build(selfScope).resolveFor(ctx, comparableType, thatType);
+      var betweenBoth = UnresolvedConversion.build(selfScope).resolveFor(ctx, selfType, thatType);
+
+      if (isDefinedIn(selfScope, fromSelfType)
+          && isDefinedIn(selfScope, fromThatType)
+          && convertor(ctx, fromSelfType, self) == convertor(ctx, fromThatType, that)
+          && betweenBoth != null) {
+        return true;
+      } else {
+        return false;
+      }
     }
-    return Core_Text_Utils.equals(selfJavaString, otherJavaString);
-  }
-
-  @Specialization(guards = "isPrimitive(self, interop) != isPrimitive(other, interop)")
-  boolean equalsDifferent(
-      Object self,
-      Object other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
-    return false;
-  }
-
-  /** Equals for Atoms and AtomConstructors */
-  @Specialization
-  boolean equalsAtomConstructors(AtomConstructor self, AtomConstructor other) {
-    return self == other;
-  }
-
-  @Specialization
-  boolean equalsAtoms(
-      Atom self,
-      Atom other,
-      @Cached EqualsAtomNode equalsAtomNode,
-      @Shared("isSameObjectNode") @Cached IsSameObjectNode isSameObjectNode) {
-    return isSameObjectNode.execute(self, other) || equalsAtomNode.execute(self, other);
-  }
-
-  @Specialization
-  boolean equalsReverseBoolean(
-      TruffleObject self,
-      boolean other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
-      @Shared("reverse") @Cached EqualsNode reverse) {
-    return reverse.execute(other, self);
-  }
-
-  @Specialization
-  boolean equalsReverseLong(
-      TruffleObject self,
-      long other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
-      @Shared("reverse") @Cached EqualsNode reverse) {
-    return reverse.execute(other, self);
-  }
-
-  @Specialization
-  boolean equalsReverseDouble(
-      TruffleObject self,
-      double other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
-      @Shared("reverse") @Cached EqualsNode reverse) {
-    return reverse.execute(other, self);
-  }
-
-  @Specialization
-  boolean equalsReverseBigInt(
-      TruffleObject self,
-      EnsoBigInteger other,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
-      @Shared("reverse") @Cached EqualsNode reverse) {
-    return reverse.execute(other, self);
-  }
-
-  @Specialization(guards = "isNotPrimitive(self, other, interop, warnings)")
-  boolean equalsComplex(
-      Object self,
-      Object other,
-      @Cached EqualsComplexNode equalsComplex,
-      @Shared("isSameObjectNode") @Cached IsSameObjectNode isSameObjectNode,
-      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
-      @CachedLibrary(limit = "5") WarningsLibrary warnings) {
-    return isSameObjectNode.execute(self, other) || equalsComplex.execute(self, other);
-  }
 
-  static boolean isNotPrimitive(
-      Object a, Object b, InteropLibrary interop, WarningsLibrary warnings) {
-    if (a instanceof AtomConstructor && b instanceof AtomConstructor) {
-      return false;
+    @Specialization(
+        limit = "10",
+        guards = {
+          "selfType != null",
+          "thatType != null",
+          "selfType == findType(typeOfNode, self)",
+          "thatType == findType(typeOfNode, that)"
+        })
+    final boolean doConversionCached(
+        VirtualFrame frame,
+        Object self,
+        Object that,
+        @Shared("typeOf") @Cached TypeOfNode typeOfNode,
+        @Cached(value = "findType(typeOfNode, self)", uncached = "findTypeUncached(self)")
+            Type selfType,
+        @Cached(value = "findType(typeOfNode, that)", uncached = "findTypeUncached(that)")
+            Type thatType,
+        @Cached("findConversions(selfType, thatType, self, that)") Boolean convert,
+        @Shared("convert") @Cached InteropConversionCallNode convertNode,
+        @Shared("invoke") @Cached(allowUncached = true) EqualsSimpleNode equalityNode) {
+      if (convert == null) {
+        return false;
+      }
+      if (convert) {
+        return doDispatch(frame, that, self, thatType, convertNode, equalityNode);
+      } else {
+        return doDispatch(frame, self, that, selfType, convertNode, equalityNode);
+      }
     }
-    if (a instanceof Atom && b instanceof Atom) {
+
+    @Specialization(replaces = "doConversionCached")
+    final boolean doConversionUncached(
+        VirtualFrame frame,
+        Object self,
+        Object that,
+        @Shared("typeOf") @Cached TypeOfNode typeOfNode,
+        @Shared("convert") @Cached InteropConversionCallNode convertNode,
+        @Shared("invoke") @Cached(allowUncached = true) EqualsSimpleNode equalityNode) {
+      var selfType = findType(typeOfNode, self);
+      var thatType = findType(typeOfNode, that);
+      var conv = findConversions(selfType, thatType, self, that);
+      if (conv != null) {
+        var result =
+            conv
+                ? doDispatch(frame, that, self, thatType, convertNode, equalityNode)
+                : doDispatch(frame, self, that, selfType, convertNode, equalityNode);
+        return result;
+      }
       return false;
     }
-    if (warnings.hasWarnings(a) || warnings.hasWarnings(b)) {
-      return true;
-    }
-    if (a instanceof EnsoMultiValue || b instanceof EnsoMultiValue) {
-      return true;
-    }
-    return !isPrimitive(a, interop) && !isPrimitive(b, interop);
-  }
-
-  /**
-   * Return true iff object is a primitive value used in some specializations guard. By primitive
-   * value we mean any value that can be present in Enso, so, for example, not Integer, as that
-   * cannot be present in Enso. All the primitive types should be handled in their corresponding
-   * specializations. See {@link
-   * org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode}.
-   */
-  static boolean isPrimitive(Object object, InteropLibrary interop) {
-    return isPrimitiveValue(object)
-        || object instanceof EnsoBigInteger
-        || object instanceof Text
-        || interop.isString(object)
-        || interop.isNumber(object)
-        || interop.isBoolean(object);
-  }
 
-  static boolean isPrimitiveValue(Object object) {
-    return object instanceof Boolean || object instanceof Long || object instanceof Double;
-  }
-
-  static boolean isBigInteger(InteropLibrary iop, Object v) {
-    if (v instanceof EnsoBigInteger) {
-      return true;
-    } else {
-      return !iop.fitsInDouble(v) && !iop.fitsInLong(v) && iop.fitsInBigInteger(v);
+    private boolean doDispatch(
+        VirtualFrame frame,
+        Object self,
+        Object that,
+        Type selfType,
+        InteropConversionCallNode convertNode,
+        EqualsSimpleNode equalityNode)
+        throws PanicException {
+      var convert = UnresolvedConversion.build(selfType.getDefinitionScope());
+
+      var ctx = EnsoContext.get(this);
+      var state = State.create(ctx);
+      try {
+        var thatAsSelf = convertNode.execute(convert, state, new Object[] {selfType, that});
+        var result = equalityNode.execute(frame, self, thatAsSelf);
+        assert !result || assertHashCodeIsTheSame(that, thatAsSelf);
+        return result;
+      } catch (ArityException ex) {
+        var assertsOn = false;
+        assert assertsOn = true;
+        if (assertsOn) {
+          throw new AssertionError("Unexpected arity exception", ex);
+        }
+        return false;
+      } catch (PanicException ex) {
+        if (ctx.getBuiltins().error().isNoSuchConversionError(ex.getPayload())) {
+          return false;
+        }
+        throw ex;
+      }
     }
-  }
 
-  BigInteger asBigInteger(InteropLibrary iop, Object v) {
-    if (v instanceof EnsoBigInteger big) {
-      return big.getValue();
-    } else {
-      try {
-        return iop.asBigInteger(v);
-      } catch (UnsupportedMessageException ex) {
-        throw EnsoContext.get(this).raiseAssertionPanic(this, "Expecting BigInteger", ex);
+    private boolean assertHashCodeIsTheSame(Object self, Object converted) {
+      var selfHash = HashCodeNode.getUncached().execute(self);
+      var convertedHash = HashCodeNode.getUncached().execute(converted);
+      var ok = selfHash == convertedHash;
+      if (!ok) {
+        var msg =
+            "Different hash code! Original "
+                + self
+                + "[#"
+                + Long.toHexString(selfHash)
+                + "] got converted to "
+                + converted
+                + "[#"
+                + Long.toHexString(convertedHash)
+                + "]";
+        var ctx = EnsoContext.get(this);
+        throw ctx.raiseAssertionPanic(this, msg, new AssertionError(msg));
       }
+      return ok;
     }
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java
new file mode 100644
index 000000000000..78b2369f431a
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java
@@ -0,0 +1,386 @@
+package org.enso.interpreter.node.expression.builtin.meta;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import java.math.BigInteger;
+import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.EnsoMultiValue;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.text.Text;
+import org.enso.interpreter.runtime.error.WarningsLibrary;
+import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.polyglot.common_utils.Core_Text_Utils;
+
+@GenerateUncached
+public abstract class EqualsSimpleNode extends Node {
+
+  public static EqualsSimpleNode build() {
+    return EqualsSimpleNodeGen.create();
+  }
+
+  public abstract boolean execute(VirtualFrame frame, Object self, Object right);
+
+  @Specialization
+  boolean equalsBoolBool(boolean self, boolean other) {
+    return self == other;
+  }
+
+  @Specialization
+  boolean equalsBoolDouble(boolean self, double other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsBoolLong(boolean self, long other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsBoolBigInt(boolean self, EnsoBigInteger other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsBoolText(boolean self, Text other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsBoolInterop(
+      boolean self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
+    try {
+      return self == interop.asBoolean(other);
+    } catch (UnsupportedMessageException ex) {
+      return false;
+    }
+  }
+
+  @Specialization
+  boolean equalsInteropBool(
+      TruffleObject self,
+      boolean other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
+    try {
+      return other == interop.asBoolean(self);
+    } catch (UnsupportedMessageException ex) {
+      return false;
+    }
+  }
+
+  @Specialization
+  boolean equalsLongLong(long self, long other) {
+    return self == other;
+  }
+
+  @Specialization
+  boolean equalsLongBool(long self, boolean other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsLongDouble(long self, double other) {
+    return (double) self == other;
+  }
+
+  @Specialization
+  boolean equalsLongText(long self, Text other) {
+    return false;
+  }
+
+  @Specialization
+  @TruffleBoundary
+  boolean equalsLongBigInt(long self, EnsoBigInteger other) {
+    if (BigIntegerOps.fitsInLong(other.getValue())) {
+      return BigInteger.valueOf(self).compareTo(other.getValue()) == 0;
+    } else {
+      return false;
+    }
+  }
+
+  @Specialization
+  boolean equalsLongInterop(
+      long self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
+    try {
+      return self == interop.asLong(other);
+    } catch (UnsupportedMessageException ex) {
+      return false;
+    }
+  }
+
+  @Specialization
+  boolean equalsDoubleDouble(double self, double other) {
+    if (Double.isNaN(self) || Double.isNaN(other)) {
+      return false;
+    } else {
+      return self == other;
+    }
+  }
+
+  @Specialization
+  boolean equalsDoubleLong(double self, long other) {
+    return self == (double) other;
+  }
+
+  @Specialization
+  boolean equalsDoubleBool(double self, boolean other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsDoubleText(double self, Text other) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsDoubleInterop(
+      double self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
+    try {
+      if (interop.fitsInDouble(other)) {
+        return self == interop.asDouble(other);
+      }
+      var otherBig = interop.asBigInteger(other);
+      return self == asDouble(otherBig);
+    } catch (UnsupportedMessageException ex) {
+      return false;
+    }
+  }
+
+  @TruffleBoundary
+  private static double asDouble(BigInteger big) {
+    return big.doubleValue();
+  }
+
+  @Specialization(guards = {"isBigInteger(iop, self)", "isBigInteger(iop, other)"})
+  @TruffleBoundary
+  boolean other(
+      Object self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
+    return asBigInteger(iop, self).equals(asBigInteger(iop, other));
+  }
+
+  @Specialization(guards = "isBigInteger(iop, self)")
+  @TruffleBoundary
+  boolean equalsBigIntDouble(
+      Object self,
+      double other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
+    return asBigInteger(iop, self).doubleValue() == other;
+  }
+
+  @Specialization(guards = "isBigInteger(iop, self)")
+  @TruffleBoundary
+  boolean equalsBigIntLong(
+      Object self, long other, @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
+    var v = asBigInteger(iop, self);
+    if (BigIntegerOps.fitsInLong(v)) {
+      return v.compareTo(BigInteger.valueOf(other)) == 0;
+    } else {
+      return false;
+    }
+  }
+
+  @Specialization
+  boolean equalsBigIntText(EnsoBigInteger self, Text other) {
+    return false;
+  }
+
+  @TruffleBoundary
+  @Specialization(guards = {"isBigInteger(iop, self)", "!isPrimitiveValue(other)"})
+  boolean equalsBigIntInterop(
+      Object self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary iop) {
+    try {
+      var otherBigInteger = InteropLibrary.getUncached().asBigInteger(other);
+      return asBigInteger(iop, self).equals(otherBigInteger);
+    } catch (UnsupportedMessageException ex) {
+      return false;
+    }
+  }
+
+  @Specialization(guards = {"selfText.is_normalized()", "otherText.is_normalized()"})
+  boolean equalsTextText(Text selfText, Text otherText) {
+    return selfText.toString().compareTo(otherText.toString()) == 0;
+  }
+
+  @Specialization
+  boolean equalsTextLong(Text selfText, long otherLong) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsTextDouble(Text selfText, double otherDouble) {
+    return false;
+  }
+
+  @Specialization
+  boolean equalsTextBigInt(Text self, EnsoBigInteger other) {
+    return false;
+  }
+
+  /**
+   * Compares interop string with other object. If the other object doesn't support conversion to
+   * String, it is not equal. Otherwise the two strings are compared according to the
+   * lexicographical order, handling Unicode normalization. See {@code Text_Utils.compare_to}.
+   */
+  @TruffleBoundary
+  @Specialization(
+      guards = {"selfInterop.isString(selfString)"},
+      limit = "3")
+  boolean equalsStrings(
+      Object selfString,
+      Object otherString,
+      @CachedLibrary("selfString") InteropLibrary selfInterop,
+      @CachedLibrary("otherString") InteropLibrary otherInterop) {
+    String selfJavaString;
+    String otherJavaString;
+    try {
+      selfJavaString = selfInterop.asString(selfString);
+      otherJavaString = otherInterop.asString(otherString);
+    } catch (UnsupportedMessageException e) {
+      return false;
+    }
+    return Core_Text_Utils.equals(selfJavaString, otherJavaString);
+  }
+
+  @Specialization(guards = "isPrimitive(self, interop) != isPrimitive(other, interop)")
+  boolean equalsDifferent(
+      Object self,
+      Object other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop) {
+    return false;
+  }
+
+  /** Equals for Atoms and AtomConstructors */
+  @Specialization
+  boolean equalsAtomConstructors(AtomConstructor self, AtomConstructor other) {
+    return self == other;
+  }
+
+  @Specialization
+  boolean equalsAtoms(
+      VirtualFrame frame,
+      Atom self,
+      Atom other,
+      @Cached EqualsAtomNode equalsAtomNode,
+      @Shared("isSameObjectNode") @Cached IsSameObjectNode isSameObjectNode) {
+    return isSameObjectNode.execute(self, other) || equalsAtomNode.execute(frame, self, other);
+  }
+
+  @Specialization
+  boolean equalsReverseLong(
+      VirtualFrame frame,
+      TruffleObject self,
+      long other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
+      @Shared("reverse") @Cached EqualsSimpleNode reverse) {
+    return reverse.execute(frame, other, self);
+  }
+
+  @Specialization
+  boolean equalsReverseDouble(
+      VirtualFrame frame,
+      TruffleObject self,
+      double other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
+      @Shared("reverse") @Cached EqualsSimpleNode reverse) {
+    return reverse.execute(frame, other, self);
+  }
+
+  @Specialization
+  boolean equalsReverseBigInt(
+      VirtualFrame frame,
+      TruffleObject self,
+      EnsoBigInteger other,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
+      @Shared("reverse") @Cached EqualsSimpleNode reverse) {
+    return reverse.execute(frame, other, self);
+  }
+
+  @Specialization(guards = "isNotPrimitive(self, other, interop, warnings)")
+  boolean equalsComplex(
+      VirtualFrame frame,
+      Object self,
+      Object other,
+      @Cached EqualsComplexNode equalsComplex,
+      @Shared("isSameObjectNode") @Cached IsSameObjectNode isSameObjectNode,
+      @Shared("interop") @CachedLibrary(limit = "10") InteropLibrary interop,
+      @CachedLibrary(limit = "5") WarningsLibrary warnings) {
+    return isSameObjectNode.execute(self, other) || equalsComplex.execute(frame, self, other);
+  }
+
+  static boolean isNotPrimitive(
+      Object a, Object b, InteropLibrary interop, WarningsLibrary warnings) {
+    if (a instanceof AtomConstructor && b instanceof AtomConstructor) {
+      return false;
+    }
+    if (a instanceof Atom && b instanceof Atom) {
+      return false;
+    }
+    if (warnings.hasWarnings(a) || warnings.hasWarnings(b)) {
+      return true;
+    }
+    if (a instanceof EnsoMultiValue || b instanceof EnsoMultiValue) {
+      return true;
+    }
+    return !isPrimitive(a, interop) && !isPrimitive(b, interop);
+  }
+
+  /**
+   * Return true iff object is a primitive value used in some specializations guard. By primitive
+   * value we mean any value that can be present in Enso, so, for example, not Integer, as that
+   * cannot be present in Enso. All the primitive types should be handled in their corresponding
+   * specializations. See {@link
+   * org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode}.
+   */
+  static boolean isPrimitive(Object object, InteropLibrary interop) {
+    return isPrimitiveValue(object)
+        || object instanceof EnsoBigInteger
+        || object instanceof Text
+        || interop.isString(object)
+        || interop.isNumber(object)
+        || interop.isBoolean(object);
+  }
+
+  static boolean isPrimitiveValue(Object object) {
+    return object instanceof Boolean || object instanceof Long || object instanceof Double;
+  }
+
+  static boolean isBigInteger(InteropLibrary iop, Object v) {
+    if (v instanceof EnsoBigInteger) {
+      return true;
+    } else {
+      return !iop.fitsInDouble(v) && !iop.fitsInLong(v) && iop.fitsInBigInteger(v);
+    }
+  }
+
+  BigInteger asBigInteger(InteropLibrary iop, Object v) {
+    if (v instanceof EnsoBigInteger big) {
+      return big.getValue();
+    } else {
+      try {
+        return iop.asBigInteger(v);
+      } catch (UnsupportedMessageException ex) {
+        throw EnsoContext.get(this).raiseAssertionPanic(this, "Expecting BigInteger", ex);
+      }
+    }
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
index 1b4dd2192aac..159a5a0ea409 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
@@ -83,6 +83,10 @@ public static HashCodeNode build() {
     return HashCodeNodeGen.create();
   }
 
+  static HashCodeNode getUncached() {
+    return HashCodeNodeGen.getUncached();
+  }
+
   public abstract long execute(@AcceptsError Object object);
 
   /** Specializations for primitive values * */
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortArrayNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortArrayNode.java
index 1ed278790603..f34cd00e8a31 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortArrayNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortArrayNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.expression.builtin.ordering;
 
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.AcceptsError;
 import org.enso.interpreter.dsl.BuiltinMethod;
@@ -11,6 +12,7 @@ public final class SortArrayNode extends Node {
   @Child private SortVectorNode sortVectorNode = SortVectorNode.build();
 
   public Object execute(
+      VirtualFrame frame,
       State state,
       @AcceptsError Object self,
       long ascending,
@@ -20,7 +22,15 @@ public Object execute(
       Object onFunc,
       long problemBehavior) {
     return sortVectorNode.execute(
-        state, self, ascending, comparators, compareFunctions, byFunc, onFunc, problemBehavior);
+        frame,
+        state,
+        self,
+        ascending,
+        comparators,
+        compareFunctions,
+        byFunc,
+        onFunc,
+        problemBehavior);
   }
 
   public static SortArrayNode build() {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
index 017aa53ae547..854e99eca2ac 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
@@ -6,6 +6,8 @@
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.MaterializedFrame;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -77,6 +79,7 @@ public static SortVectorNode build() {
    * @return A new, sorted vector.
    */
   public abstract Object execute(
+      VirtualFrame frame,
       State state,
       @AcceptsError Object self,
       long ascending,
@@ -101,6 +104,7 @@ public abstract Object execute(
         "interop.isNull(onFunc)"
       })
   Object sortPrimitives(
+      VirtualFrame frame,
       State state,
       Object self,
       long ascending,
@@ -131,7 +135,14 @@ Object sortPrimitives(
     }
     var javaComparator =
         createDefaultComparator(
-            lessThanNode, equalsNode, typeOfNode, toTextNode, ascending, problemBehavior, interop);
+            frame.materialize(),
+            lessThanNode,
+            equalsNode,
+            typeOfNode,
+            toTextNode,
+            ascending,
+            problemBehavior,
+            interop);
     try {
       return sortPrimitiveVector(elems, javaComparator);
     } catch (CompareException e) {
@@ -142,6 +153,7 @@ Object sortPrimitives(
 
   @TruffleBoundary
   private DefaultSortComparator createDefaultComparator(
+      MaterializedFrame frame,
       LessThanNode lessThanNode,
       EqualsNode equalsNode,
       TypeOfNode typeOfNode,
@@ -150,6 +162,7 @@ private DefaultSortComparator createDefaultComparator(
       long problemBehaviorNum,
       InteropLibrary interop) {
     return new DefaultSortComparator(
+        frame,
         lessThanNode,
         equalsNode,
         typeOfNode,
@@ -165,6 +178,7 @@ private DefaultSortComparator createDefaultComparator(
         "interop.hasArrayElements(self)",
       })
   Object sortGeneric(
+      MaterializedFrame frame,
       State state,
       Object self,
       long ascending,
@@ -206,6 +220,7 @@ Object sortGeneric(
         if (interop.isNull(byFunc) && interop.isNull(onFunc) && isPrimitiveGroup(group)) {
           javaComparator =
               new DefaultSortComparator(
+                  frame,
                   lessThanNode,
                   equalsNode,
                   typeOfNode,
@@ -557,12 +572,14 @@ public boolean hasWarnings() {
    */
   final class DefaultSortComparator extends SortComparator {
 
+    private final MaterializedFrame frame;
     private final LessThanNode lessThanNode;
     private final EqualsNode equalsNode;
     private final TypeOfNode typeOfNode;
     private final boolean ascending;
 
     private DefaultSortComparator(
+        MaterializedFrame frame,
         LessThanNode lessThanNode,
         EqualsNode equalsNode,
         TypeOfNode typeOfNode,
@@ -571,6 +588,7 @@ private DefaultSortComparator(
         ProblemBehavior problemBehavior,
         InteropLibrary interop) {
       super(toTextNode, problemBehavior, interop);
+      this.frame = frame;
       this.lessThanNode = lessThanNode;
       this.equalsNode = equalsNode;
       this.typeOfNode = typeOfNode;
@@ -583,7 +601,7 @@ public int compare(Object x, Object y) {
     }
 
     int compareValuesWithDefaultComparator(Object x, Object y) {
-      if (equalsNode.execute(x, y)) {
+      if (equalsNode.execute(frame, x, y)) {
         return 0;
       } else {
         // Check if x < y
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java
index e402c0a86620..b44f17a6d20f 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java
@@ -385,8 +385,8 @@ private Callable<Boolean> doSerializeModule(
         return saved != null;
       } catch (Throwable e) {
         logSerializationManager(
-            e instanceof IOException ? Level.WARNING : Level.SEVERE,
-            "Serialization of module `" + name + "` failed: " + e.getMessage() + "`",
+            e instanceof IOException ? Level.FINE : Level.SEVERE,
+            "Serialization of module `" + name + "` failed: " + e.getMessage(),
             e);
         throw e;
       } finally {
@@ -399,7 +399,6 @@ private Callable<Boolean> doSerializeModule(
 
   @Override
   public boolean deserializeModule(Compiler compiler, CompilerContext.Module module) {
-    var level = Level.FINE;
     if (module.getPackage() != null) {
       var library = module.getPackage().libraryName();
       var bindings = known.get(library);
@@ -432,13 +431,11 @@ public boolean deserializeModule(Compiler compiler, CompilerContext.Module modul
           return true;
         }
       }
-      level = "Standard".equals(library.namespace()) ? Level.WARNING : Level.FINE;
     }
     try {
       var result = deserializeModuleDirect(module);
       loggerSerializationManager.log(
-          result ? level : Level.FINE,
-          "Deserializing module " + module.getName() + " from IR file: " + result);
+          Level.FINE, "Deserializing module " + module.getName() + " from IR file: " + result);
       return result;
     } catch (InterruptedException e) {
       loggerSerializationManager.log(
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java
index 1b3550f2aaa9..1eb2c679251d 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/EnsoMultiValue.java
@@ -369,7 +369,7 @@ Object getMembers(
       try {
         var members = iop.getMembers(values[i]);
         var len = iop.getArraySize(members);
-        for (var j = 0L; j < len; i++) {
+        for (var j = 0L; j < len; j++) {
           var name = iop.readArrayElement(members, j);
           names.add(iop.asString(name));
         }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
index c960b5aae9c4..e2ae5ac8ed11 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
@@ -3,6 +3,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnknownKeyException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -55,11 +56,11 @@ static EnsoHashMap createEmpty() {
   }
 
   EnsoHashMapBuilder getMapBuilder(
-      boolean readOnly, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+      VirtualFrame frame, boolean readOnly, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
     if (readOnly) {
       return mapBuilder;
     } else {
-      return mapBuilder.asModifiable(generation, hashCodeNode, equalsNode);
+      return mapBuilder.asModifiable(frame, generation, hashCodeNode, equalsNode);
     }
   }
 
@@ -104,7 +105,7 @@ boolean isHashEntryExisting(
       Object key,
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode) {
-    var entry = mapBuilder.get(key, generation, hashCodeNode, equalsNode);
+    var entry = mapBuilder.get(null, key, generation, hashCodeNode, equalsNode);
     return entry != null;
   }
 
@@ -122,7 +123,7 @@ Object readHashValue(
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode)
       throws UnknownKeyException {
-    StorageEntry entry = mapBuilder.get(key, generation, hashCodeNode, equalsNode);
+    StorageEntry entry = mapBuilder.get(null, key, generation, hashCodeNode, equalsNode);
     if (entry != null) {
       return entry.value();
     } else {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
index c1208f2a5fd0..61a0da2e4634 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.hash;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import java.util.Arrays;
 import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
 import org.enso.interpreter.node.expression.builtin.meta.HashCodeNode;
@@ -87,10 +88,10 @@ public StorageEntry[] getEntries(int atGeneration, int size) {
    * Otherwise it may return new builder suitable for additions.
    */
   public EnsoHashMapBuilder asModifiable(
-      int atGeneration, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+      VirtualFrame frame, int atGeneration, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
     if (atGeneration != generation || generation * 4 > byHash.length * 3) {
       var newSize = Math.max(actualSize * 2, byHash.length);
-      return rehash(newSize, atGeneration, hashCodeNode, equalsNode);
+      return rehash(frame, newSize, atGeneration, hashCodeNode, equalsNode);
     } else {
       return this;
     }
@@ -102,7 +103,13 @@ public EnsoHashMapBuilder asModifiable(
    * equal key, it marks it as removed, if it hasn't been removed yet. Once it finds an empty slot,
    * it puts there a new entry with the next generation.
    */
-  public void put(Object key, Object value, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+  public void put(
+      VirtualFrame frame,
+      Object key,
+      Object value,
+      HashCodeNode hashCodeNode,
+      EqualsNode equalsNode) {
+    assert actualSize <= generation;
     var at = findWhereToStart(key, hashCodeNode);
     var nextGeneration = ++generation;
     var replacingExistingKey = false;
@@ -114,7 +121,7 @@ public void put(Object key, Object value, HashCodeNode hashCodeNode, EqualsNode
         byHash[at] = new StorageEntry(key, value, nextGeneration);
         return;
       }
-      if (compare(equalsNode, byHash[at].key(), key)) {
+      if (compare(frame, equalsNode, byHash[at].key(), key)) {
         var invalidatedEntry = byHash[at].markRemoved(nextGeneration);
         if (invalidatedEntry != byHash[at]) {
           byHash[at] = invalidatedEntry;
@@ -133,14 +140,18 @@ public void put(Object key, Object value, HashCodeNode hashCodeNode, EqualsNode
    * given {@code generation}.
    */
   public StorageEntry get(
-      Object key, int generation, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+      VirtualFrame frame,
+      Object key,
+      int generation,
+      HashCodeNode hashCodeNode,
+      EqualsNode equalsNode) {
     var at = findWhereToStart(key, hashCodeNode);
     for (var i = 0; i < byHash.length; i++) {
       if (byHash[at] == null) {
         return null;
       }
       if (byHash[at].isVisible(generation)) {
-        if (compare(equalsNode, key, byHash[at].key())) {
+        if (compare(frame, equalsNode, key, byHash[at].key())) {
           return byHash[at];
         }
       }
@@ -158,20 +169,22 @@ private int findWhereToStart(Object key, HashCodeNode hashCodeNode) {
   }
 
   /**
-   * Removes an entry denoted by the given key. Removal is "non-destrutive" - the "removed" entry
+   * Removes an entry denoted by the given key. Removal is "non-destructive" - the "removed" entry
    * stays in the array - only its {@link StorageEntry#removed()} value is set to the next
    * generation.
    *
    * @return true if the removal was successful false otherwise.
    */
-  public boolean remove(Object key, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+  public boolean remove(
+      VirtualFrame frame, Object key, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+    assert actualSize <= generation;
     var at = findWhereToStart(key, hashCodeNode);
     var nextGeneration = ++generation;
     for (var i = 0; i < byHash.length; i++) {
       if (byHash[at] == null) {
         return false;
       }
-      if (compare(equalsNode, key, byHash[at].key())) {
+      if (compare(frame, equalsNode, key, byHash[at].key())) {
         var invalidatedEntry = byHash[at].markRemoved(nextGeneration);
         if (invalidatedEntry != byHash[at]) {
           byHash[at] = invalidatedEntry;
@@ -191,14 +204,19 @@ public boolean remove(Object key, HashCodeNode hashCodeNode, EqualsNode equalsNo
    * atGeneration}.
    */
   private EnsoHashMapBuilder rehash(
-      int size, int atGeneration, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+      VirtualFrame frame,
+      int size,
+      int atGeneration,
+      HashCodeNode hashCodeNode,
+      EqualsNode equalsNode) {
     var newBuilder = new EnsoHashMapBuilder(size);
     for (var i = 0; i < byHash.length; i++) {
       var entry = byHash[i];
       if (entry != null && entry.isVisible(atGeneration)) {
-        newBuilder.put(entry.key(), entry.value(), hashCodeNode, equalsNode);
+        newBuilder.put(frame, entry.key(), entry.value(), hashCodeNode, equalsNode);
       }
     }
+    assert newBuilder.actualSize <= size;
     return newBuilder;
   }
 
@@ -217,18 +235,20 @@ public EnsoHashMap build() {
 
   @Override
   public String toString() {
-    return "EnsoHashMapBuilder{size = "
+    return "EnsoHashMapBuilder{generation = "
         + generation
+        + ", actualSize = "
+        + actualSize
         + ", storage = "
         + Arrays.toString(byHash)
         + "}";
   }
 
-  private static boolean compare(EqualsNode equalsNode, Object a, Object b) {
+  private static boolean compare(VirtualFrame frame, EqualsNode equalsNode, Object a, Object b) {
     if (a instanceof Double aDbl && b instanceof Double bDbl && aDbl.isNaN() && bDbl.isNaN()) {
       return true;
     } else {
-      return equalsNode.execute(a, b);
+      return equalsNode.execute(frame, a, b);
     }
   }
 
@@ -247,10 +267,12 @@ record StorageEntry(
     }
 
     boolean isVisible(int generation) {
+      assert added() < removed();
       return added() <= generation && generation < removed();
     }
 
     StorageEntry markRemoved(int when) {
+      assert added() < removed();
       if (removed() <= when) {
         return this;
       } else {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
index 8ffc5d9e2402..6f64ed98b2cb 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
@@ -4,6 +4,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.StopIterationException;
@@ -30,17 +31,18 @@ public static HashMapInsertNode build() {
     return HashMapInsertNodeGen.create();
   }
 
-  public abstract EnsoHashMap execute(Object self, Object key, Object value);
+  public abstract EnsoHashMap execute(VirtualFrame frame, Object self, Object key, Object value);
 
   @Specialization
   EnsoHashMap doEnsoHashMap(
+      VirtualFrame frame,
       EnsoHashMap hashMap,
       Object key,
       Object value,
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode) {
-    var mapBuilder = hashMap.getMapBuilder(false, hashCodeNode, equalsNode);
-    mapBuilder.put(key, value, hashCodeNode, equalsNode);
+    var mapBuilder = hashMap.getMapBuilder(frame, false, hashCodeNode, equalsNode);
+    mapBuilder.put(frame, key, value, hashCodeNode, equalsNode);
     var newMap = mapBuilder.build();
     return newMap;
   }
@@ -51,6 +53,7 @@ EnsoHashMap doEnsoHashMap(
    */
   @Specialization(guards = "mapInterop.hasHashEntries(foreignMap)", limit = "3")
   EnsoHashMap doForeign(
+      VirtualFrame frame,
       Object foreignMap,
       Object keyToInsert,
       Object valueToInsert,
@@ -65,8 +68,9 @@ EnsoHashMap doForeign(
         Object keyValueArr = iteratorInterop.getIteratorNextElement(entriesIterator);
         Object key = iteratorInterop.readArrayElement(keyValueArr, 0);
         Object value = iteratorInterop.readArrayElement(keyValueArr, 1);
-        mapBuilder = mapBuilder.asModifiable(mapBuilder.generation(), hashCodeNode, equalsNode);
-        mapBuilder.put(key, value, hashCodeNode, equalsNode);
+        mapBuilder =
+            mapBuilder.asModifiable(frame, mapBuilder.generation(), hashCodeNode, equalsNode);
+        mapBuilder.put(frame, key, value, hashCodeNode, equalsNode);
       }
     } catch (UnsupportedMessageException | StopIterationException | InvalidArrayIndexException e) {
       CompilerDirectives.transferToInterpreter();
@@ -76,8 +80,8 @@ EnsoHashMap doForeign(
               + " has wrongly specified Interop API (hash entries iterator)";
       throw new PanicException(Text.create(msg), this);
     }
-    mapBuilder = mapBuilder.asModifiable(mapBuilder.generation(), hashCodeNode, equalsNode);
-    mapBuilder.put(keyToInsert, valueToInsert, hashCodeNode, equalsNode);
+    mapBuilder = mapBuilder.asModifiable(frame, mapBuilder.generation(), hashCodeNode, equalsNode);
+    mapBuilder.put(frame, keyToInsert, valueToInsert, hashCodeNode, equalsNode);
     return EnsoHashMap.createWithBuilder(mapBuilder);
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapRemoveNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapRemoveNode.java
index b19f6e915b2e..79b2acb3625c 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapRemoveNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapRemoveNode.java
@@ -3,8 +3,10 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.StopIterationException;
@@ -29,24 +31,26 @@ public static HashMapRemoveNode build() {
     return HashMapRemoveNodeGen.create();
   }
 
-  public abstract EnsoHashMap execute(Object self, Object key);
+  public abstract EnsoHashMap execute(VirtualFrame frame, Object self, Object key);
 
   @Specialization
   EnsoHashMap removeFromEnsoMap(
+      VirtualFrame frame,
       EnsoHashMap ensoMap,
       Object key,
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode) {
-    var mapBuilder = ensoMap.getMapBuilder(false, hashCodeNode, equalsNode);
-    if (mapBuilder.remove(key, hashCodeNode, equalsNode)) {
+    var mapBuilder = ensoMap.getMapBuilder(frame, false, hashCodeNode, equalsNode);
+    if (mapBuilder.remove(frame, key, hashCodeNode, equalsNode)) {
       return mapBuilder.build();
     } else {
       throw DataflowError.withoutTrace("No such key", null);
     }
   }
 
-  @Specialization(guards = "interop.hasHashEntries(map)")
+  @Fallback
   EnsoHashMap removeFromInteropMap(
+      VirtualFrame frame,
       Object map,
       Object keyToRemove,
       @CachedLibrary(limit = "5") InteropLibrary interop,
@@ -62,7 +66,7 @@ EnsoHashMap removeFromInteropMap(
       while (interop.hasIteratorNextElement(entriesIterator)) {
         Object keyValueArr = interop.getIteratorNextElement(entriesIterator);
         Object key = interop.readArrayElement(keyValueArr, 0);
-        if ((boolean) equalsNode.execute(keyToRemove, key)) {
+        if (polyglotEquals(key, keyToRemove, frame, equalsNode, interop)) {
           if (keyToRemoveFound) {
             CompilerDirectives.transferToInterpreter();
             var ctx = EnsoContext.get(this);
@@ -72,8 +76,9 @@ EnsoHashMap removeFromInteropMap(
           }
         } else {
           Object value = interop.readArrayElement(keyValueArr, 1);
-          mapBuilder = mapBuilder.asModifiable(mapBuilder.generation(), hashCodeNode, equalsNode);
-          mapBuilder.put(key, value, hashCodeNode, equalsNode);
+          mapBuilder =
+              mapBuilder.asModifiable(frame, mapBuilder.generation(), hashCodeNode, equalsNode);
+          mapBuilder.put(frame, key, value, hashCodeNode, equalsNode);
         }
       }
     } catch (UnsupportedMessageException | StopIterationException | InvalidArrayIndexException e) {
@@ -90,4 +95,22 @@ EnsoHashMap removeFromInteropMap(
       throw DataflowError.withoutTrace("No such key " + keyToRemove, interop);
     }
   }
+
+  /** A special case of equals - we want to be able to remove NaN from the map. */
+  private static boolean polyglotEquals(
+      Object obj1, Object obj2, VirtualFrame frame, EqualsNode equalsNode, InteropLibrary interop) {
+    if (isNan(obj1, interop) && isNan(obj2, interop)) {
+      return true;
+    } else {
+      return equalsNode.execute(frame, obj1, obj2);
+    }
+  }
+
+  private static boolean isNan(Object obj, InteropLibrary interop) {
+    try {
+      return interop.fitsInDouble(obj) && Double.isNaN(interop.asDouble(obj));
+    } catch (UnsupportedMessageException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    }
+  }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
index 4f72c5c36c3f..8ef123aa576e 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
@@ -1,7 +1,9 @@
 package org.enso.interpreter.runtime.data.vector;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.CachedLibrary;
 import java.nio.ByteBuffer;
 import org.enso.interpreter.dsl.Builtin;
@@ -21,7 +23,19 @@ private ArrayLikeHelpers() {}
       name = "new_array_proxy_builtin",
       description = "Creates an array backed by a proxy object.")
   @Builtin.WrapException(from = IllegalArgumentException.class)
-  public static EnsoObject create(long length, Object at) throws IllegalArgumentException {
+  @Builtin.Specialize
+  public static EnsoObject create(
+      long length, Object at, @CachedLibrary(limit = "3") InteropLibrary interop)
+      throws IllegalArgumentException {
+    if (!interop.isExecutable(at)) {
+      CompilerDirectives.transferToInterpreter();
+      var msg = "Array_Proxy needs executable function.";
+      throw ArrayPanics.typeError(interop, at, msg);
+    }
+    if (length < 0) {
+      CompilerDirectives.transferToInterpreter();
+      throw new IllegalArgumentException("Array_Proxy length cannot be negative.");
+    }
     return ArrayProxy.create(length, at);
   }
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
index 34f41693236a..4320f2c1feb7 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayProxy.java
@@ -30,25 +30,14 @@ final class ArrayProxy implements EnsoObject {
   private final long length;
   private final Object at;
 
-  private ArrayProxy(long length, Object at) throws IllegalArgumentException {
-    if (CompilerDirectives.inInterpreter()) {
-      InteropLibrary interop = InteropLibrary.getUncached();
-      if (!interop.isExecutable(at)) {
-        var msg = "Array_Proxy needs executable function.";
-        throw ArrayPanics.typeError(interop, at, msg);
-      }
-    }
-
-    if (length < 0) {
-      CompilerDirectives.transferToInterpreter();
-      throw new IllegalArgumentException("Array_Proxy length cannot be negative.");
-    }
-
+  private ArrayProxy(long length, Object at) {
+    assert length >= 0;
+    assert InteropLibrary.getUncached().isExecutable(at);
     this.length = length;
     this.at = at;
   }
 
-  static ArrayProxy create(long length, Object at) throws IllegalArgumentException {
+  static ArrayProxy create(long length, Object at) {
     return new ArrayProxy(length, at);
   }
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
index 0d530d724fb4..9945a6d877de 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
@@ -231,7 +231,7 @@ public long getSequenceId() {
   public Warning reassign(Node location) {
     RootNode root = location.getRootNode();
     SourceSection section = location.getEncapsulatingSourceSection();
-    Reassignment reassignment = new Reassignment(root.getName(), section);
+    Reassignment reassignment = new Reassignment(root == null ? "" : root.getName(), section);
     return new Warning(value, origin, sequenceId, reassignments.prepend(reassignment));
   }
 
diff --git a/engine/runtime/src/test/java/org/enso/runtime/test/DependenciesTest.java b/engine/runtime/src/test/java/org/enso/runtime/test/DependenciesTest.java
new file mode 100644
index 000000000000..ed927ee4f1a3
--- /dev/null
+++ b/engine/runtime/src/test/java/org/enso/runtime/test/DependenciesTest.java
@@ -0,0 +1,17 @@
+package org.enso.runtime.test;
+
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+public class DependenciesTest {
+  @Test
+  public void noAkkaDependencies() {
+    try {
+      Class.forName("akka.actor.ActorSystem$");
+      fail("akka.actor.ActorSystem should not be on the classpath");
+    } catch (ClassNotFoundException e) {
+      // expected
+    }
+  }
+}
diff --git a/lib/java/persistance/src/main/java/org/enso/persist/PerMap.java b/lib/java/persistance/src/main/java/org/enso/persist/PerMap.java
index fd640994c1f6..253884d825eb 100644
--- a/lib/java/persistance/src/main/java/org/enso/persist/PerMap.java
+++ b/lib/java/persistance/src/main/java/org/enso/persist/PerMap.java
@@ -7,6 +7,8 @@
 import org.openide.util.lookup.Lookups;
 
 final class PerMap {
+
+  private static final int serialVersionUID = 8689; // Use PR number
   private static final Collection<? extends Persistance> ALL;
 
   static {
@@ -20,7 +22,7 @@ final class PerMap {
   final int versionStamp;
 
   private PerMap() {
-    int hash = 0;
+    int hash = serialVersionUID;
     for (var orig : ALL) {
       var p = orig.newClone();
       var prevId = ids.put(p.id, p);
diff --git a/lib/rust/parser/debug/tests/parse.rs b/lib/rust/parser/debug/tests/parse.rs
index 4665cd017cfa..d3b2c3b7ddf3 100644
--- a/lib/rust/parser/debug/tests/parse.rs
+++ b/lib/rust/parser/debug/tests/parse.rs
@@ -104,6 +104,61 @@ fn else_block() {
                           ((Ident else) (BodyBlock #((Ident False))))))]);
 }
 
+#[test]
+fn if_then_else_chained_block() {
+    #[rustfmt::skip]
+    test("if True then True else False\n    . to_text", block![
+        (OperatorBlockApplication
+            (MultiSegmentApp #(((Ident if) (Ident True))
+                ((Ident then) (Ident True))
+                ((Ident else) (Ident False)
+            )))
+            #(((Ok ".") (Ident to_text)))
+            #()
+        )]);
+}
+
+#[test]
+fn if_then_else_chained_block_with_group() {
+    #[rustfmt::skip]
+    test("(if True then True else False)\n    . to_text", block![
+        (OperatorBlockApplication
+            (Group (MultiSegmentApp #(((Ident if) (Ident True))
+                ((Ident then) (Ident True))
+                ((Ident else) (Ident False)
+            ))))
+            #(((Ok ".") (Ident to_text)))
+            #()
+        )]);
+}
+
+#[test]
+fn if_then_else_chained_block_multi2() {
+    #[rustfmt::skip]
+    test("if True then True else False\n    . to_text\n    . as_value", block![
+        (OperatorBlockApplication
+            (MultiSegmentApp #(((Ident if) (Ident True))
+                ((Ident then) (Ident True))
+                ((Ident else) (Ident False)
+            )))
+            #(((Ok ".") (Ident to_text)) ((Ok ".") (Ident as_value)))
+            #()
+        )]);
+}
+
+#[test]
+fn if_then_else_chained_block_multi3() {
+    #[rustfmt::skip]
+    test("if True then True else False\n    . to_text\n    . as_value\n    . done 42", block![
+        (OperatorBlockApplication
+            (MultiSegmentApp #(((Ident if) (Ident True))
+                ((Ident then) (Ident True))
+                ((Ident else) (Ident False)
+            )))
+            #(((Ok ".") (Ident to_text)) ((Ok ".") (Ident as_value)) ((Ok ".") (App (Ident done) (Number () "42" ()))))
+            #()
+        )]);
+}
 
 // === Comments ===
 
diff --git a/lib/rust/parser/src/macros/built_in.rs b/lib/rust/parser/src/macros/built_in.rs
index 3c9e44f961e3..908b76ba3208 100644
--- a/lib/rust/parser/src/macros/built_in.rs
+++ b/lib/rust/parser/src/macros/built_in.rs
@@ -230,7 +230,7 @@ fn export_body<'s>(
 /// If-then-else macro definition.
 pub fn if_then_else<'s>() -> Definition<'s> {
     crate::macro_definition! {
-    ("if", everything(), "then", everything(), "else", everything()) if_body}
+    ("if", everything(), "then", everything(), "else", or(block(), many(not_block()))) if_body}
 }
 
 /// If-then macro definition.
diff --git a/lib/rust/parser/src/macros/expand.rs b/lib/rust/parser/src/macros/expand.rs
index 373b35626056..e12bfe593273 100644
--- a/lib/rust/parser/src/macros/expand.rs
+++ b/lib/rust/parser/src/macros/expand.rs
@@ -162,6 +162,7 @@ impl<'s> Match<'s> {
             | Self::Nothing
             | Self::Identifier(_)
             | Self::Expected(_, _)
+            | Self::Block(_)
             | Self::NotBlock(_) => {}
             Self::Or(box OrMatch::First(item) | box OrMatch::Second(item)) =>
                 item.build_var_map(tree, validator),
diff --git a/lib/rust/parser/src/macros/pattern.rs b/lib/rust/parser/src/macros/pattern.rs
index ff3143767163..350134c2e436 100644
--- a/lib/rust/parser/src/macros/pattern.rs
+++ b/lib/rust/parser/src/macros/pattern.rs
@@ -57,6 +57,10 @@ pub enum PatternData {
     Expected(String, Pattern),
     /// Named pattern. Mainly used for splicing the code in the macro definition body.
     Named(String, Pattern),
+    /// Consume a block.
+    Block,
+    /// Consume any item except a block.
+    NotBlock,
 }
 
 /// Constructor.
@@ -103,6 +107,16 @@ pub fn named(message: impl Into<String>, item: Pattern) -> Pattern {
     Pattern::new(PatternData::Named(message.into(), item), matches_empty_input)
 }
 
+/// Matches a block.
+pub fn block() -> Pattern {
+    Pattern::new(PatternData::Block, false)
+}
+
+/// Matches anything except a block.
+pub fn not_block() -> Pattern {
+    Pattern::new(PatternData::NotBlock, false)
+}
+
 impl Pattern {
     /// Repeat the current pattern multiple times.
     pub fn many(self) -> Self {
@@ -171,6 +185,7 @@ pub enum Match<'s> {
     Identifier(syntax::Item<'s>),
     Expected(String, Box<Match<'s>>),
     Named(String, Box<Match<'s>>),
+    Block(Vec<syntax::item::Line<'s>>),
     NotBlock(syntax::Item<'s>),
 }
 
@@ -208,6 +223,7 @@ impl<'s> Match<'s> {
         match self {
             Self::Nothing => (),
             Self::Identifier(item) | Self::NotBlock(item) => out.push(item),
+            Self::Block(lines) => out.push(syntax::Item::Block(lines)),
             Self::Everything(tokens) => out.extend(tokens),
             Self::Seq(fst, snd) => {
                 fst.get_tokens(out);
@@ -341,6 +357,23 @@ impl Pattern {
                         Err(input)
                     },
             },
+            PatternData::Block => match input.pop_front() {
+                None => Err(default()),
+                Some(syntax::Item::Block(lines)) =>
+                    Ok(MatchResult::new(Match::Block(lines), input)),
+                Some(t) => {
+                    input.push_front(t);
+                    Err(input)
+                }
+            },
+            PatternData::NotBlock => match input.pop_front() {
+                None => Err(default()),
+                Some(t @ syntax::Item::Block(_)) => {
+                    input.push_front(t);
+                    Err(input)
+                }
+                Some(t) => Ok(MatchResult::new(Match::NotBlock(t), input)),
+            },
         }
     }
 }
diff --git a/lib/scala/connected-lock-manager/src/main/scala/org/enso/lockmanager/server/LockManagerService.scala b/lib/scala/connected-lock-manager-server/src/main/scala/org/enso/lockmanager/server/LockManagerService.scala
similarity index 100%
rename from lib/scala/connected-lock-manager/src/main/scala/org/enso/lockmanager/server/LockManagerService.scala
rename to lib/scala/connected-lock-manager-server/src/main/scala/org/enso/lockmanager/server/LockManagerService.scala
diff --git a/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/DefaultVersion.scala b/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/DefaultVersion.scala
index 94d6c3e448d1..006d4cec15c6 100644
--- a/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/DefaultVersion.scala
+++ b/lib/scala/distribution-manager/src/main/scala/org/enso/distribution/config/DefaultVersion.scala
@@ -2,9 +2,9 @@ package org.enso.distribution.config
 
 import io.circe.syntax._
 import io.circe.{Decoder, Encoder, Json}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.arguments.{Argument, OptsParseError}
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 
 /** Default version that is used when launching Enso outside of projects and
   * when creating new projects.
@@ -63,7 +63,13 @@ object DefaultVersion {
     * version string.
     */
   implicit val semverArgument: Argument[SemVer] = (string: String) =>
-    SemVer(string).toRight(
-      OptsParseError(s"`$string` is not a valid semantic version string.")
-    )
+    SemVer
+      .parse(string)
+      .fold(
+        _ =>
+          Left(
+            OptsParseError(s"`$string` is not a valid semantic version string.")
+          ),
+        v => Right(v)
+      )
 }
diff --git a/lib/scala/downloader/src/main/java/org/enso/downloader/http/FilesMultipartBodyPublisher.java b/lib/scala/downloader/src/main/java/org/enso/downloader/http/FilesMultipartBodyPublisher.java
new file mode 100644
index 000000000000..0f6c96c5a101
--- /dev/null
+++ b/lib/scala/downloader/src/main/java/org/enso/downloader/http/FilesMultipartBodyPublisher.java
@@ -0,0 +1,48 @@
+package org.enso.downloader.http;
+
+import java.io.IOException;
+import java.net.http.HttpRequest;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * This utility class adds support for {@code multipart/form-data} content-type as there is no such
+ * support in {@code java.net.http} JDK.
+ *
+ * <p>Inspired by <a href="https://stackoverflow.com/a/56482187/4816269">SO</a>.
+ */
+public class FilesMultipartBodyPublisher {
+  public static HttpRequest.BodyPublisher ofMimeMultipartData(
+      Collection<Path> files, String boundary) throws IOException {
+    // Result request body
+    List<byte[]> byteArrays = new ArrayList<>();
+
+    // Separator with boundary
+    byte[] separator =
+        ("--" + boundary + "\r\nContent-Disposition: form-data; name=\"files\";")
+            .getBytes(StandardCharsets.UTF_8);
+
+    for (Path path : files) {
+      // Opening boundary
+      byteArrays.add(separator);
+
+      // If value is type of Path (file) append content type with file name and file binaries,
+      // otherwise simply append key=value
+      String mimeType = Files.probeContentType(path);
+      byteArrays.add(
+          (" filename=\"" + path.getFileName() + "\"\r\nContent-Type: " + mimeType + "\r\n\r\n")
+              .getBytes(StandardCharsets.UTF_8));
+      byteArrays.add(Files.readAllBytes(path));
+      byteArrays.add("\r\n".getBytes(StandardCharsets.UTF_8));
+    }
+
+    // Closing boundary
+    byteArrays.add(("--" + boundary + "--").getBytes(StandardCharsets.UTF_8));
+
+    return HttpRequest.BodyPublishers.ofByteArrays(byteArrays);
+  }
+}
diff --git a/lib/scala/downloader/src/main/java/org/enso/downloader/http/PathProgressBodyHandler.java b/lib/scala/downloader/src/main/java/org/enso/downloader/http/PathProgressBodyHandler.java
new file mode 100644
index 000000000000..02f94048e40c
--- /dev/null
+++ b/lib/scala/downloader/src/main/java/org/enso/downloader/http/PathProgressBodyHandler.java
@@ -0,0 +1,116 @@
+package org.enso.downloader.http;
+
+import java.io.IOException;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.ResponseInfo;
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
+import org.enso.cli.task.TaskProgressImplementation;
+import scala.Option;
+import scala.Some;
+
+/** A {@link HttpResponse} body handler for {@link Path} that keeps track of the progress. */
+class PathProgressBodyHandler implements HttpResponse.BodyHandler<Path> {
+  private final Path destination;
+  private final TaskProgressImplementation<Path> progress;
+  private Long total;
+
+  private PathProgressBodyHandler(
+      Path destination, TaskProgressImplementation<Path> progress, Long total) {
+    this.destination = destination;
+    this.progress = progress;
+    this.total = total;
+  }
+
+  static PathProgressBodyHandler of(
+      Path destination, TaskProgressImplementation<Path> progress, Long sizeHint) {
+    return new PathProgressBodyHandler(destination, progress, sizeHint);
+  }
+
+  @Override
+  public BodySubscriber<Path> apply(ResponseInfo responseInfo) {
+    if (total == null) {
+      var reportedLenOpt = responseInfo.headers().firstValueAsLong("Content-Length");
+      if (reportedLenOpt.isPresent()) {
+        total = reportedLenOpt.getAsLong();
+      }
+    }
+    if (total != null) {
+      progress.reportProgress(0, Some.apply(total));
+    } else {
+      progress.reportProgress(0, Option.empty());
+    }
+    WritableByteChannel destChannel;
+    try {
+      destChannel =
+          Files.newByteChannel(destination, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+    return new ProgressSubscriber(destChannel);
+  }
+
+  private class ProgressSubscriber implements BodySubscriber<Path> {
+    private Flow.Subscription subscription;
+    private final WritableByteChannel destChannel;
+    private final CompletableFuture<Path> result = new CompletableFuture<>();
+
+    ProgressSubscriber(WritableByteChannel destChannel) {
+      this.destChannel = destChannel;
+    }
+
+    @Override
+    public void onSubscribe(Flow.Subscription subscription) {
+      this.subscription = subscription;
+      this.subscription.request(1);
+    }
+
+    @Override
+    public void onNext(List<ByteBuffer> items) {
+      try {
+        for (ByteBuffer item : items) {
+          var len = item.remaining();
+          progress.reportProgress(len, total == null ? Option.empty() : Some.apply(total));
+          destChannel.write(item);
+        }
+        subscription.request(1);
+      } catch (IOException e) {
+        subscription.cancel();
+        throw new RuntimeException(e);
+      }
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+      try {
+        destChannel.close();
+      } catch (IOException e) {
+        throwable.addSuppressed(e);
+      }
+      result.completeExceptionally(throwable);
+    }
+
+    @Override
+    public void onComplete() {
+      try {
+        destChannel.close();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+      result.complete(destination);
+    }
+
+    @Override
+    public CompletionStage<Path> getBody() {
+      return CompletableFuture.completedFuture(destination);
+    }
+  }
+}
diff --git a/lib/scala/downloader/src/main/java/org/enso/downloader/http/StringProgressBodyHandler.java b/lib/scala/downloader/src/main/java/org/enso/downloader/http/StringProgressBodyHandler.java
new file mode 100644
index 000000000000..ba725b9d4923
--- /dev/null
+++ b/lib/scala/downloader/src/main/java/org/enso/downloader/http/StringProgressBodyHandler.java
@@ -0,0 +1,100 @@
+package org.enso.downloader.http;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Flow;
+import org.enso.cli.task.TaskProgressImplementation;
+import scala.Option;
+import scala.Some;
+
+/** A {@link HttpResponse} body handler for {@link Path} that keeps track of the progress. */
+public class StringProgressBodyHandler implements HttpResponse.BodyHandler<String> {
+  private final ByteArrayOutputStream destination = new ByteArrayOutputStream();
+  private final TaskProgressImplementation<?> progress;
+  private final Charset encoding;
+  private Long total;
+
+  private StringProgressBodyHandler(
+      TaskProgressImplementation<?> progress, Charset encoding, Long total) {
+    this.progress = progress;
+    this.encoding = encoding;
+    this.total = total;
+  }
+
+  public static StringProgressBodyHandler of(
+      TaskProgressImplementation<?> progress, Long sizeHint, Charset encoding) {
+    return new StringProgressBodyHandler(progress, encoding, sizeHint);
+  }
+
+  @Override
+  public HttpResponse.BodySubscriber<String> apply(HttpResponse.ResponseInfo responseInfo) {
+    if (total == null) {
+      var reportedLenOpt = responseInfo.headers().firstValueAsLong("Content-Length");
+      if (reportedLenOpt.isPresent()) {
+        total = reportedLenOpt.getAsLong();
+      }
+    }
+    if (total != null) {
+      progress.reportProgress(0, Some.apply(total));
+    } else {
+      progress.reportProgress(0, Option.empty());
+    }
+    return new ProgressSubscriber();
+  }
+
+  private class ProgressSubscriber implements BodySubscriber<String> {
+    private Flow.Subscription subscription;
+    private final CompletableFuture<String> result = new CompletableFuture<>();
+
+    @Override
+    public void onSubscribe(Flow.Subscription subscription) {
+      this.subscription = subscription;
+      this.subscription.request(Long.MAX_VALUE);
+    }
+
+    @Override
+    public void onNext(List<ByteBuffer> items) {
+      for (ByteBuffer item : items) {
+        var len = item.remaining();
+        progress.reportProgress(len, total == null ? Option.empty() : Some.apply(total));
+        byte[] bytes = new byte[len];
+        item.get(bytes);
+        destination.write(bytes, 0, bytes.length);
+      }
+      subscription.request(Long.MAX_VALUE);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+      try {
+        destination.close();
+      } catch (IOException e) {
+        throwable.addSuppressed(e);
+      }
+      result.completeExceptionally(throwable);
+    }
+
+    @Override
+    public void onComplete() {
+      try {
+        destination.close();
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+      result.complete(destination.toString(encoding));
+    }
+
+    @Override
+    public CompletionStage<String> getBody() {
+      return result;
+    }
+  }
+}
diff --git a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPDownload.scala b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPDownload.scala
index e89171b791b9..a3a3af6330ed 100644
--- a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPDownload.scala
+++ b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPDownload.scala
@@ -1,12 +1,5 @@
 package org.enso.downloader.http
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.headers.Location
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
-import akka.stream.scaladsl.{FileIO, Sink}
-import akka.util.ByteString
-import com.typesafe.config.{ConfigFactory, ConfigValueFactory}
 import com.typesafe.scalalogging.Logger
 import org.enso.cli.task.{
   ProgressUnit,
@@ -14,11 +7,12 @@ import org.enso.cli.task.{
   TaskProgressImplementation
 }
 
+import java.net.URI
+import java.net.http.{HttpClient, HttpHeaders, HttpResponse}
 import java.nio.charset.{Charset, StandardCharsets}
-import java.nio.file.Path
-import scala.concurrent.Future
-import scala.jdk.CollectionConverters.IterableHasAsJava
-import scala.util.{Failure, Success, Try}
+import java.nio.file.{Files, Path}
+import java.util.concurrent.{CompletableFuture, Executors}
+import scala.util.{Failure, Success}
 
 /** Contains utility functions for fetching data using the HTTP(S) protocol. */
 object HTTPDownload {
@@ -50,23 +44,60 @@ object HTTPDownload {
     sizeHint: Option[Long] = None,
     encoding: Charset      = StandardCharsets.UTF_8
   ): TaskProgress[APIResponse] = {
-    logger.debug("Fetching [{}].", request.requestImpl.getUri())
-    def combineChunks(chunks: Seq[ByteString]): String =
-      chunks.reduceOption(_ ++ _).map(_.decodeString(encoding)).getOrElse("")
-    runRequest(
-      request              = request.requestImpl,
-      sizeHint             = sizeHint,
-      earlyResponseMapping = response => Success(response),
-      sink                 = Sink.seq,
-      resultMapping = (response, chunks: Seq[ByteString]) =>
-        Success(
-          APIResponse(
-            combineChunks(chunks),
-            response.headers.map(header => Header(header.name, header.value)),
-            response.status.intValue()
+    logger.debug("Fetching [{}].", request.requestImpl.uri())
+    val taskProgress =
+      new TaskProgressImplementation[APIResponse](ProgressUnit.Bytes)
+    val total: java.lang.Long = if (sizeHint.isDefined) sizeHint.get else null
+    val bodyHandler =
+      StringProgressBodyHandler.of(taskProgress, total, encoding)
+    asyncDownload(request, bodyHandler)
+      .thenAccept(res => {
+        if (res.statusCode() == 404) {
+          taskProgress.setComplete(Failure(ResourceNotFound()))
+        } else {
+          taskProgress.setComplete(
+            Success(
+              APIResponse(
+                res.body(),
+                convertHeaders(res.headers()),
+                res.statusCode()
+              )
+            )
           )
+        }
+      })
+      .exceptionally(ex => {
+        taskProgress.setComplete(
+          Failure(HTTPException(s"Server responded with: [${ex.getMessage}]."))
         )
-    )
+        null
+      })
+    taskProgress
+  }
+
+  private def asyncDownload[T](
+    request: HTTPRequest,
+    bodyHandler: HttpResponse.BodyHandler[T]
+  ): CompletableFuture[HttpResponse[T]] = {
+    val vThreadExecutor = Executors.newVirtualThreadPerTaskExecutor()
+    val httpClient = HttpClient
+      .newBuilder()
+      .followRedirects(HttpClient.Redirect.NORMAL)
+      .executor(vThreadExecutor)
+      .build()
+    httpClient.sendAsync(request.requestImpl, bodyHandler)
+  }
+
+  private def convertHeaders(
+    headers: HttpHeaders
+  ): Seq[Header] = {
+    val headerBuilder = Seq.newBuilder[Header]
+    headers.map().forEach { case (name, values) =>
+      values.forEach(value => {
+        headerBuilder += Header(name, value)
+      })
+    }
+    headerBuilder.result()
   }
 
   /** Fetches the `uri` and tries to decode is as a [[String]].
@@ -78,7 +109,7 @@ object HTTPDownload {
     * @return a [[TaskProgress]] that tracks progress of the download and can
     *         be used to get the final result
     */
-  def fetchString(uri: Uri): TaskProgress[APIResponse] = {
+  def fetchString(uri: URI): TaskProgress[APIResponse] = {
     val request = HTTPRequestBuilder.fromURI(uri).GET
     fetchString(request)
   }
@@ -108,25 +139,29 @@ object HTTPDownload {
   ): TaskProgress[Path] = {
     logger.debug(
       "Downloading [{}] to [{}].",
-      request.requestImpl.getUri(),
+      request.requestImpl.uri(),
       destination
     )
-    runRequest(
-      request  = request.requestImpl,
-      sizeHint = sizeHint,
-      earlyResponseMapping = { response =>
-        if (response.status.isSuccess)
-          Success(response)
-        else if (response.status.intValue == 404)
-          Failure(ResourceNotFound())
-        else
-          Failure(
-            HTTPException(s"Server responded with: [${response.status.value}].")
-          )
-      },
-      sink          = FileIO.toPath(destination),
-      resultMapping = (_, _: Any) => Success(destination)
-    )
+    val taskProgress          = new TaskProgressImplementation[Path](ProgressUnit.Bytes)
+    val total: java.lang.Long = if (sizeHint.isDefined) sizeHint.get else null
+    val bodyHandler =
+      PathProgressBodyHandler.of(destination, taskProgress, total)
+    asyncDownload(request, bodyHandler)
+      .thenAccept(res => {
+        if (res.statusCode() == 404) {
+          taskProgress.setComplete(Failure(ResourceNotFound()))
+          Files.deleteIfExists(destination)
+        } else {
+          taskProgress.setComplete(Success(destination))
+        }
+      })
+      .exceptionally(ex => {
+        taskProgress.setComplete(
+          Failure(HTTPException(s"Server responded with: [${ex.getMessage}]."))
+        )
+        null
+      })
+    taskProgress
   }
 
   /** Downloads the `uri` and saves the response in the file pointed by the
@@ -139,138 +174,9 @@ object HTTPDownload {
     * @return a [[TaskProgress]] that tracks progress of the download and can
     *         be used to wait for the completion of the download.
     */
-  def download(uri: Uri, destination: Path): TaskProgress[Path] = {
+  def download(uri: URI, destination: Path): TaskProgress[Path] = {
     val request = HTTPRequestBuilder.fromURI(uri).GET
     download(request, destination)
   }
 
-  implicit private lazy val actorSystem: ActorSystem = {
-    val loggers: java.lang.Iterable[String] =
-      Seq("akka.event.slf4j.Slf4jLogger").asJava
-    val config = ConfigFactory
-      .load()
-      .withValue(
-        "akka.extensions",
-        ConfigValueFactory.fromAnyRef(Seq.empty.asJava)
-      )
-      .withValue(
-        "akka.library-extensions",
-        ConfigValueFactory.fromAnyRef(Seq.empty.asJava)
-      )
-      .withValue("akka.daemonic", ConfigValueFactory.fromAnyRef("on"))
-      .withValue("akka.loggers", ConfigValueFactory.fromAnyRef(loggers))
-      .withValue(
-        "akka.logging-filter",
-        ConfigValueFactory.fromAnyRef("akka.event.DefaultLoggingFilter")
-      )
-      .withValue("akka.loglevel", ConfigValueFactory.fromAnyRef("WARNING"))
-
-    ActorSystem(
-      "http-requests-actor-system",
-      config,
-      classLoader = getClass.getClassLoader // Note [Actor System Class Loader]
-    )
-  }
-
-  /** Starts the request and returns a [[TaskProgress]] that can be used to
-    * track download progress and get the result.
-    *
-    * @tparam A type of the result returned by `sink`
-    * @tparam B type of the final result that will be contained in the returned
-    *           [[TaskProgress]]
-    * @param request  the request to start
-    * @param sizeHint an optional hint indicating the expected size of the
-    *                  response. It is used if the response does not include
-    *                  explicit Content-Length header.
-    * @param earlyResponseMapping a mapping that can be used to alter the
-    *                             response or handle any early errors; it is run
-    *                             before passing the response through the
-    *                             `sink`; thus it can be used to avoid creating
-    *                             downloaded files if the request fails
-    * @param sink specifies how the response content should be handled, it
-    *             receives chunks of [[ByteString]] and should produce a
-    *             [[Future]] with some result
-    * @param resultMapping maps the `sink` result and the response into a final
-    *                      result type, it can use the response instance to for
-    *                      example, access the headers, but the entity cannot be
-    *                      used as it will already be drained
-    * @return a [[TaskProgress]] that will contain the final result or any
-    *         errors
-    */
-  private def runRequest[A, B](
-    request: HttpRequest,
-    sizeHint: Option[Long],
-    earlyResponseMapping: HttpResponse => Try[HttpResponse],
-    sink: Sink[ByteString, Future[A]],
-    resultMapping: (HttpResponse, A) => Try[B]
-  ): TaskProgress[B] = {
-    // TODO [RW] Add optional stream encoding allowing for compression -
-    //  add headers and decode the stream if necessary (#1805).
-    val taskProgress = new TaskProgressImplementation[B](ProgressUnit.Bytes)
-    val total        = new java.util.concurrent.atomic.AtomicLong(0)
-    import actorSystem.dispatcher
-
-    val http = Http()
-
-    def handleRedirects(retriesLeft: Int)(
-      response: HttpResponse
-    ): Future[HttpResponse] =
-      if (response.status.isRedirection) {
-        response.discardEntityBytes()
-        if (retriesLeft > 0) {
-          val newURI = response
-            .header[Location]
-            .getOrElse(
-              throw HTTPException(
-                s"HTTP response was ${response.status} which indicates a " +
-                s"redirection, but the Location header was missing or invalid."
-              )
-            )
-            .uri
-          if (newURI.scheme != "https") {
-            throw HTTPException(
-              s"The HTTP redirection would result in a non-HTTPS connection " +
-              s"(the requested scheme was `${newURI.scheme}`). " +
-              "This is not safe, the request has been terminated."
-            )
-          }
-
-          logger.trace(
-            "HTTP response was [{}], redirecting to [{}].",
-            response.status,
-            newURI
-          )
-          val newRequest = request.withUri(newURI)
-          http
-            .singleRequest(newRequest)
-            .flatMap(handleRedirects(retriesLeft - 1))
-        } else {
-          throw HTTPException("Too many redirects.")
-        }
-      } else Future.successful(response)
-
-    def handleFinalResponse(
-      response: HttpResponse
-    ): Future[(HttpResponse, A)] = {
-      val sizeEstimate =
-        response.entity.contentLengthOption.orElse(sizeHint)
-      response.entity.dataBytes
-        .map { chunk =>
-          val currentTotal = total.addAndGet(chunk.size.toLong)
-          taskProgress.reportProgress(currentTotal, sizeEstimate)
-          chunk
-        }
-        .runWith(sink)
-        .map((response, _))
-    }
-
-    http
-      .singleRequest(request)
-      .flatMap(handleRedirects(maximumRedirects))
-      .flatMap(earlyResponseMapping andThen Future.fromTry)
-      .flatMap(handleFinalResponse)
-      .flatMap(resultMapping.tupled andThen Future.fromTry)
-      .onComplete(taskProgress.setComplete)
-    taskProgress
-  }
 }
diff --git a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequest.scala b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequest.scala
index 134d5e32318e..9427ca34e10f 100644
--- a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequest.scala
+++ b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequest.scala
@@ -1,6 +1,6 @@
 package org.enso.downloader.http
 
-import akka.http.scaladsl.model.HttpRequest
+import java.net.http.HttpRequest
 
 /** Wraps an underlying HTTP request implementation to make the outside API
   * independent of the internal implementation.
diff --git a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequestBuilder.scala b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequestBuilder.scala
index 7757d0f6fa05..55ad6398b5bf 100644
--- a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequestBuilder.scala
+++ b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/HTTPRequestBuilder.scala
@@ -1,8 +1,10 @@
 package org.enso.downloader.http
 
-import akka.http.scaladsl.model.HttpHeader.ParsingResult
-import akka.http.scaladsl.model._
-import org.enso.downloader.http
+import java.net.URI
+import java.net.http.HttpRequest
+import java.nio.file.Path
+import java.util.{UUID}
+import scala.jdk.CollectionConverters._
 
 /** A simple immutable builder for HTTP requests.
   *
@@ -10,16 +12,15 @@ import org.enso.downloader.http
   * the launcher. It can be easily extended if necessary.
   */
 case class HTTPRequestBuilder private (
-  uri: Uri,
+  uri: URI,
   headers: Vector[(String, String)],
-  httpEntity: RequestEntity
+  internalBuilder: HttpRequest.Builder
 ) {
 
   /** Builds a GET request with the specified settings. */
-  def GET: HTTPRequest = build(HttpMethods.GET)
-
-  /** Builds a POST request with the specified settings. */
-  def POST: HTTPRequest = build(HttpMethods.POST)
+  def GET: HTTPRequest = {
+    HTTPRequest(internalBuilder.GET().build())
+  }
 
   /** Adds an additional header that will be included in the request.
     *
@@ -29,36 +30,28 @@ case class HTTPRequestBuilder private (
   def addHeader(name: String, value: String): HTTPRequestBuilder =
     copy(headers = headers.appended((name, value)))
 
-  /** Sets the [[RequestEntity]] for the request.
-    *
-    * It can be used for example to specify form data to send for a POST
-    * request.
+  /** Adds multipart form data into `Content-Type: multipart/form-data`
+    * @param data
+    * @return
     */
-  def setEntity(entity: RequestEntity): HTTPRequestBuilder =
-    copy(httpEntity = entity)
+  def postFiles(files: Seq[Path]): HTTPRequestBuilder = {
+    val boundary = UUID.randomUUID().toString.replace("-", "")
+    val bodyPublisher =
+      FilesMultipartBodyPublisher.ofMimeMultipartData(files.asJava, boundary)
+    internalBuilder.setHeader(
+      "Content-Type",
+      "multipart/form-data; boundary=" + boundary
+    )
+    copy(
+      internalBuilder = internalBuilder.POST(bodyPublisher)
+    )
+  }
 
-  private def build(
-    method: HttpMethod
-  ): HTTPRequest = {
-    val httpHeaders = headers.map { case (name, value) =>
-      HttpHeader.parse(name, value) match {
-        case ParsingResult.Ok(header, errors) if errors.isEmpty =>
-          header
-        case havingErrors =>
-          throw new IllegalStateException(
-            s"Internal error: " +
-            s"Invalid value for header $name: ${havingErrors.errors}."
-          )
-      }
+  def build(): HTTPRequest = {
+    headers.foreach { case (name, value) =>
+      internalBuilder.header(name, value)
     }
-    http.HTTPRequest(
-      HttpRequest(
-        method  = method,
-        uri     = uri,
-        headers = httpHeaders,
-        entity  = httpEntity
-      )
-    )
+    HTTPRequest(internalBuilder.build())
   }
 }
 
@@ -66,8 +59,9 @@ object HTTPRequestBuilder {
 
   /** Creates a request builder that will send the request for the given URI.
     */
-  def fromURI(uri: Uri): HTTPRequestBuilder =
-    new HTTPRequestBuilder(uri, Vector.empty, HttpEntity.Empty)
+  def fromURI(uri: URI): HTTPRequestBuilder = {
+    new HTTPRequestBuilder(uri, Vector.empty, HttpRequest.newBuilder(uri))
+  }
 
   /** Tries to parse the URI provided as a [[String]] and returns a request
     * builder that will send the request to the given `uri`.
diff --git a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/URIBuilder.scala b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/URIBuilder.scala
index 82f7d1a95a22..ff653e30e4d9 100644
--- a/lib/scala/downloader/src/main/scala/org/enso/downloader/http/URIBuilder.scala
+++ b/lib/scala/downloader/src/main/scala/org/enso/downloader/http/URIBuilder.scala
@@ -1,13 +1,14 @@
 package org.enso.downloader.http
 
-import akka.http.scaladsl.model.Uri
+import java.net.{URI, URLEncoder}
+import java.nio.charset.StandardCharsets
 
 /** A simple immutable builder for URIs based on URLs.
   *
   * It contains very limited functionality that is needed by the APIs used in
   * the launcher. It can be easily extended if necessary.
   */
-case class URIBuilder private (uri: Uri) {
+case class URIBuilder private (uri: URI) {
 
   /** Resolve a segment over the path in the URI.
     *
@@ -15,19 +16,30 @@ case class URIBuilder private (uri: Uri) {
     * `http://example.com/foo/bar`.
     */
   def addPathSegment(segment: String): URIBuilder = {
-    val part = "/" + segment
-    copy(uri.withPath(uri.path + part))
+    val pathItems = uri.getRawPath.split("/")
+    val newPath   = (pathItems :+ segment).mkString("/")
+    copy(uri.resolve(newPath))
   }
 
   /** Add a query parameter to the URI.
     *
     * The query is appended at the end.
     */
-  def addQuery(key: String, value: String): URIBuilder =
-    copy(uri.withQuery(uri.query().+:((key, value))))
+  def addQuery(key: String, value: String): URIBuilder = {
+    val scheme       = uri.getScheme
+    val authority    = uri.getAuthority
+    val path         = uri.getPath
+    val query        = if (uri.getQuery == null) "" else uri.getQuery + "&"
+    val fragment     = uri.getFragment
+    val encodedKey   = URLEncoder.encode(key, StandardCharsets.UTF_8)
+    val encodedValue = URLEncoder.encode(value, StandardCharsets.UTF_8)
+    val newQuery     = query + encodedKey + "=" + encodedValue
+    val newUri       = new URI(scheme, authority, path, newQuery, fragment)
+    copy(newUri)
+  }
 
   /** Build the URI represented by this builder. */
-  def build(): Uri = uri
+  def build(): URI = uri
 }
 
 object URIBuilder {
@@ -37,20 +49,23 @@ object URIBuilder {
     * A builder created by `fromHost("example.com")` represents
     * `https://example.com/`.
     */
-  def fromHost(host: String): URIBuilder =
-    new URIBuilder(Uri.from(scheme = "https", host = host))
+  def fromHost(host: String): URIBuilder = {
+    val scheme           = "https"
+    val path: String     = null
+    val fragment: String = null
+    new URIBuilder(new URI(scheme, host, path, fragment))
+  }
 
-  /** Creates a builder from an arbitrary [[Uri]] instance. */
-  def fromUri(uri: Uri): URIBuilder =
+  /** Creates a builder from an arbitrary [[URI]] instance. */
+  def fromUri(uri: URI): URIBuilder = {
     new URIBuilder(uri)
+  }
 
   /** Creates a builder from an arbitrary URI represented as string.
-    *
-    * If the string is invalid, it throws
-    * [[akka.http.scaladsl.model.IllegalUriException]].
     */
-  def fromUri(uri: String): URIBuilder =
-    new URIBuilder(Uri.parseAbsolute(uri))
+  def fromUri(uri: String): URIBuilder = {
+    new URIBuilder(new URI(uri))
+  }
 
   /** A simple DSL for the URIBuilder. */
   implicit class URIBuilderSyntax(builder: URIBuilder) {
diff --git a/lib/scala/downloader/src/test/java/org/enso/downloader/http/HttpDownloaderTest.java b/lib/scala/downloader/src/test/java/org/enso/downloader/http/HttpDownloaderTest.java
new file mode 100644
index 000000000000..8db53023614f
--- /dev/null
+++ b/lib/scala/downloader/src/test/java/org/enso/downloader/http/HttpDownloaderTest.java
@@ -0,0 +1,220 @@
+package org.enso.downloader.http;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertTrue;
+
+import com.sun.net.httpserver.HttpExchange;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.enso.cli.task.ProgressListener;
+import org.enso.cli.task.TaskProgress;
+import org.enso.shttp.HTTPTestHelperServer;
+import org.enso.shttp.HybridHTTPServer;
+import org.enso.shttp.SimpleHttpHandler;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import scala.Option;
+import scala.util.Try;
+
+public class HttpDownloaderTest {
+
+  private static final int port = 8090;
+  private static final String TEXTS_FOO_URI = "http://localhost:" + port + "/texts/foo";
+  public static final String REDIRECT_URI = "/redirect";
+  private static HybridHTTPServer server;
+  private static ExecutorService serverExecutor;
+
+  @BeforeClass
+  public static void initServer() throws URISyntaxException, IOException {
+    serverExecutor = Executors.newSingleThreadExecutor();
+    server = HTTPTestHelperServer.createServer("localhost", port, serverExecutor, false);
+    server.addHandler("/texts", new TextHandler());
+    server.addHandler("/redirect", new RedirectHandler());
+    server.addHandler("/files", new BigFileHandler());
+    server.start();
+  }
+
+  @AfterClass
+  public static void stopServer() {
+    server.stop();
+    serverExecutor.shutdown();
+  }
+
+  @Test
+  public void fetchStringTest() throws URISyntaxException {
+    var uri = new URI(TEXTS_FOO_URI);
+    var task = HTTPDownload.fetchString(uri);
+    var resp = task.force();
+    assertThat(resp.content(), containsString("Hello"));
+  }
+
+  @Test
+  public void handleRedirectTest() throws URISyntaxException {
+    var uriStr = "http://localhost:" + port + REDIRECT_URI;
+    var uri = new URI(uriStr);
+    var task = HTTPDownload.fetchString(uri);
+    var resp = task.force();
+    assertThat(resp.content(), containsString("Hello"));
+  }
+
+  @Test
+  public void downloadSmallFileTest() throws Exception {
+    var uriStr = "http://localhost:" + port + "/get";
+    var uri = new URI(uriStr);
+    Path dest = Files.createTempFile("enso-downloader-test", ".json");
+    try {
+      var task = HTTPDownload.download(uri, dest);
+      var resp = task.force();
+      assertThat(resp.toFile().exists(), is(true));
+      assertThat(resp.toFile(), is(dest.toFile()));
+    } finally {
+      Files.deleteIfExists(dest);
+    }
+  }
+
+  @Test
+  public void handleResourceNotFound() throws Exception {
+    var uri = new URI("http://localhost:" + port + "/not-found-FOO-BAR");
+    var task = HTTPDownload.fetchString(uri);
+    var resp = TaskProgress.waitForTask(task);
+    assertThat(resp.isFailure(), is(true));
+    var exception = resp.failed().get();
+    assertThat(exception, instanceOf(ResourceNotFound.class));
+  }
+
+  @Test
+  public void downloadBigFileWithProgress() throws Exception {
+    var uriStr = "http://localhost:" + port + "/files/big.tgz";
+    var uri = new URI(uriStr);
+    Path dest = Files.createTempFile("enso-downloader-test", ".tgz");
+    final int[] progressUpdateCalls = {0};
+    final int[] doneCalls = {0};
+    var task = HTTPDownload.download(uri, dest);
+    var progressListener =
+        new ProgressListener<Path>() {
+          @Override
+          public void progressUpdate(long done, Option<Object> total) {
+            progressUpdateCalls[0]++;
+            assertThat(total.isDefined(), is(true));
+            assertThat(total.get(), instanceOf(Long.class));
+            long reportedTotal = (Long) total.get();
+            assertThat(reportedTotal, is(BigFileHandler.BIG_FILE_SIZE));
+            assertThat(
+                "Should send and report just chunk, not the whole file",
+                done,
+                lessThan(reportedTotal));
+          }
+
+          @Override
+          public void done(Try<Path> result) {
+            doneCalls[0]++;
+            assertTrue(result.isSuccess());
+            assertThat(result.get(), is(dest));
+          }
+        };
+    task.addProgressListener(progressListener);
+    var resp = task.force();
+    assertThat(resp.toFile().exists(), is(true));
+    assertThat("Done was called exactly once", doneCalls[0], is(1));
+    assertThat(
+        "Progress reported was called at least once", progressUpdateCalls[0], greaterThan(0));
+    Files.deleteIfExists(dest);
+  }
+
+  @Test
+  public void fetchStringWithProgress() throws URISyntaxException {
+    var uri = new URI(TEXTS_FOO_URI);
+    var task = HTTPDownload.fetchString(uri);
+    final int[] progressUpdateCalls = {0};
+    final int[] doneCalls = {0};
+    var progressListener =
+        new ProgressListener<APIResponse>() {
+          @Override
+          public void progressUpdate(long done, Option<Object> total) {
+            progressUpdateCalls[0]++;
+            assertThat(total.isDefined(), is(true));
+            assertThat(total.get(), instanceOf(Long.class));
+            long reportedTotal = (Long) total.get();
+            assertThat(reportedTotal, greaterThan(0L));
+          }
+
+          @Override
+          public void done(Try<APIResponse> result) {
+            doneCalls[0]++;
+            assertTrue(result.isSuccess());
+            assertThat(result.get(), notNullValue());
+            assertThat(result.get().content(), containsString("Hello"));
+          }
+        };
+    task.addProgressListener(progressListener);
+    var resp = task.force();
+    assertThat(resp.content(), containsString("Hello"));
+  }
+
+  private static class TextHandler extends SimpleHttpHandler {
+    @Override
+    protected void doHandle(HttpExchange exchange) throws IOException {
+      if (exchange.getRequestURI().toString().equals("/texts/foo")) {
+        sendResponse(200, "Hello, world!", exchange);
+      } else {
+        exchange.sendResponseHeaders(404, -1);
+      }
+    }
+  }
+
+  private static class RedirectHandler extends SimpleHttpHandler {
+    @Override
+    protected void doHandle(HttpExchange exchange) throws IOException {
+      if (exchange.getRequestURI().toString().equals(REDIRECT_URI)) {
+        exchange.getResponseHeaders().add("Location", TEXTS_FOO_URI);
+        exchange.sendResponseHeaders(302, -1);
+      } else {
+        exchange.sendResponseHeaders(404, -1);
+      }
+    }
+  }
+
+  private static class BigFileHandler extends SimpleHttpHandler {
+    private static final long BIG_FILE_SIZE = 10 * 1024;
+    private static final byte[] BIG_FILE_BYTES = new byte[Math.toIntExact(BIG_FILE_SIZE)];
+    private static final int CHUNK_SIZE = 1024;
+
+    static {
+      var rnd = new Random(42);
+      rnd.nextBytes(BIG_FILE_BYTES);
+    }
+
+    @Override
+    protected void doHandle(HttpExchange exchange) throws IOException {
+      if (exchange.getRequestURI().toString().equals("/files/big.tgz")) {
+        long chunks = BIG_FILE_SIZE / CHUNK_SIZE;
+        exchange.getResponseHeaders().set("Content-Length", Long.toString(BIG_FILE_SIZE));
+        exchange.getResponseHeaders().set("Content-Type", "application/x-gzip");
+        // Set responseLength to 0 to indicate that the response length is unknown
+        // and force chunking the response.
+        exchange.sendResponseHeaders(200, 0);
+        try (var os = exchange.getResponseBody()) {
+          for (int i = 0; i < chunks; i++) {
+            os.write(BIG_FILE_BYTES, i * CHUNK_SIZE, CHUNK_SIZE);
+            os.flush();
+          }
+        }
+      } else {
+        exchange.sendResponseHeaders(404, -1);
+      }
+    }
+  }
+}
diff --git a/lib/scala/downloader/src/test/scala/org/enso/downloader/http/URIBuilderSpec.scala b/lib/scala/downloader/src/test/scala/org/enso/downloader/http/URIBuilderSpec.scala
new file mode 100644
index 000000000000..d62ba5274215
--- /dev/null
+++ b/lib/scala/downloader/src/test/scala/org/enso/downloader/http/URIBuilderSpec.scala
@@ -0,0 +1,27 @@
+package org.enso.downloader.http
+
+import org.scalatest.matchers.must.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+class URIBuilderSpec extends AnyWordSpec with Matchers {
+  "URIBuilder" should {
+    "add path segments" in {
+      val bldr = URIBuilder.fromUri("http://google.com")
+      val uri  = bldr.addPathSegment("foo").addPathSegment("bar").build()
+      uri.toString mustEqual "http://google.com/foo/bar"
+    }
+
+    "add queries" in {
+      val bldr = URIBuilder.fromUri("http://google.com")
+      val uri  = bldr.addQuery("foo", "bar").addQuery("baz", "qux").build()
+      uri.toString mustEqual "http://google.com?foo=bar&baz=qux"
+    }
+
+    "Handle non-standard symbols in queries" in {
+      val bldr = URIBuilder.fromUri("http://google.com")
+      val uri  = bldr.addQuery("foo", "bar baz").addQuery("baz", "qux").build()
+      uri.toString mustEqual "http://google.com?foo=bar+baz&baz=qux"
+    }
+  }
+
+}
diff --git a/lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/EditionManager.scala b/lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/EditionManager.scala
index 5aa2d672005d..f4fccc1ad5ca 100644
--- a/lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/EditionManager.scala
+++ b/lib/scala/edition-updater/src/main/scala/org/enso/editions/updater/EditionManager.scala
@@ -1,10 +1,10 @@
 package org.enso.editions.updater
 
-import nl.gn0s1s.bump.SemVer
 import org.enso.distribution.config.GlobalConfigurationManager
 import org.enso.distribution.{DistributionManager, LanguageHome}
 import org.enso.editions
 import org.enso.editions.{EditionResolver, Editions}
+import org.enso.semver.SemVer
 
 import java.nio.file.Path
 import scala.util.Try
diff --git a/lib/scala/edition-updater/src/test/scala/org/enso/editions/updater/UpdatingEditionProviderTest.scala b/lib/scala/edition-updater/src/test/scala/org/enso/editions/updater/UpdatingEditionProviderTest.scala
index bcadb89790c5..57d30fcb7fb8 100644
--- a/lib/scala/edition-updater/src/test/scala/org/enso/editions/updater/UpdatingEditionProviderTest.scala
+++ b/lib/scala/edition-updater/src/test/scala/org/enso/editions/updater/UpdatingEditionProviderTest.scala
@@ -1,6 +1,6 @@
 package org.enso.editions.updater
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.librarymanager.published.repository.ExampleRepository
 import org.enso.testkit.WithTemporaryDirectory
 import org.scalatest.Inside
@@ -50,7 +50,7 @@ class UpdatingEditionProviderTest
         provider.findAvailableEditions(update = false) shouldBe empty
         inside(provider.findEditionForName("testlocal")) {
           case Right(edition) =>
-            edition.engineVersion shouldEqual Some(SemVer(0, 0, 0))
+            edition.engineVersion shouldEqual Some(SemVer.of(0, 0, 0))
         }
       }
     }
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/EditionSerialization.scala b/lib/scala/editions/src/main/scala/org/enso/editions/EditionSerialization.scala
index 771d75553a69..a98d34e4bcaf 100644
--- a/lib/scala/editions/src/main/scala/org/enso/editions/EditionSerialization.scala
+++ b/lib/scala/editions/src/main/scala/org/enso/editions/EditionSerialization.scala
@@ -3,15 +3,16 @@ package org.enso.editions
 import cats.Show
 import io.circe._
 import io.circe.syntax.EncoderOps
-import nl.gn0s1s.bump.SemVer
 import org.enso.editions.Editions.{Raw, Repository}
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 import org.enso.yaml.YamlHelper
 
 import java.io.FileReader
 import java.nio.file.Path
 import scala.util.{Failure, Try, Using}
 
+import org.enso.semver.SemVer
+
 /** Gathers methods for decoding and encoding of Raw editions. */
 object EditionSerialization {
 
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/Editions.scala b/lib/scala/editions/src/main/scala/org/enso/editions/Editions.scala
index a348c1d849dc..6c94467b7d5f 100644
--- a/lib/scala/editions/src/main/scala/org/enso/editions/Editions.scala
+++ b/lib/scala/editions/src/main/scala/org/enso/editions/Editions.scala
@@ -1,6 +1,6 @@
 package org.enso.editions
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Defines the general edition structure.
   *
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/EngineVersionResolver.scala b/lib/scala/editions/src/main/scala/org/enso/editions/EngineVersionResolver.scala
index 5d9ace10fa88..9ab1fd9bf635 100644
--- a/lib/scala/editions/src/main/scala/org/enso/editions/EngineVersionResolver.scala
+++ b/lib/scala/editions/src/main/scala/org/enso/editions/EngineVersionResolver.scala
@@ -1,8 +1,8 @@
 package org.enso.editions
 
-import nl.gn0s1s.bump.SemVer
 import org.enso.editions.Editions.RawEdition
 import org.enso.editions.provider.EditionProvider
+import org.enso.semver.SemVer
 
 /** A helper class which resolves the engine version that is entailed by the
   * edition configuration.
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/EnsoVersion.scala b/lib/scala/editions/src/main/scala/org/enso/editions/EnsoVersion.scala
index 0586b95aaa13..c45bdeea9adf 100644
--- a/lib/scala/editions/src/main/scala/org/enso/editions/EnsoVersion.scala
+++ b/lib/scala/editions/src/main/scala/org/enso/editions/EnsoVersion.scala
@@ -2,7 +2,7 @@ package org.enso.editions
 
 import io.circe.syntax._
 import io.circe.{Decoder, DecodingFailure, Encoder}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Represents the engine version that is associated with a project.
   */
@@ -39,14 +39,19 @@ object EnsoVersion {
       if (string == DefaultEnsoVersion.toString)
         Right(DefaultEnsoVersion)
       else
-        SemVer(string)
+        SemVer
+          .parse(string)
           .map(SemVerEnsoVersion)
-          .toRight(
-            DecodingFailure(
-              s"`$string` is not a valid version string. Possible values are " +
-              s"`default` or a semantic versioning string.",
-              json.history
-            )
+          .fold(
+            _ =>
+              Left(
+                DecodingFailure(
+                  s"`$string` is not a valid version string. Possible values are " +
+                  s"`default` or a semantic versioning string.",
+                  json.history
+                )
+              ),
+            v => Right(v)
           )
     }
   }
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/LibraryVersion.scala b/lib/scala/editions/src/main/scala/org/enso/editions/LibraryVersion.scala
index 6746f74553c2..90e682ba2c13 100644
--- a/lib/scala/editions/src/main/scala/org/enso/editions/LibraryVersion.scala
+++ b/lib/scala/editions/src/main/scala/org/enso/editions/LibraryVersion.scala
@@ -1,7 +1,7 @@
 package org.enso.editions
 
-import nl.gn0s1s.bump.SemVer
 import org.enso.editions.Editions.Repository
+import org.enso.semver.SemVer
 
 /** A resolved version of the library. */
 sealed trait LibraryVersion
diff --git a/lib/scala/editions/src/main/scala/org/enso/editions/SemVerJson.scala b/lib/scala/editions/src/main/scala/org/enso/editions/SemVerJson.scala
deleted file mode 100644
index f5bce1d6cf1f..000000000000
--- a/lib/scala/editions/src/main/scala/org/enso/editions/SemVerJson.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.enso.editions
-
-import io.circe.syntax._
-import io.circe.{Decoder, DecodingFailure, Encoder}
-import nl.gn0s1s.bump.SemVer
-
-object SemVerJson {
-
-  /** [[Decoder]] instance allowing to parse semantic versioning strings.
-    */
-  implicit val semverDecoder: Decoder[SemVer] = { json =>
-    for {
-      string <- json.as[String]
-      version <- SemVer(string).toRight(
-        DecodingFailure(
-          s"`$string` is not a valid semantic versioning string.",
-          json.history
-        )
-      )
-    } yield version
-  }
-
-  /** [[Encoder]] instance allowing to serialize semantic versioning strings.
-    */
-  implicit val semverEncoder: Encoder[SemVer] = _.toString.asJson
-}
diff --git a/lib/scala/editions/src/test/scala/org/enso/editions/EditionResolverSpec.scala b/lib/scala/editions/src/test/scala/org/enso/editions/EditionResolverSpec.scala
index 17eb8ff89d96..210dc84764b3 100644
--- a/lib/scala/editions/src/test/scala/org/enso/editions/EditionResolverSpec.scala
+++ b/lib/scala/editions/src/test/scala/org/enso/editions/EditionResolverSpec.scala
@@ -1,6 +1,6 @@
 package org.enso.editions
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.EditionResolutionError.EditionResolutionCycle
 import org.enso.editions.Editions.Repository
 import org.enso.editions.provider.{
@@ -22,7 +22,7 @@ class EditionResolverSpec
     val editions: Map[String, Editions.RawEdition] = Map(
       "2021.0" -> Editions.Raw.Edition(
         parent        = None,
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories = Map(
           "main" -> mainRepo
         ),
@@ -30,20 +30,20 @@ class EditionResolverSpec
           LibraryName("Standard", "Base") -> Editions.Raw
             .PublishedLibrary(
               LibraryName("Standard", "Base"),
-              SemVer(1, 2, 3),
+              SemVer.of(1, 2, 3),
               "main"
             )
         )
       ),
       "cycleA" -> Editions.Raw.Edition(
         parent        = Some("cycleB"),
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories  = Map(),
         libraries     = Map()
       ),
       "cycleB" -> Editions.Raw.Edition(
         parent        = Some("cycleA"),
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories  = Map(),
         libraries     = Map()
       )
@@ -64,14 +64,18 @@ class EditionResolverSpec
       val repo = Repository("foo", "http://example.com")
       val edition = Editions.Raw.Edition(
         parent        = None,
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories  = Map("foo" -> repo),
         libraries = Map(
           LibraryName("bar", "baz") -> Editions.Raw.LocalLibrary(
             LibraryName("bar", "baz")
           ),
           LibraryName("foo", "bar") -> Editions.Raw
-            .PublishedLibrary(LibraryName("foo", "bar"), SemVer(1, 2, 3), "foo")
+            .PublishedLibrary(
+              LibraryName("foo", "bar"),
+              SemVer.of(1, 2, 3),
+              "foo"
+            )
         )
       )
 
@@ -87,14 +91,18 @@ class EditionResolverSpec
         resolved.libraries(
           LibraryName("foo", "bar")
         ) shouldEqual Editions.Resolved
-          .PublishedLibrary(LibraryName("foo", "bar"), SemVer(1, 2, 3), repo)
+          .PublishedLibrary(
+            LibraryName("foo", "bar"),
+            SemVer.of(1, 2, 3),
+            repo
+          )
       }
     }
 
     "resolve a nested edition" in {
       val edition = Editions.Raw.Edition(
         parent        = Some("2021.0"),
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories  = Map(),
         libraries = Map(
           LibraryName("bar", "baz") -> Editions.Raw.LocalLibrary(
@@ -103,7 +111,7 @@ class EditionResolverSpec
           LibraryName("foo", "bar") -> Editions.Raw
             .PublishedLibrary(
               LibraryName("foo", "bar"),
-              SemVer(1, 2, 3),
+              SemVer.of(1, 2, 3),
               "main"
             )
         )
@@ -121,7 +129,7 @@ class EditionResolverSpec
         ) shouldEqual Editions.Resolved
           .PublishedLibrary(
             LibraryName("foo", "bar"),
-            SemVer(1, 2, 3),
+            SemVer.of(1, 2, 3),
             FakeEditionProvider.mainRepo
           )
       }
@@ -140,7 +148,7 @@ class EditionResolverSpec
           LibraryName("foo", "bar") -> Editions.Raw
             .PublishedLibrary(
               LibraryName("foo", "bar"),
-              SemVer(1, 2, 3),
+              SemVer.of(1, 2, 3),
               "main"
             )
         )
@@ -152,7 +160,7 @@ class EditionResolverSpec
         resolved.libraries(LibraryName("foo", "bar")) shouldEqual
         Editions.Resolved.PublishedLibrary(
           LibraryName("foo", "bar"),
-          SemVer(1, 2, 3),
+          SemVer.of(1, 2, 3),
           localRepo
         )
 
@@ -161,7 +169,7 @@ class EditionResolverSpec
         ) shouldEqual
         Editions.Resolved.PublishedLibrary(
           LibraryName("Standard", "Base"),
-          SemVer(1, 2, 3),
+          SemVer.of(1, 2, 3),
           FakeEditionProvider.mainRepo
         )
       }
@@ -170,7 +178,7 @@ class EditionResolverSpec
     "avoid cycles in the resolution" in {
       val edition = Editions.Raw.Edition(
         parent        = Some("cycleA"),
-        engineVersion = Some(SemVer(1, 2, 3)),
+        engineVersion = Some(SemVer.of(1, 2, 3)),
         repositories  = Map(),
         libraries     = Map()
       )
diff --git a/lib/scala/editions/src/test/scala/org/enso/editions/EditionSerializationSpec.scala b/lib/scala/editions/src/test/scala/org/enso/editions/EditionSerializationSpec.scala
index a114581392cb..c6e74157fdf2 100644
--- a/lib/scala/editions/src/test/scala/org/enso/editions/EditionSerializationSpec.scala
+++ b/lib/scala/editions/src/test/scala/org/enso/editions/EditionSerializationSpec.scala
@@ -1,6 +1,6 @@
 package org.enso.editions
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.scalatest.Inside
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
@@ -57,13 +57,13 @@ class EditionSerializationSpec extends AnyWordSpec with Matchers with Inside {
           Editions.Raw.LocalLibrary(LibraryName("Foo", "Local")),
           Editions.Raw.PublishedLibrary(
             LibraryName("Bar", "Baz"),
-            SemVer(0, 0, 0),
+            SemVer.of(0, 0, 0),
             "example"
           ),
           Editions.Raw
-            .PublishedLibrary(LibraryName("A", "B"), SemVer(1, 0, 1), "bar")
+            .PublishedLibrary(LibraryName("A", "B"), SemVer.of(1, 0, 1), "bar")
         )
-        edition.engineVersion should contain(SemVer(1, 2, 3, Some("SNAPSHOT")))
+        edition.engineVersion should contain(SemVer.of(1, 2, 3, "SNAPSHOT"))
       }
     }
 
diff --git a/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/DummyRepository.scala b/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/DummyRepository.scala
index d7ec0fd1ac0a..2f61671bcdc7 100644
--- a/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/DummyRepository.scala
+++ b/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/DummyRepository.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.repository
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.OS
 import org.enso.distribution.FileSystem
 import org.enso.downloader.archive.TarGzWriter
diff --git a/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/ExampleRepository.scala b/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/ExampleRepository.scala
index 132e93128b55..a50cad039ec4 100644
--- a/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/ExampleRepository.scala
+++ b/lib/scala/library-manager-test/src/main/scala/org/enso/librarymanager/published/repository/ExampleRepository.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.repository
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.Editions.RawEdition
 import org.enso.editions.{Editions, LibraryName}
 
@@ -15,7 +15,7 @@ class ExampleRepository(serverRepoPath: Path)
   /** The library provided by this repository. */
   val testLib: DummyLibrary = DummyLibrary(
     LibraryName("Foo", "Bar"),
-    SemVer(1, 0, 0),
+    SemVer.of(1, 0, 0),
     """baz = 42
       |
       |quux = "foobar"
@@ -25,7 +25,7 @@ class ExampleRepository(serverRepoPath: Path)
   override def libraries: Seq[DummyLibrary] = Seq(testLib)
 
   val testlocalEdition: RawEdition =
-    Editions.Raw.Edition(engineVersion = Some(SemVer(0, 0, 0)))
+    Editions.Raw.Edition(engineVersion = Some(SemVer.of(0, 0, 0)))
 
   override def editions: Seq[(String, RawEdition)] = Seq(
     "testlocal" -> testlocalEdition
diff --git a/lib/scala/library-manager-test/src/test/scala/org/enso/libraryupload/LibraryUploadTest.scala b/lib/scala/library-manager-test/src/test/scala/org/enso/libraryupload/LibraryUploadTest.scala
index 66b43c7ac96c..1597e413eb94 100644
--- a/lib/scala/library-manager-test/src/test/scala/org/enso/libraryupload/LibraryUploadTest.scala
+++ b/lib/scala/library-manager-test/src/test/scala/org/enso/libraryupload/LibraryUploadTest.scala
@@ -1,6 +1,6 @@
 package org.enso.libraryupload
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.{ProgressReporter, TaskProgress}
 import org.enso.editions.{Editions, LibraryName}
 import org.enso.librarymanager.published.repository.{
@@ -32,7 +32,7 @@ class LibraryUploadTest
       val repoRoot    = getTestDirectory.resolve("repo")
 
       val libraryName    = LibraryName("tester", "Upload_Test")
-      val libraryVersion = SemVer(1, 2, 3)
+      val libraryVersion = SemVer.of(1, 2, 3)
       PackageManager.Default.create(
         projectRoot.toFile,
         name      = libraryName.name,
@@ -47,7 +47,6 @@ class LibraryUploadTest
           override def findDependencies(pkg: Package[File]): Set[LibraryName] =
             Set(LibraryName("Standard", "Base"))
         }
-        import scala.concurrent.ExecutionContext.Implicits.global
         LibraryUploader(dependencyExtractor)
           .uploadLibrary(
             projectRoot,
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/CachedLibraryProvider.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/CachedLibraryProvider.scala
index 7ae7ae508bca..75ac9a80c37b 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/CachedLibraryProvider.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/CachedLibraryProvider.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 import org.enso.librarymanager.published.cache.ReadOnlyLibraryCache
 import org.enso.librarymanager.resolved.LibraryRoot
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/DefaultPublishedLibraryProvider.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/DefaultPublishedLibraryProvider.scala
index bc2d189149a3..df1dd51d01e2 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/DefaultPublishedLibraryProvider.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/DefaultPublishedLibraryProvider.scala
@@ -1,7 +1,7 @@
 package org.enso.librarymanager.published
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.{Editions, LibraryName}
 import org.enso.librarymanager.published.cache.{
   LibraryCache,
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryCache.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryCache.scala
index 0ee813b09704..d9ee44e19193 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryCache.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryCache.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 import org.enso.librarymanager.LibraryLocations
 import org.enso.librarymanager.published.bundles.LocalReadOnlyRepository
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryProvider.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryProvider.scala
index 4cbb1341e92c..67666617c279 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryProvider.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/PublishedLibraryProvider.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.Editions.Repository
 import org.enso.editions.LibraryName
 import org.enso.librarymanager.resolved.LibraryRoot
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/bundles/LocalReadOnlyRepository.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/bundles/LocalReadOnlyRepository.scala
index 05333a5aa06c..51c388a5b03e 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/bundles/LocalReadOnlyRepository.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/bundles/LocalReadOnlyRepository.scala
@@ -1,7 +1,7 @@
 package org.enso.librarymanager.published.bundles
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 import org.enso.librarymanager.published.cache.{
   LibraryCache,
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/DownloadingLibraryCache.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/DownloadingLibraryCache.scala
index e34fbe793dff..78e8f11d700b 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/DownloadingLibraryCache.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/DownloadingLibraryCache.scala
@@ -1,7 +1,7 @@
 package org.enso.librarymanager.published.cache
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.{ProgressReporter, TaskProgress}
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.distribution.locking.{
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryCache.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryCache.scala
index f596b45ebf37..42e04fd6149b 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryCache.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryCache.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.cache
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.{Editions, LibraryName, LibraryVersion}
 import org.enso.librarymanager.resolved.LibraryRoot
 
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryResource.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryResource.scala
index 0a8c2a257c32..e40c3513c225 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryResource.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/LibraryResource.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.cache
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.locking.Resource
 import org.enso.editions.LibraryName
 
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/ReadOnlyLibraryCache.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/ReadOnlyLibraryCache.scala
index 459e76a68f85..fb9eac4a9a6d 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/ReadOnlyLibraryCache.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/cache/ReadOnlyLibraryCache.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.cache
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 import org.enso.librarymanager.resolved.LibraryRoot
 
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/LibraryException.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/LibraryException.scala
index e4f8b7cdb8a1..dbeaba235fef 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/LibraryException.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/LibraryException.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.repository
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 
 /** Indicates that the library could not be downloaded. */
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/RepositoryHelper.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/RepositoryHelper.scala
index 6aeef6dd03a8..382de31620d4 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/RepositoryHelper.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/published/repository/RepositoryHelper.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager.published.repository
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.downloader.http.{HTTPDownload, URIBuilder}
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/libraryupload/LibraryUploader.scala b/lib/scala/library-manager/src/main/scala/org/enso/libraryupload/LibraryUploader.scala
index a59351fa8a69..83e8cc723683 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/libraryupload/LibraryUploader.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/libraryupload/LibraryUploader.scala
@@ -1,10 +1,7 @@
 package org.enso.libraryupload
 
-import akka.http.scaladsl.marshalling.Marshal
-import akka.http.scaladsl.model._
-import akka.stream.scaladsl.Source
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.{ProgressReporter, TaskProgress}
 import org.enso.distribution.FileSystem
 import org.enso.distribution.FileSystem.PathSyntax
@@ -17,8 +14,8 @@ import org.enso.pkg.{Package, PackageManager}
 import org.enso.yaml.YamlHelper
 
 import java.io.File
+import java.net.URI
 import java.nio.file.{Files, Path}
-import scala.concurrent.{ExecutionContext, Future}
 import scala.jdk.CollectionConverters._
 import scala.util.{Failure, Success, Try, Using}
 
@@ -34,17 +31,16 @@ class LibraryUploader(dependencyExtractor: DependencyExtractor[File]) {
     *                  the repository
     * @param progressReporter a [[ProgressReporter]] to track long running tasks
     *                         like compression and upload
-    * @param ec an execution context used for handling Futures
     */
   def uploadLibrary(
     projectRoot: Path,
     uploadUrl: String,
     authToken: auth.Token,
     progressReporter: ProgressReporter
-  )(implicit ec: ExecutionContext): Try[Unit] = Try {
+  ): Try[Unit] = Try {
     FileSystem.withTemporaryDirectory("enso-upload") { tmpDir =>
       val pkg = PackageManager.Default.loadPackage(projectRoot.toFile).get
-      val version = SemVer(pkg.getConfig().version).getOrElse {
+      val version = SemVer.parse(pkg.getConfig().version).getOrElse {
         throw new IllegalStateException(
           s"Project version [${pkg.getConfig().version}] is not a valid semver " +
           s"string."
@@ -113,7 +109,7 @@ class LibraryUploader(dependencyExtractor: DependencyExtractor[File]) {
     baseUploadUrl: String,
     libraryName: LibraryName,
     version: SemVer
-  ): Uri = {
+  ): URI = {
     URIBuilder
       .fromUri(baseUploadUrl)
       .addQuery("namespace", libraryName.namespace)
@@ -166,24 +162,6 @@ class LibraryUploader(dependencyExtractor: DependencyExtractor[File]) {
     }
   }
 
-  /** Creates a [[RequestEntity]] that will upload the provided files. */
-  private def createRequestEntity(
-    files: Seq[Path]
-  )(implicit ec: ExecutionContext): Future[RequestEntity] = {
-
-    val fileBodies = files.map { path =>
-      val filename = path.getFileName.toString
-      Multipart.FormData.BodyPart(
-        filename,
-        HttpEntity.fromPath(detectContentType(path), path),
-        Map("filename" -> filename)
-      )
-    }
-
-    val formData = Multipart.FormData(Source(fileBodies))
-    Marshal(formData).to[RequestEntity]
-  }
-
   /** Loads a manifest, if it exists. */
   private def loadSavedManifest(manifestPath: Path): Option[LibraryManifest] = {
     if (Files.exists(manifestPath)) {
@@ -192,36 +170,21 @@ class LibraryUploader(dependencyExtractor: DependencyExtractor[File]) {
     } else None
   }
 
-  /** Tries to detect the content type of the file to upload.
-    *
-    * If it is not a known type, it falls back to `application/octet-stream`.
-    */
-  private def detectContentType(path: Path): ContentType = {
-    val filename = path.getFileName.toString
-    if (filename.endsWith(".tgz") || filename.endsWith(".tar.gz"))
-      ContentType(MediaTypes.`application/x-gtar`)
-    else if (filename.endsWith(".yaml") || filename.endsWith(".enso"))
-      ContentTypes.`text/plain(UTF-8)`
-    else ContentTypes.`application/octet-stream`
-  }
-
   /** Uploads the provided files to the provided url, using the provided token
     * for authentication.
     */
   private def uploadFiles(
-    uri: Uri,
+    uri: URI,
     authToken: auth.Token,
     files: Seq[Path]
-  )(implicit ec: ExecutionContext): TaskProgress[Unit] = {
-    val future = createRequestEntity(files).map { entity =>
-      val request = authToken
-        .alterRequest(HTTPRequestBuilder.fromURI(uri))
-        .setEntity(entity)
-        .POST
-      // TODO [RW] upload progress
-      HTTPDownload.fetchString(request).force()
-    }
-    TaskProgress.fromFuture(future).flatMap { response =>
+  ): TaskProgress[Unit] = {
+    val request = authToken
+      .alterRequest(HTTPRequestBuilder.fromURI(uri))
+      .postFiles(files)
+      .build()
+    // TODO [RW] upload progress
+    val responseFut = HTTPDownload.fetchString(request)
+    responseFut.flatMap { response =>
       if (response.statusCode == 200) {
         logger.debug("Server responded with 200 OK.")
         Success(())
diff --git a/lib/scala/library-manager/src/test/scala/org/enso/librarymanager/LibraryResolverSpec.scala b/lib/scala/library-manager/src/test/scala/org/enso/librarymanager/LibraryResolverSpec.scala
index e854a7673ac0..89a4b01221aa 100644
--- a/lib/scala/library-manager/src/test/scala/org/enso/librarymanager/LibraryResolverSpec.scala
+++ b/lib/scala/library-manager/src/test/scala/org/enso/librarymanager/LibraryResolverSpec.scala
@@ -1,6 +1,6 @@
 package org.enso.librarymanager
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.Editions.Repository
 import org.enso.editions.{Editions, LibraryName, LibraryVersion}
 import org.enso.librarymanager.local.LocalLibraryProvider
@@ -21,13 +21,13 @@ class LibraryResolverSpec
     val mainRepo = Repository("main", "https://example.com/main")
     val parentEdition = Editions.Resolved.Edition(
       parent        = None,
-      engineVersion = Some(SemVer(0, 0, 0)),
+      engineVersion = Some(SemVer.of(0, 0, 0)),
       repositories  = Map("main" -> mainRepo),
       libraries = Map(
         LibraryName("Standard", "Base") -> Editions.Resolved
           .PublishedLibrary(
             LibraryName("Standard", "Base"),
-            SemVer(4, 5, 6),
+            SemVer.of(4, 5, 6),
             mainRepo
           )
       )
@@ -41,13 +41,13 @@ class LibraryResolverSpec
         LibraryName("Foo", "Main") -> Editions.Resolved
           .PublishedLibrary(
             LibraryName("Foo", "Main"),
-            SemVer(1, 0, 0),
+            SemVer.of(1, 0, 0),
             mainRepo
           ),
         LibraryName("Foo", "My") -> Editions.Resolved
           .PublishedLibrary(
             LibraryName("Foo", "My"),
-            SemVer(2, 0, 0),
+            SemVer.of(2, 0, 0),
             customRepo
           ),
         LibraryName("Foo", "Local") -> Editions.Resolved.LocalLibrary(
@@ -88,7 +88,7 @@ class LibraryResolverSpec
           preferLocalLibraries = false
         )
         .rightValue shouldEqual
-      LibraryVersion.Published(SemVer(4, 5, 6), mainRepo)
+      LibraryVersion.Published(SemVer.of(4, 5, 6), mainRepo)
 
       resolver
         .resolveLibraryVersion(
@@ -97,7 +97,7 @@ class LibraryResolverSpec
           preferLocalLibraries = false
         )
         .rightValue shouldEqual
-      LibraryVersion.Published(SemVer(1, 0, 0), mainRepo)
+      LibraryVersion.Published(SemVer.of(1, 0, 0), mainRepo)
 
       resolver
         .resolveLibraryVersion(
@@ -106,7 +106,7 @@ class LibraryResolverSpec
           preferLocalLibraries = false
         )
         .rightValue shouldEqual
-      LibraryVersion.Published(SemVer(2, 0, 0), customRepo)
+      LibraryVersion.Published(SemVer.of(2, 0, 0), customRepo)
 
       resolver
         .resolveLibraryVersion(
@@ -135,7 +135,7 @@ class LibraryResolverSpec
           preferLocalLibraries = true
         )
         .rightValue shouldEqual
-      LibraryVersion.Published(SemVer(1, 0, 0), mainRepo)
+      LibraryVersion.Published(SemVer.of(1, 0, 0), mainRepo)
 
       resolver
         .resolveLibraryVersion(
diff --git a/lib/scala/pkg/src/main/resources/default/src/Main.enso b/lib/scala/pkg/src/main/resources/default/src/Main.enso
index e0f23d7aa517..0eda2cd42444 100644
--- a/lib/scala/pkg/src/main/resources/default/src/Main.enso
+++ b/lib/scala/pkg/src/main/resources/default/src/Main.enso
@@ -5,4 +5,4 @@ from Standard.AWS import all
 import Standard.Visualization
 
 main =
-    operator1 = "Press ENTER key to create a new node"
+    operator1 = "Press ENTER key to create a new component"
diff --git a/lib/scala/pkg/src/main/scala/org/enso/pkg/Config.scala b/lib/scala/pkg/src/main/scala/org/enso/pkg/Config.scala
index b57e47fca470..b9c88c1a543c 100644
--- a/lib/scala/pkg/src/main/scala/org/enso/pkg/Config.scala
+++ b/lib/scala/pkg/src/main/scala/org/enso/pkg/Config.scala
@@ -3,7 +3,7 @@ package org.enso.pkg
 import io.circe._
 import io.circe.syntax._
 import io.circe.yaml.Printer
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.EditionSerialization._
 import org.enso.editions.{
   DefaultEnsoVersion,
diff --git a/lib/scala/pkg/src/test/scala/org/enso/pkg/ConfigSpec.scala b/lib/scala/pkg/src/test/scala/org/enso/pkg/ConfigSpec.scala
index 3d57d12f404d..508a0e6a34d5 100644
--- a/lib/scala/pkg/src/test/scala/org/enso/pkg/ConfigSpec.scala
+++ b/lib/scala/pkg/src/test/scala/org/enso/pkg/ConfigSpec.scala
@@ -2,7 +2,7 @@ package org.enso.pkg
 
 import cats.Show
 import io.circe.{DecodingFailure, Json, JsonObject}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.LibraryName
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
@@ -38,7 +38,7 @@ class ConfigSpec
         version        = "dev",
         namespace      = "local",
         edition =
-          Some(Config.makeCompatibilityEditionFromVersion(SemVer(4, 5, 6))),
+          Some(Config.makeCompatibilityEditionFromVersion(SemVer.of(4, 5, 6))),
         license = "none",
         authors = List(),
         maintainers = List(
@@ -70,7 +70,7 @@ class ConfigSpec
           |""".stripMargin
       val parsed = Config.fromYaml(oldFormat).get
 
-      parsed.edition.get.engineVersion should contain(SemVer(1, 2, 3))
+      parsed.edition.get.engineVersion should contain(SemVer.of(1, 2, 3))
 
       val serialized  = parsed.toYaml
       val parsedAgain = Config.fromYaml(serialized).get
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/EngineVersion.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/EngineVersion.scala
index b8306f782f8e..6607e0f7eb36 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/EngineVersion.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/EngineVersion.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.data
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Represents an engine version that is installed or available to be installed.
   *
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/RunningLanguageServerInfo.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/RunningLanguageServerInfo.scala
index ff782d4a6882..aaeabcf55ba3 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/RunningLanguageServerInfo.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/data/RunningLanguageServerInfo.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.data
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Information about running language server.
   *
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerController.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerController.scala
index 49f3885a0001..2e0161ab7ab4 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerController.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerController.scala
@@ -11,7 +11,7 @@ import akka.actor.{
   Terminated
 }
 import com.typesafe.scalalogging.LazyLogging
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.akka.ActorMessageLogging
 import org.enso.projectmanager.boot.configuration._
 import org.enso.projectmanager.data.{LanguageServerSockets, Socket}
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerDescriptor.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerDescriptor.scala
index f6c8cb6f74e2..53691948b1c2 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerDescriptor.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerDescriptor.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.infrastructure.languageserver
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.boot.configuration.NetworkConfig
 import org.enso.projectmanager.versionmanagement.DistributionConfiguration
 import org.enso.runtimeversionmanager.runner.JVMSettings
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGateway.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGateway.scala
index a69b3b4c278a..264836a7e7c1 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGateway.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGateway.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.infrastructure.languageserver
 import java.util.UUID
 
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.LanguageServerSockets
 import org.enso.projectmanager.infrastructure.languageserver.LanguageServerProtocol.{
   CheckTimeout,
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewayImpl.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewayImpl.scala
index f9797e9cd02f..d02a54fb828c 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewayImpl.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewayImpl.scala
@@ -5,7 +5,7 @@ import java.util.UUID
 import akka.actor.{ActorRef, ActorSystem}
 import akka.pattern.ask
 import akka.util.Timeout
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.boot.configuration.TimeoutConfig
 import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.core.syntax._
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerProtocol.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerProtocol.scala
index 47a731cf4df4..0ca5a3bd07f0 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerProtocol.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerProtocol.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.infrastructure.languageserver
 import java.util.UUID
 
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.LanguageServerSockets
 import org.enso.projectmanager.model.Project
 
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/JsonRpc.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/JsonRpc.scala
index dd27da6e8c64..6d37cd17db10 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/JsonRpc.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/JsonRpc.scala
@@ -9,7 +9,7 @@ import org.enso.cli.task.notifications.TaskNotificationApi._
   *
   * Do not remove this import.
   */
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 
 object JsonRpc {
 
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala
index 1162268edde5..b02df7e1003d 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.protocol
 import java.util.UUID
 import io.circe.Json
 import io.circe.syntax._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.EnsoVersion
 import org.enso.jsonrpc.{Error, HasParams, HasResult, Method, Unused}
 import org.enso.projectmanager.data.{
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala
index 6284f550bb48..cea75e71949c 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala
@@ -1,7 +1,8 @@
 package org.enso.projectmanager.requesthandler
 
 import akka.actor.Props
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
+import org.enso.semver.SemVerOrdering._
 import org.enso.jsonrpc.Unused
 import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.core.syntax._
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala
index 342187f1ea8b..ebec16e0f070 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala
@@ -2,6 +2,7 @@ package org.enso.projectmanager.requesthandler
 
 import akka.actor.Props
 import org.enso.jsonrpc.Unused
+import org.enso.semver.SemVerOrdering._
 import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.core.syntax._
 import org.enso.projectmanager.control.effect.Exec
@@ -52,4 +53,5 @@ object EngineListInstalledHandler {
     service: RuntimeVersionManagementServiceApi[F],
     requestTimeout: FiniteDuration
   ): Props = Props(new EngineListInstalledHandler[F](service, requestTimeout))
+
 }
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationService.scala
index 984adf2efce8..eee8de140b4c 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationService.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationService.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.service
 
 import akka.actor.ActorRef
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.masking.MaskedPath
 import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.core.syntax._
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationServiceApi.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationServiceApi.scala
index d51ada458718..5f6e1b7d9147 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationServiceApi.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectCreationServiceApi.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.service
 import java.nio.file.Path
 
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.MissingComponentAction
 
 /** An abstraction for creating new project structures under the given location.
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala
index 90f78502c24e..57ea987c7084 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectService.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.service
 import akka.actor.ActorRef
 import cats.MonadError
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.DefaultEdition
 import org.enso.pkg.Config
 import org.enso.pkg.validation.NameValidation
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceApi.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceApi.scala
index 2f0489c5e9f0..35f0746041a4 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceApi.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceApi.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.service
 
 import java.util.UUID
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.{
   LanguageServerStatus,
   MissingComponentAction,
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceFailure.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceFailure.scala
index ec31afe84dff..50277d84fee8 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceFailure.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/ProjectServiceFailure.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.service
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.requesthandler.{
   FailureMapper,
   ProjectServiceFailureMapper
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigService.scala
index 15f7185befbd..8d99a2e7be30 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigService.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigService.scala
@@ -1,7 +1,7 @@
 package org.enso.projectmanager.service.config
 
 import io.circe.Json
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.{DefaultEnsoVersion, EnsoVersion, SemVerEnsoVersion}
 import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.effect.{ErrorChannel, Sync}
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigServiceApi.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigServiceApi.scala
index 8bb94ca7f35c..5ce281836c00 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigServiceApi.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/config/GlobalConfigServiceApi.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.service.config
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.editions.EnsoVersion
 
 /** A contract for the Global Config Service.
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/ControllerInterface.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/ControllerInterface.scala
index 09467e5285b4..ba1afbf7a193 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/ControllerInterface.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/ControllerInterface.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.service.versionmanagement
 
 import akka.actor.ActorRef
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.ProgressNotification
 import org.enso.distribution.ProgressAndLockNotificationForwarder
 import org.enso.runtimeversionmanager.components.{
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/NoOpInterface.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/NoOpInterface.scala
index 1d4c59376045..820ca63ecf0c 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/NoOpInterface.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/NoOpInterface.scala
@@ -1,6 +1,6 @@
 package org.enso.projectmanager.service.versionmanagement
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.distribution.locking.Resource
 import org.enso.runtimeversionmanager.components.{
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementService.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementService.scala
index dd3ad3fcb1d9..708620e1d761 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementService.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementService.scala
@@ -1,7 +1,7 @@
 package org.enso.projectmanager.service.versionmanagement
 
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.control.effect.{ErrorChannel, Sync}
 import org.enso.projectmanager.data.EngineVersion
 import org.enso.projectmanager.service.ProjectServiceFailure
diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementServiceApi.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementServiceApi.scala
index 096fcd5859a9..ed44346f0d7d 100644
--- a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementServiceApi.scala
+++ b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/service/versionmanagement/RuntimeVersionManagementServiceApi.scala
@@ -1,7 +1,7 @@
 package org.enso.projectmanager.service.versionmanagement
 
 import akka.actor.ActorRef
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.EngineVersion
 import org.enso.projectmanager.service.ProjectServiceFailure
 
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala
index 72766c7a8c3d..c161b04e93b8 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/BaseServerSpec.scala
@@ -8,7 +8,7 @@ import akka.testkit.TestActors.blackholeProps
 import akka.testkit._
 import io.circe.Json
 import io.circe.parser.parse
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.apache.commons.io.FileUtils
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.distribution.FileSystem
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/ProjectManagementOps.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/ProjectManagementOps.scala
index 29a85710f082..025dade61d68 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/ProjectManagementOps.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/ProjectManagementOps.scala
@@ -4,9 +4,9 @@ import akka.testkit.TestDuration
 import io.circe.Json
 import io.circe.syntax._
 import io.circe.literal._
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 import io.circe.parser.parse
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.{MissingComponentAction, Socket}
 import org.enso.projectmanager.protocol.ProjectManagementApi.ProjectOpen
 import org.scalactic.source.Position
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala
index a6bf28102025..970319903947 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/infrastructure/languageserver/LanguageServerGatewaySpec.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.infrastructure.languageserver
 
 import akka.testkit.TestDuration
 import io.circe.literal._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.ReportLogsOnFailure
 import org.enso.projectmanager.test.Net._
 import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps}
@@ -17,9 +17,9 @@ class LanguageServerGatewaySpec
     with ProjectManagementOps
     with ReportLogsOnFailure {
 
-  override val testVersion: SemVer = SemVer(0, 0, 1)
+  override val testVersion: SemVer = SemVer.of(0, 0, 1)
 
-  override val engineToInstall = Some(SemVer(0, 0, 1))
+  override val engineToInstall = Some(SemVer.of(0, 0, 1))
 
   "A language server service" must {
 
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala
index 760b2de00674..9100e33c8596 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/MissingComponentBehavior.scala
@@ -1,7 +1,7 @@
 package org.enso.projectmanager.protocol
 
 import io.circe.Json
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.BaseServerSpec
 import org.enso.projectmanager.data.MissingComponentAction
 import org.enso.runtimeversionmanager.components.GraalVMVersion
@@ -17,8 +17,8 @@ trait MissingComponentBehavior {
 
   def isSuccess(json: Json): Boolean
 
-  val defaultVersion = SemVer(0, 0, 1)
-  val brokenVersion  = SemVer(0, 9999, 0, Some("broken"))
+  val defaultVersion = SemVer.of(0, 0, 1)
+  val brokenVersion  = SemVer.of(0, 9999, 0, "broken")
 
   def correctlyHandleMissingComponents(): Unit = {
     "fail if a missing version is requested with Fail" in {
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateDefaultToLatestSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateDefaultToLatestSpec.scala
index e6e29bb02b6e..1f1f8ae95377 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateDefaultToLatestSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateDefaultToLatestSpec.scala
@@ -1,7 +1,7 @@
 package org.enso.projectmanager.protocol
 
 import io.circe.literal.JsonStringContext
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.ReportLogsOnFailure
 import org.enso.projectmanager.BaseServerSpec
 import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite
@@ -11,7 +11,7 @@ class ProjectCreateDefaultToLatestSpec
     with OverrideTestVersionSuite
     with ReportLogsOnFailure {
 
-  override val testVersion: SemVer = SemVer(0, 1, 0)
+  override val testVersion: SemVer = SemVer.of(0, 1, 0)
 
   "project/create" should {
 
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateSpecBase.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateSpecBase.scala
index e8e175339f6f..77eb330aa64b 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateSpecBase.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectCreateSpecBase.scala
@@ -2,11 +2,11 @@ package org.enso.projectmanager.protocol
 
 import io.circe.Json
 import io.circe.literal.JsonStringContext
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.MissingComponentAction
 import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps}
 import org.enso.testkit.RetrySpec
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 
 abstract class ProjectCreateSpecBase
     extends BaseServerSpec
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala
index 445ce51056bc..d04f60a0e73d 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectManagementApiSpec.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.protocol
 
 import akka.testkit.TestDuration
 import io.circe.literal._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.apache.commons.io.FileUtils
 import org.enso.logger.ReportLogsOnFailure
 import org.enso.projectmanager.boot.configuration.TimeoutConfig
@@ -25,14 +25,14 @@ class ProjectManagementApiSpec
     with ProjectManagementOps
     with ReportLogsOnFailure {
 
-  override val testVersion: SemVer = SemVer(0, 0, 1)
+  override val testVersion: SemVer = SemVer.of(0, 0, 1)
 
   override def beforeEach(): Unit = {
     super.beforeEach()
     gen.reset()
   }
 
-  override val engineToInstall = Some(SemVer(0, 0, 1))
+  override val engineToInstall = Some(SemVer.of(0, 0, 1))
 
   override val deleteProjectsRootAfterEachTest = false
 
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala
index dcc1810e3c40..6ba1688193e6 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenHandleMissingRuntimeSpec.scala
@@ -1,13 +1,13 @@
 package org.enso.projectmanager.protocol
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite
 
 class ProjectOpenHandleMissingRuntimeSpec
     extends ProjectOpenSpecBase
     with OverrideTestVersionSuite {
 
-  override def testVersion: SemVer = SemVer(0, 0, 1)
+  override def testVersion: SemVer = SemVer.of(0, 0, 1)
 
   "project/open" should {
     behave like correctlyHandleMissingRuntimeInPresenceOfEngine()
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala
index 66d2c4d3f8cd..f0cf86e20d0f 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenMissingComponentsSpec.scala
@@ -1,5 +1,5 @@
 package org.enso.projectmanager.protocol
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.ReportLogsOnFailure
 import org.enso.runtimeversionmanager.test.OverrideTestVersionSuite
 
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenSpecBase.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenSpecBase.scala
index e0e820ce4e2a..0cacbe3f6c73 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenSpecBase.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectOpenSpecBase.scala
@@ -3,7 +3,7 @@ package org.enso.projectmanager.protocol
 import akka.testkit.TestActors.blackholeProps
 import io.circe.Json
 import io.circe.literal.JsonStringContext
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.projectmanager.data.MissingComponentAction
 import org.enso.projectmanager.{BaseServerSpec, ProjectManagementOps}
 import org.enso.testkit.RetrySpec
@@ -75,8 +75,9 @@ abstract class ProjectOpenSpecBase
     version: SemVer,
     missingComponentAction: MissingComponentAction
   ): Json = {
+    val prerelease = version.preReleaseVersion()
     val projectId =
-      if (version.preRelease.contains("broken")) brokenProject
+      if (prerelease != null && prerelease.contains("broken")) brokenProject
       else ordinaryProject
 
     json"""
diff --git a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala
index 4a2553dd20f4..2b0800476535 100644
--- a/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala
+++ b/lib/scala/project-manager/src/test/scala/org/enso/projectmanager/protocol/ProjectShutdownSpec.scala
@@ -2,7 +2,7 @@ package org.enso.projectmanager.protocol
 
 import akka.actor.ActorRef
 import io.circe.literal._
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.jsonrpc.ClientControllerFactory
 import org.enso.logger.ReportLogsOnFailure
 import org.enso.projectmanager.boot.configuration.TimeoutConfig
@@ -24,14 +24,14 @@ class ProjectShutdownSpec
     with ProjectManagementOps
     with ReportLogsOnFailure {
 
-  override val testVersion: SemVer = SemVer(0, 0, 1)
+  override val testVersion: SemVer = SemVer.of(0, 0, 1)
 
   override def beforeEach(): Unit = {
     super.beforeEach()
     gen.reset()
   }
 
-  override val engineToInstall = Some(SemVer(0, 0, 1))
+  override val engineToInstall = Some(SemVer.of(0, 0, 1))
 
   override val deleteProjectsRootAfterEachTest = false
 
diff --git a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/OverrideTestVersionSuite.scala b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/OverrideTestVersionSuite.scala
index eb145c138c76..920bbc3c83d5 100644
--- a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/OverrideTestVersionSuite.scala
+++ b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/OverrideTestVersionSuite.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.test
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.runtimeversionmanager.CurrentVersion
 import org.scalatest.{BeforeAndAfterAll, Suite}
 
diff --git a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/RuntimeVersionManagerTest.scala b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/RuntimeVersionManagerTest.scala
index d2527854bd08..d50b6e70049c 100644
--- a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/RuntimeVersionManagerTest.scala
+++ b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/RuntimeVersionManagerTest.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.test
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.{
   DistributionManager,
   Environment,
diff --git a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/TestRuntimeVersionManagementUserInterface.scala b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/TestRuntimeVersionManagementUserInterface.scala
index 24c1e7e989ac..5957f1aa33e5 100644
--- a/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/TestRuntimeVersionManagementUserInterface.scala
+++ b/lib/scala/runtime-version-manager-test/src/main/scala/org/enso/runtimeversionmanager/test/TestRuntimeVersionManagementUserInterface.scala
@@ -1,7 +1,7 @@
 package org.enso.runtimeversionmanager.test
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.distribution.locking.Resource
 import org.enso.runtimeversionmanager.components.{
diff --git a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/distribution/locking/ConcurrencyTest.scala b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/distribution/locking/ConcurrencyTest.scala
index 9931a6e9c435..aaf01815b0fc 100644
--- a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/distribution/locking/ConcurrencyTest.scala
+++ b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/distribution/locking/ConcurrencyTest.scala
@@ -1,6 +1,6 @@
 package org.enso.distribution.locking
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.distribution.{
@@ -195,8 +195,8 @@ class ConcurrencyTest
 
       /** Download only engines with associated runtimes.
         */
-      val engine1 = SemVer(0, 0, 0)
-      val engine2 = engine1.withPreRelease("pre")
+      val engine1 = SemVer.of(0, 0, 0)
+      val engine2 = SemVer.of(0, 0, 0, "pre")
 
       val tmpRoot = getTestDirectory / "test_data" / "tmp"
       Files.createDirectories(tmpRoot)
@@ -261,7 +261,7 @@ class ConcurrencyTest
         */
       val sync = new SlowTestSynchronizer
 
-      val engineVersion = SemVer(0, 0, 0)
+      val engineVersion = SemVer.of(0, 0, 0)
 
       sync.startThread("t1") {
         val componentsManager = makeComponentsManager(
@@ -319,7 +319,7 @@ class ConcurrencyTest
         */
       val sync = new SlowTestSynchronizer
 
-      val engineVersion = SemVer(0, 0, 1)
+      val engineVersion = SemVer.of(0, 0, 1)
 
       sync.startThread("t1") {
         val componentsManager = makeComponentsManager(
diff --git a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagerSpec.scala b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagerSpec.scala
index e24a4962ada5..81900f510ff3 100644
--- a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagerSpec.scala
+++ b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagerSpec.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager.components
 
 import java.nio.file.{Files, Path}
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.OS
 import org.enso.distribution.FileSystem
 import org.enso.distribution.FileSystem.PathSyntax
@@ -21,20 +21,21 @@ class RuntimeVersionManagerSpec
     with OsSpec
     with OverrideTestVersionSuite {
 
-  override val testVersion: SemVer = SemVer(0, 0, 1)
+  override val testVersion: SemVer = SemVer.of(0, 0, 1)
 
   "RuntimeVersionManager" should {
     "find the latest engine version in semver ordering " +
     "(skipping broken releases)" in {
       val componentsManager = makeRuntimeVersionManager()
-      componentsManager.fetchLatestEngineVersion() shouldEqual SemVer(0, 1, 0)
+      componentsManager
+        .fetchLatestEngineVersion() shouldEqual SemVer.of(0, 1, 0)
     }
 
     "install the engine and a matching runtime for it" in {
       val (distributionManager, componentsManager, _) = makeManagers()
 
-      val version = SemVer(0, 0, 1)
-      val engine  = componentsManager.findOrInstallEngine(SemVer(0, 0, 1))
+      val version = SemVer.of(0, 0, 1)
+      val engine  = componentsManager.findOrInstallEngine(SemVer.of(0, 0, 1))
 
       engine.version shouldEqual version
       assert(
@@ -53,7 +54,7 @@ class RuntimeVersionManagerSpec
     "list installed engines and runtimes" in {
       val componentsManager = makeRuntimeVersionManager()
       val engineVersions =
-        Set(SemVer(0, 0, 0), SemVer(0, 0, 1), SemVer(0, 1, 0))
+        Set(SemVer.of(0, 0, 0), SemVer.of(0, 0, 1), SemVer.of(0, 1, 0))
       val runtimeVersions =
         Set(
           components.GraalVMVersion("1.0.0", "11"),
@@ -87,7 +88,7 @@ class RuntimeVersionManagerSpec
       val componentsManager = makeManagers(userInterface =
         new TestRuntimeVersionManagementUserInterface(installBroken = true)
       )._2
-      val brokenVersion = SemVer(0, 9999, 0, Some("broken"))
+      val brokenVersion = SemVer.of(0, 9999, 0, "broken")
       componentsManager.findOrInstallEngine(brokenVersion)
 
       assert(
@@ -108,8 +109,8 @@ class RuntimeVersionManagerSpec
           distributionManager
         )
 
-      val validVersion          = SemVer(0, 0, 1)
-      val newerButBrokenVersion = SemVer(0, 9999, 0, Some("broken"))
+      val validVersion          = SemVer.of(0, 0, 1)
+      val newerButBrokenVersion = SemVer.of(0, 9999, 0, "broken")
       componentsManager.findOrInstallEngine(validVersion)
       componentsManager.findOrInstallEngine(newerButBrokenVersion)
 
@@ -121,7 +122,7 @@ class RuntimeVersionManagerSpec
         new TestRuntimeVersionManagementUserInterface(installBroken = true)
       val componentsManager = makeManagers(userInterface = userInterface)._2
 
-      val brokenVersion = SemVer(0, 9999, 0, Some("broken"))
+      val brokenVersion = SemVer.of(0, 9999, 0, "broken")
       componentsManager.findOrInstallEngine(brokenVersion)
       assert(
         userInterface.wasAskedToInstallBroken,
@@ -132,7 +133,7 @@ class RuntimeVersionManagerSpec
 
     "issue a context-specific error when a nightly release cannot be found" in {
       val componentsManager = makeManagers()._2
-      val nightlyVersion    = SemVer(0, 0, 0, Some("SNAPSHOT.2000-01-01"))
+      val nightlyVersion    = SemVer.of(0, 0, 0, "SNAPSHOT.2000-01-01")
       val exception = intercept[ReleaseNotFound] {
         componentsManager.findOrInstallEngine(nightlyVersion)
       }
@@ -142,14 +143,14 @@ class RuntimeVersionManagerSpec
     "uninstall the runtime iff it is not used by any engines" in {
       val componentsManager = makeRuntimeVersionManager()
       val engineVersions =
-        Seq(SemVer(0, 0, 0), SemVer(0, 0, 1), SemVer(0, 1, 0))
+        Seq(SemVer.of(0, 0, 0), SemVer.of(0, 0, 1), SemVer.of(0, 1, 0))
       engineVersions.map(componentsManager.findOrInstallEngine)
 
       componentsManager.listInstalledEngines() should have length 3
       componentsManager.listInstalledGraalRuntimes() should have length 2
 
       // remove the engine that shares the runtime with another one
-      val version1 = SemVer(0, 1, 0)
+      val version1 = SemVer.of(0, 1, 0)
       componentsManager.uninstallEngine(version1)
       val engines1 = componentsManager.listInstalledEngines()
       engines1 should have length 2
@@ -157,7 +158,7 @@ class RuntimeVersionManagerSpec
       componentsManager.listInstalledGraalRuntimes() should have length 2
 
       // remove the second engine that shared the runtime
-      val version2 = SemVer(0, 0, 1)
+      val version2 = SemVer.of(0, 0, 1)
       componentsManager.uninstallEngine(version2)
       val engines2 = componentsManager.listInstalledEngines()
       engines2 should have length 1
@@ -170,7 +171,7 @@ class RuntimeVersionManagerSpec
       )
 
       // remove the last engine
-      componentsManager.uninstallEngine(SemVer(0, 0, 0))
+      componentsManager.uninstallEngine(SemVer.of(0, 0, 0))
       componentsManager.listInstalledEngines() should have length 0
       componentsManager.listInstalledGraalRuntimes() should have length 0
     }
@@ -181,15 +182,15 @@ class RuntimeVersionManagerSpec
       val launcher =
         makeManagers(installerKind = InstallerKind.Launcher)._2
 
-      val engineWithDifferentVersionRequirements = SemVer(0, 1, 0)
+      val engineWithDifferentVersionRequirements = SemVer.of(0, 1, 0)
 
       val manifest =
         launcher
           .findOrInstallEngine(engineWithDifferentVersionRequirements)
           .manifest
 
-      val usualVersion = SemVer(0, 0, 0, Some("dev"))
-      val bigVersion   = SemVer(9999, 0, 0)
+      val usualVersion = SemVer.of(0, 0, 0, "dev")
+      val bigVersion   = SemVer.of(9999, 0, 0)
       manifest.requiredInstallerVersions.launcher shouldEqual usualVersion
       manifest.requiredInstallerVersions.projectManager shouldEqual bigVersion
 
@@ -209,7 +210,7 @@ class RuntimeVersionManagerSpec
     }
 
     "support bundled components" in {
-      val engineVersion  = SemVer(0, 1, 0)
+      val engineVersion  = SemVer.of(0, 1, 0)
       val runtimeVersion = GraalVMVersion("1.0.0", "11")
       prepareBundle(
         engineVersion  = engineVersion,
@@ -227,7 +228,7 @@ class RuntimeVersionManagerSpec
     }
 
     "fail to uninstall a read-only bundled component" taggedAs OsUnix in {
-      val engineVersion  = SemVer(0, 1, 0)
+      val engineVersion  = SemVer.of(0, 1, 0)
       val runtimeVersion = GraalVMVersion("1.0.0", "11")
       prepareBundle(
         engineVersion  = engineVersion,
@@ -273,17 +274,17 @@ class RuntimeVersionManagerSpec
 
     "include both bundled and installed components in list" in {
       prepareBundle(
-        engineVersion  = SemVer(0, 0, 1),
+        engineVersion  = SemVer.of(0, 0, 1),
         runtimeVersion = GraalVMVersion("23.2.0", "21.0.0")
       )
       val manager = makeRuntimeVersionManager()
-      manager.findOrInstallEngine(SemVer(0, 0, 1).withPreRelease("pre"))
+      manager.findOrInstallEngine(SemVer.of(0, 0, 1, "pre"))
 
       manager
         .listInstalledEngines()
         .map(_.version) should contain theSameElementsAs Seq(
-        SemVer(0, 0, 1),
-        SemVer(0, 0, 1).withPreRelease("pre")
+        SemVer.of(0, 0, 1),
+        SemVer.of(0, 0, 1, "pre")
       )
 
       val runtimeVersions = manager.listInstalledGraalRuntimes().map(_.version)
@@ -295,7 +296,7 @@ class RuntimeVersionManagerSpec
     }
 
     "cope with semantic versioning of Java" in {
-      val engineVersion = SemVer(0, 0, 3)
+      val engineVersion = SemVer.of(0, 0, 3)
       val graalVersion  = GraalVMVersion("23.0.0", "17.0.7")
       prepareBundle(
         engineVersion  = engineVersion,
diff --git a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/config/GlobalConfigurationManagerSpec.scala b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/config/GlobalConfigurationManagerSpec.scala
index 09c490eacbf5..ad35b9f74f32 100644
--- a/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/config/GlobalConfigurationManagerSpec.scala
+++ b/lib/scala/runtime-version-manager-test/src/test/scala/org/enso/runtimeversionmanager/config/GlobalConfigurationManagerSpec.scala
@@ -1,7 +1,7 @@
 package org.enso.runtimeversionmanager.config
 
 import io.circe.Json
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.DistributionManager
 import org.enso.distribution.config.InvalidConfigError
 import org.enso.runtimeversionmanager.test.FakeEnvironment
@@ -20,7 +20,7 @@ class GlobalConfigurationManagerSpec
     val env                 = fakeInstalledEnvironment()
     val distributionManager = new DistributionManager(env)
     new GlobalRunnerConfigurationManager(null, distributionManager) {
-      override def defaultVersion: SemVer = SemVer(0, 0, 0)
+      override def defaultVersion: SemVer = SemVer.of(0, 0, 0)
     }
   }
 
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/CurrentVersion.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/CurrentVersion.scala
index 8fcd9bbfe2ba..ec0b7988847e 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/CurrentVersion.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/CurrentVersion.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager
 
 import buildinfo.Info
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Helper object that allows to get the current application version.
   *
@@ -11,12 +11,13 @@ import nl.gn0s1s.bump.SemVer
   */
 object CurrentVersion {
 
-  private var currentVersion: SemVer = SemVer(Info.ensoVersion).getOrElse {
-    throw new IllegalStateException("Cannot parse the built-in version.")
-  }
+  private var currentVersion: SemVer =
+    SemVer.parse(Info.ensoVersion).getOrElse {
+      throw new IllegalStateException("Cannot parse the built-in version.")
+    }
 
   private val defaultDevEnsoVersion: SemVer =
-    SemVer(Info.defaultDevEnsoVersion).getOrElse {
+    SemVer.parse(Info.defaultDevEnsoVersion).getOrElse {
       throw new IllegalStateException("Cannot parse the built-in dev version.")
     }
 
@@ -25,7 +26,9 @@ object CurrentVersion {
 
   /** Check if the current version is the development one. */
   def isDevVersion: Boolean =
-    currentVersion.preRelease == defaultDevEnsoVersion.preRelease
+    currentVersion.preReleaseVersion() != null && (currentVersion
+      .preReleaseVersion() == defaultDevEnsoVersion
+      .preReleaseVersion())
 
   /** Override launcher version with the provided one.
     *
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/ComponentsException.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/ComponentsException.scala
index 0d1653829dac..9fccdf66e8b3 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/ComponentsException.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/ComponentsException.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager.components
 
 import java.nio.file.Path
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** A base class for exceptions caused by [[RuntimeVersionManager]] logic.
   */
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Engine.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Engine.scala
index 3ff33b3a0497..24abaaf238bf 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Engine.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Engine.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager.components
 
 import java.nio.file.{Files, Path}
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.logger.masking.MaskedPath
 import org.enso.distribution.FileSystem.PathSyntax
 import org.enso.runtimeversionmanager.components.Manifest.JVMOption
@@ -105,5 +105,7 @@ object Engine {
     * See `docs/distribution/nightly.md` for more information.
     */
   def isNightly(version: SemVer): Boolean =
-    version.preRelease.exists(_.contains(nightlyInfix))
+    version.preReleaseVersion() != null && version
+      .preReleaseVersion()
+      .contains(nightlyInfix)
 }
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/GraalVMVersion.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/GraalVMVersion.scala
index 3ca099edf320..aa97aa65a3ce 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/GraalVMVersion.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/GraalVMVersion.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.components
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Version information identifying the runtime that can be used with an engine
   * release.
@@ -46,11 +46,9 @@ object GraalVMVersion {
     version.toIntOption match {
       case Some(_) => true
       case None =>
-        SemVer(version) match {
-          case Some(_) => true
-          case None =>
-            version.matches("^(\\d+\\.){3}\\d+$")
-        }
+        SemVer
+          .parse(version)
+          .fold(_ => version.matches("^(\\d+\\.){3}\\d+$"), _ => true)
     }
   }
 }
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Manifest.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Manifest.scala
index 3d51b7cafe2e..a4dc9b612de8 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Manifest.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/Manifest.scala
@@ -4,9 +4,9 @@ import java.io.FileReader
 import java.nio.file.Path
 import cats.Show
 import io.circe.{yaml, Decoder}
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.OS
-import org.enso.editions.SemVerJson._
+import org.enso.semver.SemVerJson._
 import org.enso.runtimeversionmanager.components.Manifest.{
   JVMOption,
   RequiredInstallerVersions
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagementUserInterface.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagementUserInterface.scala
index 64abcfbc8dc6..4d9daf42c3c0 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagementUserInterface.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManagementUserInterface.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.components
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.ProgressReporter
 import org.enso.distribution.locking.LockUserInterface
 
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManager.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManager.scala
index 8c2c4650c368..93c681b897cc 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManager.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/components/RuntimeVersionManager.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager.components
 
 import java.nio.file.{Files, Path, StandardOpenOption}
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.OS
 import org.enso.distribution.{
   DistributionManager,
@@ -430,7 +430,11 @@ class RuntimeVersionManager(
   private def isEngineVersionCompatibleWithThisInstaller(
     manifest: Manifest
   ): Boolean = {
-    if (CurrentVersion.version >= manifest.minimumRequiredVersion) true
+    if (
+      CurrentVersion.version.isGreaterThanOrEqual(
+        manifest.minimumRequiredVersion
+      )
+    ) true
     else if (CurrentVersion.isDevVersion) {
       logger.warn(
         "Ignoring the minimum required engine version check " +
@@ -712,13 +716,15 @@ class RuntimeVersionManager(
     */
   private def parseEngineVersion(path: Path): Try[SemVer] = {
     val name = path.getFileName.toString
-    SemVer(name)
-      .toRight(
-        UnrecognizedComponentError(
-          s"Invalid engine component version `$name`."
+    SemVer
+      .parse(name)
+      .recoverWith(_ =>
+        Failure(
+          UnrecognizedComponentError(
+            s"Invalid engine component version `$name`."
+          )
         )
       )
-      .toTry
   }
 
   /** Loads the engine manifest, checking if that release is compatible with the
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/config/GlobalRunnerConfigurationManager.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/config/GlobalRunnerConfigurationManager.scala
index 589e2b62e178..7dccb0d93610 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/config/GlobalRunnerConfigurationManager.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/config/GlobalRunnerConfigurationManager.scala
@@ -1,7 +1,8 @@
 package org.enso.runtimeversionmanager.config
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
+import org.enso.semver.SemVerOrdering._
 import org.enso.distribution.DistributionManager
 import org.enso.distribution.config.{DefaultVersion, GlobalConfigurationManager}
 import org.enso.runtimeversionmanager.components.RuntimeVersionManager
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/locking/Resources.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/locking/Resources.scala
index 55f2ac77e6c8..79ad2f23566c 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/locking/Resources.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/locking/Resources.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.locking
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.locking.Resource
 import org.enso.runtimeversionmanager.components.GraalVMVersion
 
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/EnsoReleaseProvider.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/EnsoReleaseProvider.scala
index 94e8c71cf148..7c5a184518a6 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/EnsoReleaseProvider.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/EnsoReleaseProvider.scala
@@ -1,5 +1,6 @@
 package org.enso.runtimeversionmanager.releases
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
+import org.enso.semver.SemVerOrdering._
 import org.enso.cli.OS
 
 import scala.util.{Failure, Success, Try}
@@ -33,7 +34,7 @@ abstract class EnsoReleaseProvider[ReleaseType](
       for {
         release <- releases
         versionString = release.tag.stripPrefix(tagPrefix)
-        version <- SemVer(versionString)
+        version <- SemVer.parse(versionString).toOption
       } yield ReleaseProvider
         .Version(version = version, markedAsBroken = release.isMarkedBroken)
     }
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/ReleaseProvider.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/ReleaseProvider.scala
index 81df9c74aa72..7d0cdf16d164 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/ReleaseProvider.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/ReleaseProvider.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.releases
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 import scala.util.Try
 
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineRelease.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineRelease.scala
index 69a1d0e97d9d..ea30d85614a8 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineRelease.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineRelease.scala
@@ -2,7 +2,7 @@ package org.enso.runtimeversionmanager.releases.engine
 
 import java.nio.file.Path
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.runtimeversionmanager.components.Manifest
 
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineReleaseProvider.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineReleaseProvider.scala
index 60f777a60c72..7a2c54876950 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineReleaseProvider.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/releases/engine/EngineReleaseProvider.scala
@@ -1,7 +1,7 @@
 package org.enso.runtimeversionmanager.releases.engine
 
 import java.nio.file.Path
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.cli.task.TaskProgress
 import org.enso.runtimeversionmanager.components.{Engine, Manifest}
 import org.enso.runtimeversionmanager.releases.{
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/RunSettings.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/RunSettings.scala
index 15294193d574..9f9d0ad592d7 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/RunSettings.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/RunSettings.scala
@@ -1,6 +1,6 @@
 package org.enso.runtimeversionmanager.runner
 
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 
 /** Represents settings that are used to launch the runner JAR.
   *
diff --git a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
index 7dfe4669b679..008167dcfa53 100644
--- a/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
+++ b/lib/scala/runtime-version-manager/src/main/scala/org/enso/runtimeversionmanager/runner/Runner.scala
@@ -1,7 +1,7 @@
 package org.enso.runtimeversionmanager.runner
 
 import com.typesafe.scalalogging.Logger
-import nl.gn0s1s.bump.SemVer
+import org.enso.semver.SemVer
 import org.enso.distribution.{DistributionManager, Environment}
 import org.enso.editions.updater.EditionManager
 import org.enso.editions.{DefaultEnsoVersion, SemVerEnsoVersion}
@@ -292,7 +292,9 @@ class Runner(
       case Some(project) =>
         // TODO [RW] properly get the default edition, see #1864
         val version = project.edition
-          .map(edition => editionManager.resolveEngineVersion(edition).get)
+          .flatMap(edition =>
+            editionManager.resolveEngineVersion(edition).toOption
+          )
           .map(SemVerEnsoVersion)
           .getOrElse(DefaultEnsoVersion)
         version match {
diff --git a/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala b/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala
index 62d9faae1882..457e8b7ad2c1 100644
--- a/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala
+++ b/lib/scala/searcher/src/main/scala/org/enso/searcher/sql/SqlSuggestionsRepo.scala
@@ -175,10 +175,7 @@ final class SqlSuggestionsRepo(val db: SqlDatabase)(implicit
 
   /** The query to clean the repo. */
   private def cleanQuery: DBIO[Unit] = {
-    for {
-      _ <- Suggestions.delete
-      _ <- SuggestionsVersion.delete
-    } yield ()
+    DBIO.seq(Suggestions.delete, SuggestionsVersion.delete)
   }
 
   /** The query to get all suggestions.
diff --git a/lib/scala/semver/src/main/java/org/enso/semver/SemVer.java b/lib/scala/semver/src/main/java/org/enso/semver/SemVer.java
new file mode 100644
index 000000000000..486a2b80f592
--- /dev/null
+++ b/lib/scala/semver/src/main/java/org/enso/semver/SemVer.java
@@ -0,0 +1,159 @@
+package org.enso.semver;
+
+import java.util.regex.Pattern;
+import scala.util.Failure;
+import scala.util.Success;
+import scala.util.Try;
+
+/** A facade hiding the implementation of the Semantic Versioning used in Enso. */
+public final class SemVer {
+
+  private final long major;
+  private final long minor;
+  private final long patch;
+  private final String preRelease;
+  private final String prefix;
+  private final String buildMetadata;
+
+  private static final Pattern regex =
+      Pattern.compile(
+          "^([a-z]+-)?(\\d|[1-9]\\d+)\\.(\\d|[1-9]\\d+)\\.(\\d|[1-9]\\d+)(-[0-9A-Za-z-\\.]+)?(\\+[0-9A-Za-z-\\.\\+]+)?$");
+
+  private SemVer(
+      long major, long minor, long patch, String preRelease, String prefix, String buildMetadata) {
+    this.major = major;
+    this.minor = minor;
+    this.patch = patch;
+    this.preRelease = preRelease;
+    this.prefix = prefix;
+    this.buildMetadata = buildMetadata;
+  }
+
+  private SemVer(long major, long minor, long patch, String preRelease) {
+    this.major = major;
+    this.minor = minor;
+    this.patch = patch;
+    this.preRelease = preRelease;
+    this.prefix = null;
+    this.buildMetadata = null;
+  }
+
+  private SemVer(long major, long minor, long patch) {
+    this.major = major;
+    this.minor = minor;
+    this.patch = patch;
+    this.preRelease = null;
+    this.prefix = null;
+    this.buildMetadata = null;
+  }
+
+  public static Try<SemVer> parse(String version) {
+    var match = regex.matcher(version);
+    if (match.find()) {
+      var prefix = match.groupCount() > 0 ? match.group(1) : null;
+      var preRelease =
+          match.groupCount() == 6 && match.group(5) != null ? match.group(5).substring(1) : null;
+      var buildMetadata =
+          match.groupCount() == 6 && match.group(6) != null ? match.group(6).substring(1) : null;
+      return Success.apply(
+          new SemVer(
+              Integer.valueOf(match.group(2)),
+              Integer.valueOf(match.group(3)),
+              Integer.valueOf(match.group(4)),
+              preRelease,
+              prefix,
+              buildMetadata));
+
+    } else {
+      return Failure.apply(new RuntimeException("Invalid version " + version));
+    }
+  }
+
+  public static SemVer of(int major) {
+    return new SemVer(major, 0, 0);
+  }
+
+  public static SemVer of(int major, int minor) {
+    return new SemVer(major, minor, 0);
+  }
+
+  public static SemVer of(int major, int minor, int patch) {
+    return new SemVer(major, minor, patch);
+  }
+
+  public static SemVer of(int major, int minor, int patch, String preReleaseVersion) {
+    return new SemVer(major, minor, patch, preReleaseVersion);
+  }
+
+  public boolean isGreaterThanOrEqual(SemVer v) {
+    return compareTo(v) >= 0;
+  }
+
+  public boolean isGreaterThan(SemVer v) {
+    return compareTo(v) > 0;
+  }
+
+  public boolean isLessThanOrEqual(SemVer v) {
+    return compareTo(v) <= 0;
+  }
+
+  public boolean isLessThan(SemVer v) {
+    return compareTo(v) < 0;
+  }
+
+  public String preReleaseVersion() {
+    return preRelease;
+  }
+
+  public String getBuildMetadata() {
+    return buildMetadata;
+  }
+
+  /**
+   * Compares two versions. Comparison ignores an optional prefix or build metadata suffix.
+   *
+   * @param v version to compare to
+   * @return -1 if this version is less than `v`, 1 if it is bigger than `v`, and 0 if they are the
+   *     same
+   */
+  public int compareTo(SemVer v) {
+    if (major < v.major) return -1;
+    else if (major > v.major) return 1;
+    else {
+      if (minor < v.minor) return -1;
+      else if (minor > v.minor) return 1;
+      else {
+        if (patch < v.patch) return -1;
+        else if (patch > v.patch) return 1;
+        else {
+          if (preRelease == null && v.preRelease == null) return 0;
+          if (preRelease == null) return 1;
+          else if (v.preRelease == null) return -1;
+          else return (preRelease.equals(v.preRelease) ? 0 : preRelease.compareTo(v.preRelease));
+        }
+      }
+    }
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    if (prefix != null) sb.append(prefix);
+    sb.append(major + ".");
+    sb.append(minor + ".");
+    sb.append(patch);
+    if (preRelease != null) sb.append("-" + preRelease);
+    return sb.toString();
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
+    }
+    if (!(other instanceof SemVer)) {
+      return false;
+    }
+    return compareTo((SemVer) other) == 0;
+  }
+}
diff --git a/lib/scala/semver/src/main/scala/org/enso/semver/SemVerJson.scala b/lib/scala/semver/src/main/scala/org/enso/semver/SemVerJson.scala
new file mode 100644
index 000000000000..25849798eaec
--- /dev/null
+++ b/lib/scala/semver/src/main/scala/org/enso/semver/SemVerJson.scala
@@ -0,0 +1,38 @@
+package org.enso.semver
+
+import io.circe.syntax._
+import io.circe.{Decoder, DecodingFailure, Encoder, HCursor}
+
+import scala.util.Success
+
+object SemVerJson {
+
+  /** [[Decoder]] instance allowing to parse semantic versioning strings.
+    */
+  implicit val semverDecoder: Decoder[SemVer] = { json =>
+    for {
+      string  <- json.as[String]
+      version <- safeParse(string, json)
+    } yield version
+  }
+
+  private def safeParse(
+    version: String,
+    json: HCursor
+  ): Either[DecodingFailure, SemVer] = {
+    SemVer.parse(version) match {
+      case Success(parsed) => Right(parsed)
+      case _ =>
+        Left(
+          DecodingFailure(
+            s"`$version` is not a valid semantic versioning string.",
+            json.history
+          )
+        )
+    }
+  }
+
+  /** [[Encoder]] instance allowing to serialize semantic versioning strings.
+    */
+  implicit val semverEncoder: Encoder[SemVer] = _.toString.asJson
+}
diff --git a/lib/scala/semver/src/main/scala/org/enso/semver/SemVerOrdering.scala b/lib/scala/semver/src/main/scala/org/enso/semver/SemVerOrdering.scala
new file mode 100644
index 000000000000..75a5caa31078
--- /dev/null
+++ b/lib/scala/semver/src/main/scala/org/enso/semver/SemVerOrdering.scala
@@ -0,0 +1,9 @@
+package org.enso.semver
+
+/** Implicits that should be imported when attempting to order Enso's versions.
+  */
+object SemVerOrdering {
+  implicit object VersionOrdering extends Ordering[SemVer] {
+    def compare(x: SemVer, y: SemVer): Int = x.compareTo(y)
+  }
+}
diff --git a/lib/scala/semver/src/test/java/org/enso/semver/VersionsTest.java b/lib/scala/semver/src/test/java/org/enso/semver/VersionsTest.java
new file mode 100644
index 000000000000..188ba465e3ba
--- /dev/null
+++ b/lib/scala/semver/src/test/java/org/enso/semver/VersionsTest.java
@@ -0,0 +1,82 @@
+package org.enso.semver;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class VersionsTest {
+
+  @Test
+  public void testVersionsParsing() throws Exception {
+    assertTrue(SemVer.parse("0.1.0").isSuccess());
+    assertTrue(SemVer.parse("0.1.1").isSuccess());
+    assertTrue(SemVer.parse("9999.0.0").isSuccess());
+    assertTrue(SemVer.parse("0.1").isFailure());
+  }
+
+  @Test
+  public void testVersionsParsingForPreReleases() throws Exception {
+    assertTrue(SemVer.parse("0.1.0-foo").isSuccess());
+    assertTrue(SemVer.parse("0.1.1-broken").isSuccess());
+    assertTrue(SemVer.parse("0.0.0-dev").isSuccess());
+    var r3 = SemVer.parse("enso-0.1.0");
+    assertTrue(r3.isSuccess());
+    assertTrue(r3.get().preReleaseVersion() == null);
+    assertTrue(r3.get().equals(SemVer.of(0, 1, 0)));
+    var r4 = SemVer.parse("enso-0.1.0-b");
+    assertTrue(r4.isSuccess());
+    assertTrue(r4.get().preReleaseVersion() != null);
+    assertTrue(!r4.get().equals(SemVer.of(0, 1, 0)));
+    assertEquals("parsed version should preserve prefix", r4.get().toString(), "enso-0.1.0-b");
+    var r5 = SemVer.parse("1.2.3+21");
+    assertTrue(r5.isSuccess());
+    assertTrue(r5.get().preReleaseVersion() == null);
+    assertTrue(r5.get().getBuildMetadata().equals("21"));
+  }
+
+  @Test
+  public void testVersionComparison() throws Exception {
+    var v1 = SemVer.parse("9999.0.0").get();
+    var v2 = SemVer.parse("0.0.0").get();
+    assertTrue(v1.isGreaterThan(v2));
+    assertTrue(!v1.isLessThan(v2));
+
+    var v3 = SemVer.parse("0.0.0-dev").get();
+    var v4 = SemVer.parse("0.0.0-dev").get();
+    assertFalse(v3 == v4);
+    assertTrue(v3.equals(v4));
+    assertEquals(v3.compareTo(v4), 0);
+
+    assertEquals(v2.compareTo(v3), 1);
+    assertEquals(v3.compareTo(v2), -1);
+    assertTrue(v3.isLessThan(v2));
+    assertTrue(v3.isLessThanOrEqual(v2));
+    assertTrue(v2.isGreaterThan(v3));
+
+    assertTrue(SemVer.of(1, 2, 3).isLessThan(SemVer.of(4, 0, 0)));
+    assertTrue(SemVer.of(4, 0, 0).isGreaterThan(SemVer.of(1, 0, 0)));
+    assertTrue(SemVer.of(2, 9, 9).isLessThan(SemVer.of(3, 1, 1)));
+    assertTrue(SemVer.of(2, 2, 1).isGreaterThan(SemVer.of(2, 2, 0)));
+    assertTrue(SemVer.of(2, 3, 0).isGreaterThan(SemVer.of(2, 1, 9)));
+    assertTrue(SemVer.of(100, 0, 0).isGreaterThan(SemVer.of(1, 0, 0)));
+    assertTrue(SemVer.of(21, 0, 0).isGreaterThan(SemVer.of(9, 0, 0)));
+    assertEquals(
+        SemVer.parse("0.2.17-SNAPSHOT.2021-07-23").get().preReleaseVersion(),
+        "SNAPSHOT.2021-07-23");
+
+    assertTrue(
+        SemVer.parse("0.2.17-SNAPSHOT.2021-07-23")
+            .get()
+            .isGreaterThanOrEqual(SemVer.of(0, 2, 17, "SNAPSHOT")));
+
+    var v5 = SemVer.parse("0.2.17-SNAPSHOT.2021-07-23").get();
+    var v6 = SemVer.parse("0.2.17-SNAPSHOT").get();
+    assertTrue(v5.isGreaterThanOrEqual(v6));
+  }
+
+  @Test
+  public void testInvalidVersion() throws Exception {
+    var v1 = SemVer.parse("1.001.0");
+    assertTrue(v1.isFailure());
+  }
+}
diff --git a/package-lock.json b/package-lock.json
index 09a589b332bf..3d2c25bf764e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -173,6 +173,8 @@
       "name": "enso-ide-desktop",
       "version": "1.0.0",
       "dependencies": {
+        "@stripe/react-stripe-js": "^2.3.1",
+        "@stripe/stripe-js": "^2.1.10",
         "esbuild-plugin-inline-image": "^0.0.9",
         "eslint-plugin-react": "^7.32.2",
         "eslint-plugin-react-hooks": "^4.6.0"
@@ -3918,6 +3920,24 @@
         "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
+    "node_modules/@stripe/react-stripe-js": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@stripe/react-stripe-js/-/react-stripe-js-2.5.0.tgz",
+      "integrity": "sha512-ys5bnrufNoBlUPRblWkiN7dUCX3s2noBZS0Lf5GkHYO9x3SXJMZccif53IdP4X6tZyNLn7aSMgZBUZqsdzrvhg==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "@stripe/stripe-js": "^1.44.1 || ^2.0.0 || ^3.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/@stripe/stripe-js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-2.4.0.tgz",
+      "integrity": "sha512-WFkQx1mbs2b5+7looI9IV1BLa3bIApuN3ehp9FP58xGg7KL9hCHDECgW3BwO9l9L+xBPVAD7Yjn1EhGe6EDTeA=="
+    },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
       "dev": true,
diff --git a/project/GraalVM.scala b/project/GraalVM.scala
index 57a227e9c136..2aab19350539 100644
--- a/project/GraalVM.scala
+++ b/project/GraalVM.scala
@@ -10,7 +10,7 @@ import scala.collection.immutable.Seq
   */
 object GraalVM {
   // Keep in sync with graalMavenPackagesVersion in build.sbt
-  val version: String = "23.1.0"
+  val version: String = "23.1.2"
 
   /** The list of modules that are included in the `component` directory in engine distribution.
     * When invoking the `java` command, these modules need to be put on the module-path.
@@ -105,25 +105,67 @@ object GraalVM {
     *
     * @param graalVersion  the GraalVM version that should be used for
     *                      building this project
-    * @param oldTransition the state transition to be augmented
+    * @param graalPackagesVersion Version of Truffle and GraalVM packages that
+    *                             will be downloaded from Maven
+    * @param javaVersion Version of the Java source code
     * @return an augmented state transition that does all the state changes of
     *         oldTransition but also runs the version checks
     */
-  def addVersionCheck(
-    graalVersion: String
-  )(
-    oldTransition: State => State
-  ): State => State =
-    (state: State) => {
-      val newState = oldTransition(state)
-      val logger   = newState.log
-      if (graalVersion != version) {
-        logger.error("GraalVM version check failed.")
-        throw new IllegalStateException(
-          s"Expected GraalVM version $version, but got $graalVersion. " +
-          s"Version specified in build.sbt and GraalVM.scala must be in sync"
+  def versionCheck(
+    graalVersion: String,
+    graalPackagesVersion: String,
+    javaVersion: String,
+    log: ManagedLogger
+  ): Unit = {
+    if (graalPackagesVersion != version) {
+      log.error(
+        s"Expected GraalVM packages version $version, but got $graalPackagesVersion. " +
+        s"Version specified in build.sbt and GraalVM.scala must be in sync"
+      )
+      throw new IllegalStateException("GraalVM version check failed")
+    }
+    val javaVendor = System.getProperty("java.vendor")
+    if (javaVendor != "GraalVM Community") {
+      log.warn(
+        s"Running on non-GraalVM JVM (The actual java.vendor is $javaVendor). " +
+        s"Expected GraalVM Community java.vendor."
+      )
+    }
+
+    val javaSpecVersion = System.getProperty("java.specification.version")
+    if (javaSpecVersion != javaVersion) {
+      log.error(
+        s"Running on Java version $javaSpecVersion. " +
+        s"Expected Java version $javaVersion."
+      )
+      throw new IllegalStateException("java.specification.vendor check failed")
+    }
+
+    val vmVersion = System.getProperty("java.vm.version")
+    tryParseJavaVMVersion(vmVersion) match {
+      case Some(version) =>
+        if (version != graalVersion) {
+          log.error(
+            s"Running on GraalVM version $version. " +
+            s"Expected GraalVM version $graalVersion."
+          )
+          throw new IllegalStateException("java.vm.version check failed")
+        }
+      case None =>
+        log.error(
+          s"Could not parse GraalVM version from java.vm.version: $vmVersion."
         )
-      }
-      newState
+        throw new IllegalStateException("java.vm.version check failed")
     }
+  }
+
+  private def tryParseJavaVMVersion(
+    version: String
+  ): Option[String] = {
+    if (version.contains('+')) {
+      Some(version.split('+')(0))
+    } else {
+      None
+    }
+  }
 }
diff --git a/project/NativeImage.scala b/project/NativeImage.scala
index 1b2601d78702..292530a58691 100644
--- a/project/NativeImage.scala
+++ b/project/NativeImage.scala
@@ -40,6 +40,8 @@ object NativeImage {
     "ch.qos.logback"
   )
 
+  val NATIVE_IMAGE_ARG_FILE = "native-image-args.txt"
+
   /** Creates a task that builds a native image for the current project.
     *
     * This task must be setup in such a way that the assembly JAR is built
@@ -193,9 +195,7 @@ object NativeImage {
 
       val verboseOpt = if (verbose) Seq("--verbose") else Seq()
 
-      var cmd: Seq[String] =
-        Seq(nativeImagePath) ++
-        verboseOpt ++
+      var args: Seq[String] =
         Seq("-cp", cpStr) ++
         quickBuildOption ++
         debugParameters ++ staticParameters ++ configs ++
@@ -208,29 +208,49 @@ object NativeImage {
         additionalOptions ++
         Seq("-o", artifactName)
 
-      cmd = mainClass match {
+      args = mainClass match {
         case Some(main) =>
-          cmd ++
+          args ++
           Seq(main)
         case None =>
-          cmd ++
+          args ++
           Seq("-jar", pathToJAR.toString)
       }
 
+      val targetDir = (Compile / target).value
+      val argFile   = targetDir.toPath.resolve(NATIVE_IMAGE_ARG_FILE)
+      IO.writeLines(argFile.toFile, args, append = false)
+
       val pathParts = pathExts ++ Option(System.getenv("PATH")).toSeq
       val newPath   = pathParts.mkString(File.pathSeparator)
 
+      val cmd =
+        Seq(nativeImagePath) ++
+        verboseOpt ++
+        Seq("@" + argFile.toAbsolutePath.toString)
+
       log.debug(s"""PATH="$newPath" ${cmd.mkString(" ")}""")
 
       val process =
         Process(cmd, None, "PATH" -> newPath)
 
-      if (process.! != 0) {
-        log.error("Native Image build failed.")
+      // All the output from native-image is redirected into a StringBuilder, and printed
+      // at the end of the build. This mitigates the problem when there are multiple sbt
+      // commands running in parallel and the output is intertwined.
+      val sb = new StringBuilder
+      val processLogger = ProcessLogger(str => {
+        sb.append(str + System.lineSeparator())
+      })
+      log.info(
+        s"Started building $artifactName native image. The output is captured."
+      )
+      val retCode = process.!(processLogger)
+      if (retCode != 0) {
+        log.error("Native Image build failed, with output: ")
+        println(sb.toString())
         throw new RuntimeException("Native Image build failed")
       }
-
-      log.info("Native Image build successful.")
+      log.info(s"$artifactName native image build successful.")
     }
     .dependsOn(Compile / compile)
 
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/BigIntegerBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/BigIntegerBuilder.java
index 96a784dbb629..7d4495c90181 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/BigIntegerBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/BigIntegerBuilder.java
@@ -113,7 +113,7 @@ public void appendBulkStorage(Storage<?> storage) {
       if (storage instanceof AbstractLongStorage longStorage) {
         int n = longStorage.size();
         for (int i = 0; i < n; i++) {
-          if (storage.isNa(i)) {
+          if (storage.isNothing(i)) {
             data[currentSize++] = null;
           } else {
             long item = longStorage.getItem(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/BoolBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/BoolBuilder.java
index a13585f78171..a92fe3751641 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/BoolBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/BoolBuilder.java
@@ -11,23 +11,23 @@
 /** A builder for boolean columns. */
 public class BoolBuilder extends TypedBuilder {
   private final BitSet vals;
-  private final BitSet isNa;
+  private final BitSet isNothing;
   int size = 0;
 
   public BoolBuilder() {
     vals = new BitSet();
-    isNa = new BitSet();
+    isNothing = new BitSet();
   }
 
   public BoolBuilder(int capacity) {
     vals = new BitSet(capacity);
-    isNa = new BitSet(capacity);
+    isNothing = new BitSet(capacity);
   }
 
   @Override
   public void appendNoGrow(Object o) {
     if (o == null) {
-      isNa.set(size);
+      isNothing.set(size);
     } else {
       if (o instanceof Boolean b) {
         if (b) {
@@ -64,7 +64,7 @@ public void appendBoolean(boolean data) {
 
   @Override
   public void appendNulls(int count) {
-    isNa.set(size, size + count);
+    isNothing.set(size, size + count);
     size += count;
   }
 
@@ -73,7 +73,7 @@ public void appendBulkStorage(Storage<?> storage) {
     if (storage.getType().equals(getType())) {
       if (storage instanceof BoolStorage boolStorage) {
         BitSets.copy(boolStorage.getValues(), vals, size, boolStorage.size());
-        BitSets.copy(boolStorage.getIsMissing(), isNa, size, boolStorage.size());
+        BitSets.copy(boolStorage.getIsNothingMap(), isNothing, size, boolStorage.size());
         size += boolStorage.size();
       } else {
         throw new IllegalStateException(
@@ -88,7 +88,7 @@ public void appendBulkStorage(Storage<?> storage) {
 
   @Override
   public Storage<Boolean> seal() {
-    return new BoolStorage(vals, isNa, size, false);
+    return new BoolStorage(vals, isNothing, size, false);
   }
 
   @Override
@@ -99,7 +99,7 @@ public int getCurrentSize() {
   @Override
   public void retypeToMixed(Object[] items) {
     for (int i = 0; i < size; i++) {
-      if (isNa.get(i)) {
+      if (isNothing.get(i)) {
         items[i] = null;
       } else {
         items[i] = vals.get(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/DoubleBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/DoubleBuilder.java
index 3c2bf8097308..f915ab4dcb74 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/DoubleBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/DoubleBuilder.java
@@ -23,8 +23,8 @@
 /** A builder for floating point columns. */
 public class DoubleBuilder extends NumericBuilder {
   DoubleBuilder(
-      BitSet isMissing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
-    super(isMissing, data, currentSize);
+      BitSet isNothing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
+    super(isNothing, data, currentSize);
     precisionLossAggregator = new PrecisionLossAggregator(problemAggregator);
   }
 
@@ -55,7 +55,7 @@ public StorageType getType() {
   @Override
   public void appendNoGrow(Object o) {
     if (o == null) {
-      isMissing.set(currentSize++);
+      isNothing.set(currentSize++);
     } else if (NumericConverter.isFloatLike(o)) {
       double value = NumericConverter.coerceToDouble(o);
       data[currentSize++] = Double.doubleToRawLongBits(value);
@@ -83,7 +83,7 @@ public void appendBulkStorage(Storage<?> storage) {
         int n = doubleStorage.size();
         ensureFreeSpaceFor(n);
         System.arraycopy(doubleStorage.getRawData(), 0, data, currentSize, n);
-        BitSets.copy(doubleStorage.getIsMissing(), isMissing, currentSize, n);
+        BitSets.copy(doubleStorage.getIsNothingMap(), isNothing, currentSize, n);
         currentSize += n;
       } else {
         throw new IllegalStateException(
@@ -94,7 +94,7 @@ public void appendBulkStorage(Storage<?> storage) {
     } else if (storage.getType() instanceof IntegerType) {
       if (storage instanceof AbstractLongStorage longStorage) {
         int n = longStorage.size();
-        BitSets.copy(longStorage.getIsMissing(), isMissing, currentSize, n);
+        BitSets.copy(longStorage.getIsNothingMap(), isNothing, currentSize, n);
         for (int i = 0; i < n; i++) {
           long item = longStorage.getItem(i);
           double converted = convertIntegerToDouble(item);
@@ -112,7 +112,7 @@ public void appendBulkStorage(Storage<?> storage) {
         for (int i = 0; i < n; i++) {
           BigInteger item = bigIntegerStorage.getItem(i);
           if (item == null) {
-            isMissing.set(currentSize++);
+            isNothing.set(currentSize++);
           } else {
             double converted = convertBigIntegerToDouble(item);
             data[currentSize++] = Double.doubleToRawLongBits(converted);
@@ -128,8 +128,8 @@ public void appendBulkStorage(Storage<?> storage) {
       if (storage instanceof BoolStorage boolStorage) {
         int n = boolStorage.size();
         for (int i = 0; i < n; i++) {
-          if (boolStorage.isNa(i)) {
-            isMissing.set(currentSize++);
+          if (boolStorage.isNothing(i)) {
+            isNothing.set(currentSize++);
           } else {
             double x = ToFloatStorageConverter.booleanAsDouble(boolStorage.getItem(i));
             data[currentSize++] = Double.doubleToRawLongBits(x);
@@ -183,7 +183,7 @@ public void appendBigInteger(BigInteger integer) {
 
   @Override
   public Storage<Double> seal() {
-    return new DoubleStorage(data, currentSize, isMissing);
+    return new DoubleStorage(data, currentSize, isNothing);
   }
 
   /**
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferringDoubleBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferringDoubleBuilder.java
index 44758a03c19b..55977439ed28 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferringDoubleBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/InferringDoubleBuilder.java
@@ -19,11 +19,11 @@ static InferringDoubleBuilder retypeFromLongBuilder(LongBuilder longBuilder) {
     int currentSize = longBuilder.currentSize;
     InferringDoubleBuilder newBuilder =
         new InferringDoubleBuilder(
-            longBuilder.isMissing, longBuilder.data, currentSize, longBuilder.problemAggregator);
+            longBuilder.isNothing, longBuilder.data, currentSize, longBuilder.problemAggregator);
 
     // Invalidate the old builder.
     longBuilder.data = null;
-    longBuilder.isMissing = null;
+    longBuilder.isNothing = null;
     longBuilder.currentSize = -1;
 
     // Assume all longs will be compacted.
@@ -31,7 +31,7 @@ static InferringDoubleBuilder retypeFromLongBuilder(LongBuilder longBuilder) {
 
     // Translate the data in-place to avoid unnecessary allocations.
     for (int i = 0; i < currentSize; i++) {
-      if (!newBuilder.isMissing.get(i)) {
+      if (!newBuilder.isNothing.get(i)) {
         long currentIntegerValue = newBuilder.data[i];
         double convertedFloatValue = (double) currentIntegerValue;
         boolean isLossy = currentIntegerValue != (long) convertedFloatValue;
@@ -52,8 +52,8 @@ static InferringDoubleBuilder retypeFromLongBuilder(LongBuilder longBuilder) {
   }
 
   InferringDoubleBuilder(
-      BitSet isMissing, long[] doubleData, int currentSize, ProblemAggregator problemAggregator) {
-    super(isMissing, doubleData, currentSize, problemAggregator);
+      BitSet isNothing, long[] doubleData, int currentSize, ProblemAggregator problemAggregator) {
+    super(isNothing, doubleData, currentSize, problemAggregator);
     rawData = null;
     isLongCompactedAsDouble = new BitSet();
   }
@@ -81,7 +81,7 @@ static InferringDoubleBuilder retypeFromLongBuilder(LongBuilder longBuilder) {
   public void retypeToMixed(Object[] items) {
     int rawN = rawData == null ? 0 : rawData.length;
     for (int i = 0; i < currentSize; i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         items[i] = null;
       } else {
         if (isLongCompactedAsDouble.get(i)) {
@@ -157,7 +157,7 @@ public void appendBigInteger(BigInteger integer) {
   @Override
   public void appendNoGrow(Object o) {
     if (o == null) {
-      isMissing.set(currentSize++);
+      isNothing.set(currentSize++);
     } else if (NumericConverter.isFloatLike(o)) {
       double value = NumericConverter.coerceToDouble(o);
       data[currentSize++] = Double.doubleToRawLongBits(value);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilder.java
index 65d0cece24f4..e56e4b86722b 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilder.java
@@ -21,25 +21,25 @@ public abstract class LongBuilder extends NumericBuilder {
   protected final ProblemAggregator problemAggregator;
 
   protected LongBuilder(
-      BitSet isMissing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
-    super(isMissing, data, currentSize);
+      BitSet isNothing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
+    super(isNothing, data, currentSize);
     this.problemAggregator = problemAggregator;
   }
 
   static LongBuilder make(int initialSize, IntegerType type, ProblemAggregator problemAggregator) {
-    BitSet isMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     long[] data = new long[initialSize];
     if (type.equals(IntegerType.INT_64)) {
-      return new LongBuilderUnchecked(isMissing, data, 0, problemAggregator);
+      return new LongBuilderUnchecked(isNothing, data, 0, problemAggregator);
     } else {
-      return new LongBuilderChecked(isMissing, data, 0, type, problemAggregator);
+      return new LongBuilderChecked(isNothing, data, 0, type, problemAggregator);
     }
   }
 
   @Override
   public void retypeToMixed(Object[] items) {
     for (int i = 0; i < currentSize; i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         items[i] = null;
       } else {
         items[i] = data[i];
@@ -80,15 +80,15 @@ public void appendBulkStorage(Storage<?> storage) {
       int n = longStorage.size();
       ensureFreeSpaceFor(n);
       System.arraycopy(longStorage.getRawData(), 0, data, currentSize, n);
-      BitSets.copy(longStorage.getIsMissing(), isMissing, currentSize, n);
+      BitSets.copy(longStorage.getIsNothingMap(), isNothing, currentSize, n);
       currentSize += n;
     } else if (storage.getType() instanceof IntegerType otherType && getType().fits(otherType)) {
       if (storage instanceof AbstractLongStorage longStorage) {
         int n = longStorage.size();
         ensureFreeSpaceFor(n);
         for (int i = 0; i < n; i++) {
-          if (longStorage.isNa(i)) {
-            isMissing.set(currentSize++);
+          if (longStorage.isNothing(i)) {
+            isNothing.set(currentSize++);
           } else {
             appendLongNoGrow(longStorage.getItem(i));
           }
@@ -103,8 +103,8 @@ public void appendBulkStorage(Storage<?> storage) {
       if (storage instanceof BoolStorage boolStorage) {
         int n = boolStorage.size();
         for (int i = 0; i < n; i++) {
-          if (boolStorage.isNa(i)) {
-            isMissing.set(currentSize++);
+          if (boolStorage.isNothing(i)) {
+            isNothing.set(currentSize++);
           } else {
             data[currentSize++] = ToIntegerStorageConverter.booleanAsLong(boolStorage.getItem(i));
           }
@@ -147,6 +147,6 @@ public void appendLongUnchecked(long data) {
 
   @Override
   public Storage<Long> seal() {
-    return new LongStorage(data, currentSize, isMissing, getType());
+    return new LongStorage(data, currentSize, isNothing, getType());
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderChecked.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderChecked.java
index 10129429f757..47ac9751c73f 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderChecked.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderChecked.java
@@ -13,12 +13,12 @@ public class LongBuilderChecked extends LongBuilder {
   private final CastProblemAggregator castProblemAggregator;
 
   protected LongBuilderChecked(
-      BitSet isMissing,
+      BitSet isNothing,
       long[] data,
       int currentSize,
       IntegerType type,
       ProblemAggregator problemAggregator) {
-    super(isMissing, data, currentSize, problemAggregator);
+    super(isNothing, data, currentSize, problemAggregator);
     this.type = type;
 
     // Currently we have no correlation with column name, and it may not be necessary for now.
@@ -31,7 +31,7 @@ protected LongBuilderChecked(
   @Override
   public void appendNoGrow(Object o) {
     if (o == null) {
-      isMissing.set(currentSize++);
+      isNothing.set(currentSize++);
     } else {
       Long x = NumericConverter.tryConvertingToLong(o);
       if (x != null) {
@@ -52,7 +52,7 @@ public void appendLongNoGrow(long x) {
     if (type.fits(x)) {
       data[currentSize++] = x;
     } else {
-      isMissing.set(currentSize++);
+      isNothing.set(currentSize++);
       castProblemAggregator.reportNumberOutOfRange(x);
     }
   }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderUnchecked.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderUnchecked.java
index c2d315fa42cd..b899eb283de2 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderUnchecked.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/LongBuilderUnchecked.java
@@ -12,14 +12,14 @@
  */
 public class LongBuilderUnchecked extends LongBuilder {
   protected LongBuilderUnchecked(
-      BitSet isMissing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
-    super(isMissing, data, currentSize, problemAggregator);
+      BitSet isNothing, long[] data, int currentSize, ProblemAggregator problemAggregator) {
+    super(isNothing, data, currentSize, problemAggregator);
   }
 
   @Override
   public void appendNoGrow(Object o) {
     if (o == null) {
-      isMissing.set(currentSize++);
+      isNothing.set(currentSize++);
     } else {
       Long x = NumericConverter.tryConvertingToLong(o);
       if (x != null) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/builder/NumericBuilder.java b/std-bits/table/src/main/java/org/enso/table/data/column/builder/NumericBuilder.java
index a2527cb8b15c..a2bbacedf7ac 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/builder/NumericBuilder.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/builder/NumericBuilder.java
@@ -7,12 +7,12 @@
 
 /** A common base for numeric builders. */
 public abstract class NumericBuilder extends TypedBuilder {
-  protected BitSet isMissing;
+  protected BitSet isNothing;
   protected long[] data;
   protected int currentSize;
 
-  NumericBuilder(BitSet isMissing, long[] data, int currentSize) {
-    this.isMissing = isMissing;
+  NumericBuilder(BitSet isNothing, long[] data, int currentSize) {
+    this.isNothing = isNothing;
     this.data = data;
     this.currentSize = currentSize;
   }
@@ -38,7 +38,7 @@ public static LongBuilder createLongBuilder(
 
   @Override
   public void appendNulls(int count) {
-    isMissing.set(currentSize, currentSize + count);
+    isNothing.set(currentSize, currentSize + count);
     currentSize += count;
   }
 
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/CountNothing.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/CountNothing.java
new file mode 100644
index 000000000000..f1f4e064d5b7
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/CountNothing.java
@@ -0,0 +1,64 @@
+package org.enso.table.data.column.operation;
+
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.ColumnStorageWithNothingMap;
+import org.enso.table.data.table.Column;
+import org.graalvm.polyglot.Context;
+
+/** An operation for counting the number of Nothing values in a Column. */
+public class CountNothing {
+  /** Counts the number of Nothing values in the given column. */
+  public static long apply(Column column) {
+    ColumnStorage storage = column.getStorage();
+    return applyToStorage(storage);
+  }
+
+  /** Counts the number of Nothing values in the given storage. */
+  public static long applyToStorage(ColumnStorage storage) {
+    if (storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      return withNothingMap.getIsNothingMap().cardinality();
+    }
+
+    Context context = Context.getCurrent();
+    long count = 0;
+    for (long i = 0; i < storage.getSize(); i++) {
+      if (storage.isNothing(i)) {
+        count += 1;
+      }
+      context.safepoint();
+    }
+    return count;
+  }
+
+  /** Returns true if any value in the storage is Nothing. */
+  public static boolean anyNothing(ColumnStorage storage) {
+    if (storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      return !withNothingMap.getIsNothingMap().isEmpty();
+    }
+
+    Context context = Context.getCurrent();
+    for (long i = 0; i < storage.getSize(); i++) {
+      if (storage.isNothing(i)) {
+        return true;
+      }
+      context.safepoint();
+    }
+    return false;
+  }
+
+  /** Returns true if all values in the storage are Nothing. */
+  public static boolean allNothing(ColumnStorage storage) {
+    if (storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      return withNothingMap.getIsNothingMap().nextClearBit(0) >= storage.getSize();
+    }
+
+    Context context = Context.getCurrent();
+    for (long i = 0; i < storage.getSize(); i++) {
+      if (!storage.isNothing(i)) {
+        return false;
+      }
+      context.safepoint();
+    }
+    return true;
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/UnaryOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/UnaryOperation.java
new file mode 100644
index 000000000000..3205ee6c2e0a
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/UnaryOperation.java
@@ -0,0 +1,178 @@
+package org.enso.table.data.column.operation;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.LongConsumer;
+import org.enso.base.polyglot.Polyglot_Utils;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnBooleanStorage;
+import org.enso.table.data.column.storage.ColumnDoubleStorage;
+import org.enso.table.data.column.storage.ColumnLongStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.ColumnStorageWithInferredStorage;
+import org.enso.table.data.column.storage.Storage;
+import org.enso.table.data.column.storage.type.StorageType;
+import org.enso.table.data.table.Column;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+
+/** A UnaryOperation is an operation that can be applied to a single ColumnStorage. */
+public interface UnaryOperation {
+  /**
+   * Applies the operation to the given Column. If an unsupported by the operation returns null
+   *
+   * @param column the column to apply the operation to.
+   * @param operation the operation to apply.
+   * @param newColumnName the name of the new column.
+   * @param problemAggregator the problem aggregator to report problems to.
+   */
+  static Column apply(
+      Column column,
+      UnaryOperation operation,
+      String newColumnName,
+      MapOperationProblemAggregator problemAggregator) {
+    ColumnStorage storage = column.getStorage();
+
+    // If the storage has an inferred storage (e.g. a Mixed column) and the first level can't do get
+    // an inferred storage.
+    if (!operation.canApply(storage)
+        && storage instanceof ColumnStorageWithInferredStorage withInferredStorage) {
+      var inferredStorage = withInferredStorage.getInferredStorage();
+      if (inferredStorage != null && operation.canApply(inferredStorage)) {
+        storage = inferredStorage;
+      }
+    }
+
+    if (!operation.canApply(storage)) {
+      return null;
+    }
+
+    var result = operation.apply(column.getStorage(), problemAggregator);
+    return new Column(newColumnName, (Storage<?>) result);
+  }
+
+  /**
+   * Applies a function to every row in a column.
+   *
+   * @param column the column to apply the operation to.
+   * @param function the function to apply.
+   * @param nothingUnchanged whether to keep nothing values unchanged.
+   * @param expectedResultType the expected type of the result.
+   * @param newColumnName the name of the new column.
+   * @param problemAggregator the problem aggregator to report problems to.
+   */
+  static Column mapFunction(
+      Column column,
+      Function<Object, Value> function,
+      boolean nothingUnchanged,
+      StorageType expectedResultType,
+      String newColumnName,
+      MapOperationProblemAggregator problemAggregator) {
+    Builder storageBuilder =
+        Builder.getForType(expectedResultType, column.getSize(), problemAggregator);
+    applyStorageInner(
+        column.getStorage(),
+        nothingUnchanged,
+        storageBuilder,
+        i -> {
+          Value result = function.apply(column.getStorage().getItemAsObject(i));
+          Object converted = Polyglot_Utils.convertPolyglotValue(result);
+          storageBuilder.appendNoGrow(converted);
+        });
+    return new Column(newColumnName, storageBuilder.seal());
+  }
+
+  /** Gets the name of the Operation. */
+  String getName();
+
+  /** Can the operation be applied to the given Storage? */
+  boolean canApply(ColumnStorage storage);
+
+  /** Applies the operation to the given Storage. */
+  ColumnStorage apply(ColumnStorage storage, MapOperationProblemAggregator problemAggregator);
+
+  private static void applyStorageInner(
+      ColumnStorage columnStorage,
+      boolean nothingUnchanged,
+      Builder builder,
+      LongConsumer callback) {
+    Context context = Context.getCurrent();
+    long size = columnStorage.getSize();
+    for (long i = 0; i < size; i++) {
+      if (nothingUnchanged && columnStorage.isNothing(i)) {
+        builder.appendNulls(1);
+      } else {
+        callback.accept(i);
+      }
+      context.safepoint();
+    }
+  }
+
+  /** Applies the operation to the given Storage. */
+  static void applyOverObjectStorage(
+      ColumnStorage objectStorage,
+      boolean nothingUnchanged,
+      Builder builder,
+      Consumer<Object> function) {
+    applyStorageInner(
+        objectStorage,
+        nothingUnchanged,
+        builder,
+        i -> function.accept(objectStorage.getItemAsObject(i)));
+  }
+
+  /** Applies the operation to the given Boolean Storage. */
+  static void applyOverBooleanStorage(
+      ColumnBooleanStorage booleanStorage,
+      boolean nothingUnchanged,
+      Builder builder,
+      BooleanRowApplier function) {
+    applyStorageInner(
+        booleanStorage,
+        nothingUnchanged,
+        builder,
+        i -> function.accept(booleanStorage.isNothing(i), booleanStorage.get(i)));
+  }
+
+  @FunctionalInterface
+  interface BooleanRowApplier {
+    void accept(boolean isNothing, boolean value);
+  }
+
+  /** Applies the operation to the given Long Storage. */
+  static void applyOverLongStorage(
+      ColumnLongStorage longStorage,
+      boolean nothingUnchanged,
+      Builder builder,
+      LongRowApplier function) {
+    applyStorageInner(
+        longStorage,
+        nothingUnchanged,
+        builder,
+        i -> function.accept(longStorage.isNothing(i), longStorage.get(i)));
+  }
+
+  @FunctionalInterface
+  interface LongRowApplier {
+    void accept(boolean isNothing, long value);
+  }
+
+  /** Applies the operation to the given Double Storage. */
+  static void applyOverDoubleStorage(
+      ColumnDoubleStorage doubleStorage,
+      boolean nothingUnchanged,
+      Builder builder,
+      DoubleRowApplier function) {
+    applyStorageInner(
+        doubleStorage,
+        nothingUnchanged,
+        builder,
+        i -> function.accept(doubleStorage.isNothing(i), doubleStorage.get(i)));
+  }
+
+  @FunctionalInterface
+  interface DoubleRowApplier {
+    void accept(boolean isNothing, double value);
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java
index bc035013eebb..7f489254dccd 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToBigIntegerConverter.java
@@ -34,7 +34,7 @@ private Storage<BigInteger> convertDoubleStorage(
     int n = doubleStorage.size();
     BigIntegerBuilder builder = new BigIntegerBuilder(n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (doubleStorage.isNa(i)) {
+      if (doubleStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         double x = doubleStorage.getItemAsDouble(i);
@@ -50,7 +50,7 @@ private Storage<BigInteger> convertLongStorage(
     int n = longStorage.size();
     BigIntegerBuilder builder = new BigIntegerBuilder(n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (longStorage.isNa(i)) {
+      if (longStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         long x = longStorage.getItem(i);
@@ -66,7 +66,7 @@ private Storage<BigInteger> convertBoolStorage(
     int n = boolStorage.size();
     BigIntegerBuilder builder = new BigIntegerBuilder(n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (boolStorage.isNa(i)) {
+      if (boolStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         boolean x = boolStorage.getItem(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java
index 52fdcaa96d2f..13102e4cff6c 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToFloatStorageConverter.java
@@ -75,7 +75,7 @@ private Storage<Double> convertLongStorage(
     int n = longStorage.size();
     DoubleBuilder builder = NumericBuilder.createDoubleBuilder(n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (longStorage.isNa(i)) {
+      if (longStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         long value = longStorage.getItem(i);
@@ -91,7 +91,7 @@ private Storage<Double> convertBoolStorage(
     int n = boolStorage.size();
     DoubleBuilder builder = NumericBuilder.createDoubleBuilder(n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (boolStorage.isNa(i)) {
+      if (boolStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         boolean value = boolStorage.getItem(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java
index d9606e0ee82c..8a98b3ef6f7c 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToIntegerStorageConverter.java
@@ -97,7 +97,7 @@ private Storage<Long> convertBoolStorage(
     int n = boolStorage.size();
     LongBuilder builder = NumericBuilder.createLongBuilder(n, targetType, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (boolStorage.isNa(i)) {
+      if (boolStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         boolean value = boolStorage.getItem(i);
@@ -116,7 +116,7 @@ private Storage<Long> convertDoubleStorage(
     int n = doubleStorage.size();
     LongBuilder builder = NumericBuilder.createLongBuilder(n, targetType, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (doubleStorage.isNa(i)) {
+      if (doubleStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         double value = doubleStorage.getItemAsDouble(i);
@@ -147,14 +147,14 @@ private Storage<Long> convertLongStorage(
       Context context = Context.getCurrent();
       int n = longStorage.size();
       long[] data = new long[n];
-      BitSet isMissing = BitSets.makeDuplicate(longStorage.getIsMissing());
+      BitSet isNothing = BitSets.makeDuplicate(longStorage.getIsNothingMap());
       for (int i = 0; i < n; i++) {
-        if (!isMissing.get(i)) {
+        if (!isNothing.get(i)) {
           long value = longStorage.getItem(i);
           if (targetType.fits(value)) {
             data[i] = value;
           } else {
-            isMissing.set(i);
+            isNothing.set(i);
             problemAggregator.reportNumberOutOfRange(value);
           }
         }
@@ -162,7 +162,7 @@ private Storage<Long> convertLongStorage(
         context.safepoint();
       }
 
-      return new LongStorage(data, n, isMissing, targetType);
+      return new LongStorage(data, n, isNothing, targetType);
     }
   }
 
@@ -171,22 +171,22 @@ private Storage<Long> convertBigIntegerStorage(
     Context context = Context.getCurrent();
     int n = storage.size();
     long[] data = new long[n];
-    BitSet isMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
       BigInteger value = storage.getItemBoxed(i);
       if (value == null) {
-        isMissing.set(i);
+        isNothing.set(i);
       } else if (targetType.fits(value)) {
         data[i] = value.longValue();
       } else {
-        isMissing.set(i);
+        isNothing.set(i);
         problemAggregator.reportNumberOutOfRange(value);
       }
 
       context.safepoint();
     }
 
-    return new LongStorage(data, n, isMissing, targetType);
+    return new LongStorage(data, n, isNothing, targetType);
   }
 
   public static long booleanAsLong(boolean value) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java
index a75604605e9e..3c1afce68cca 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/cast/ToTextStorageConverter.java
@@ -101,7 +101,7 @@ private Storage<String> castLongStorage(
     Context context = Context.getCurrent();
     StringBuilder builder = new StringBuilder(longStorage.size(), targetType);
     for (int i = 0; i < longStorage.size(); i++) {
-      if (longStorage.isNa(i)) {
+      if (longStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         long value = longStorage.getItem(i);
@@ -119,7 +119,7 @@ private Storage<String> castBoolStorage(
     Context context = Context.getCurrent();
     StringBuilder builder = new StringBuilder(boolStorage.size(), targetType);
     for (int i = 0; i < boolStorage.size(); i++) {
-      if (boolStorage.isNa(i)) {
+      if (boolStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         boolean value = boolStorage.getItem(i);
@@ -137,7 +137,7 @@ private Storage<String> castDoubleStorage(
     Context context = Context.getCurrent();
     StringBuilder builder = new StringBuilder(doubleStorage.size(), targetType);
     for (int i = 0; i < doubleStorage.size(); i++) {
-      if (doubleStorage.isNa(i)) {
+      if (doubleStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         double value = doubleStorage.getItemAsDouble(i);
@@ -155,7 +155,7 @@ private <T> Storage<String> castDateTimeStorage(
     Context context = Context.getCurrent();
     StringBuilder builder = new StringBuilder(storage.size(), targetType);
     for (int i = 0; i < storage.size(); i++) {
-      if (storage.isNa(i)) {
+      if (storage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         T value = storage.getItemBoxed(i);
@@ -192,7 +192,7 @@ private Storage<String> adaptStringStorage(
     Context context = Context.getCurrent();
     StringBuilder builder = new StringBuilder(stringStorage.size(), targetType);
     for (int i = 0; i < stringStorage.size(); i++) {
-      if (stringStorage.isNa(i)) {
+      if (stringStorage.isNothing(i)) {
         builder.appendNulls(1);
       } else {
         String value = stringStorage.getItem(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java
index f06d727ab88c..a25102d4df05 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/GenericBinaryObjectMapOperation.java
@@ -42,7 +42,7 @@ public Storage<?> runBinaryMap(
       Builder builder = createOutputBuilder(n);
       Context context = Context.getCurrent();
       for (int i = 0; i < n; i++) {
-        if (storage.isNa(i)) {
+        if (storage.isNothing(i)) {
           builder.appendNulls(1);
         } else {
           OutputType result = run(storage.getItemBoxed(i), casted);
@@ -67,7 +67,7 @@ public Storage<?> runZip(
       Builder builder = createOutputBuilder(n);
       Context context = Context.getCurrent();
       for (int i = 0; i < n; ++i) {
-        if (storage.isNa(i) || otherCasted.isNa(i)) {
+        if (storage.isNothing(i) || otherCasted.isNothing(i)) {
           builder.appendNulls(1);
         } else {
           InputType left = storage.getItemBoxed(i);
@@ -85,7 +85,7 @@ public Storage<?> runZip(
       Builder builder = createOutputBuilder(n);
       Context context = Context.getCurrent();
       for (int i = 0; i < n; ++i) {
-        if (storage.isNa(i) || arg.isNa(i)) {
+        if (storage.isNothing(i) || arg.isNothing(i)) {
           builder.appendNulls(1);
         } else {
           InputType left = storage.getItemBoxed(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/MapOperationStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/MapOperationStorage.java
index ae20ce67b87d..67c9b05ad31d 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/MapOperationStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/MapOperationStorage.java
@@ -11,37 +11,9 @@
  * @param <S> the storage type handled by these operations.
  */
 public class MapOperationStorage<T, S extends Storage<? super T>> {
-  private final Map<String, UnaryMapOperation<T, S>> unaryOps = new HashMap<>();
   private final Map<String, BinaryMapOperation<T, S>> binaryOps = new HashMap<>();
   private final Map<String, TernaryMapOperation<T, S>> ternaryOps = new HashMap<>();
 
-  /**
-   * Checks if a unary operation is supported by this set.
-   *
-   * @param n the operation name
-   * @return whether the operation is supported
-   */
-  public boolean isSupportedUnary(String n) {
-    return n != null && unaryOps.get(n) != null;
-  }
-
-  /**
-   * Runs the specified unary operation in map node.
-   *
-   * @param n the operation name
-   * @param storage the storage to run operation on
-   * @param problemAggregator the aggregator allowing to report computation problems
-   * @return the result of running the operation
-   */
-  public Storage<?> runUnaryMap(
-      String n, S storage, MapOperationProblemAggregator problemAggregator) {
-    if (!isSupportedUnary(n)) {
-      throw new IllegalStateException(
-          "Requested vectorized unary operation " + n + ", but no such operation is known.");
-    }
-    return unaryOps.get(n).runUnaryMap(storage, problemAggregator);
-  }
-
   /**
    * Checks if a binary operation is supported by this set.
    *
@@ -129,17 +101,6 @@ public Storage<?> runZip(
     return operation.runZip(storage, arg, problemAggregator);
   }
 
-  /**
-   * Adds a new operation to this set.
-   *
-   * @param op the operation to add
-   * @return this operation set
-   */
-  public MapOperationStorage<T, S> add(UnaryMapOperation<T, S> op) {
-    unaryOps.put(op.getName(), op);
-    return this;
-  }
-
   /**
    * Adds a new operation to this set.
    *
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java
index 9409ca1d7862..1c33277d1376 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/SpecializedIsInOp.java
@@ -55,23 +55,22 @@ public Storage<?> runMap(S storage, List<?> arg) {
     Context context = Context.getCurrent();
     CompactRepresentation<T> compactRepresentation = prepareList(arg);
     BitSet newVals = new BitSet();
-    BitSet missing = new BitSet();
-    if (arg.size() > 0) {
+    BitSet isNothing = new BitSet();
+    if (!arg.isEmpty()) {
       for (int i = 0; i < storage.size(); i++) {
-        if (storage.isNa(i)) {
-          missing.set(i);
+        if (storage.isNothing(i)) {
+          isNothing.set(i);
         } else if (compactRepresentation.coercedValues.contains(storage.getItemBoxed(i))) {
           newVals.set(i);
         } else if (compactRepresentation.hasNulls) {
-          missing.set(i);
-        } else {
-          // Leave as default=false
+          isNothing.set(i);
         }
+        // Otherwise leave as default=false
 
         context.safepoint();
       }
     }
-    return new BoolStorage(newVals, missing, storage.size(), false);
+    return new BoolStorage(newVals, isNothing, storage.size(), false);
   }
 
   @Override
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/UnaryMapOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/UnaryMapOperation.java
deleted file mode 100644
index 608bbedd4e09..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/UnaryMapOperation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.enso.table.data.column.operation.map;
-
-import org.enso.table.data.column.storage.Storage;
-
-/**
- * A unary map-like operation.
- *
- * @param <I> the supported storage type
- */
-public abstract class UnaryMapOperation<T, I extends Storage<? super T>> {
-  private final String name;
-
-  public UnaryMapOperation(String name) {
-    this.name = name;
-  }
-
-  /** Run the unary operation. */
-  protected abstract Storage<?> runUnaryMap(
-      I storage, MapOperationProblemAggregator problemAggregator);
-
-  /**
-   * @return the name of this operation
-   */
-  public String getName() {
-    return name;
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/BooleanIsInOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/BooleanIsInOp.java
index b19f687e2c8a..80a9cd7b4797 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/BooleanIsInOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/BooleanIsInOp.java
@@ -62,28 +62,32 @@ public Storage<?> runZip(
   private BoolStorage run(BoolStorage storage, boolean hadNull, boolean hadTrue, boolean hadFalse) {
     int size = storage.size();
     ImmutableBitSet values = new ImmutableBitSet(storage.getValues(), size);
-    ImmutableBitSet missing = new ImmutableBitSet(storage.getIsMissing(), size);
+    ImmutableBitSet isNothing = new ImmutableBitSet(storage.getIsNothingMap(), size);
     boolean negated = storage.isNegated();
 
     ImmutableBitSet newValues;
-    ImmutableBitSet newMissing;
+    ImmutableBitSet newIsNothing;
 
     if (hadTrue && !hadFalse) {
-      newValues = storage.isNegated() ? missing.notAndNot(values) : missing.notAnd(values);
-      newMissing =
-          hadNull ? (storage.isNegated() ? missing.or(values) : missing.orNot(values)) : missing;
+      newValues = storage.isNegated() ? isNothing.notAndNot(values) : isNothing.notAnd(values);
+      newIsNothing =
+          hadNull
+              ? (storage.isNegated() ? isNothing.or(values) : isNothing.orNot(values))
+              : isNothing;
     } else if (!hadTrue && hadFalse) {
-      newValues = storage.isNegated() ? missing.notAnd(values) : missing.notAndNot(values);
-      newMissing =
-          hadNull ? (storage.isNegated() ? missing.orNot(values) : missing.or(values)) : missing;
-    } else if (hadTrue && hadFalse) {
-      newValues = missing.not();
-      newMissing = missing;
+      newValues = storage.isNegated() ? isNothing.notAnd(values) : isNothing.notAndNot(values);
+      newIsNothing =
+          hadNull
+              ? (storage.isNegated() ? isNothing.orNot(values) : isNothing.or(values))
+              : isNothing;
+    } else if (hadTrue) {
+      newValues = isNothing.not();
+      newIsNothing = isNothing;
     } else {
       newValues = ImmutableBitSet.allFalse(size);
-      newMissing = hadNull ? ImmutableBitSet.allTrue(size) : ImmutableBitSet.allFalse(size);
+      newIsNothing = hadNull ? ImmutableBitSet.allTrue(size) : ImmutableBitSet.allFalse(size);
     }
 
-    return new BoolStorage(newValues.toBitSet(), newMissing.toBitSet(), size, false);
+    return new BoolStorage(newValues.toBitSet(), newIsNothing.toBitSet(), size, false);
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/DatePartExtractors.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/DatePartExtractors.java
deleted file mode 100644
index 751210c1c927..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/DatePartExtractors.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.enso.table.data.column.operation.map.datetime;
-
-import java.time.temporal.ChronoField;
-import java.time.temporal.IsoFields;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalField;
-import org.enso.table.data.column.operation.map.numeric.GenericUnaryIntegerOp;
-import org.enso.table.data.column.storage.Storage;
-
-public class DatePartExtractors {
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> make_op(String name, TemporalField field) {
-    return new GenericUnaryIntegerOp<>(name) {
-      @Override
-      protected long doGenericOperation(Temporal value) {
-        return value.getLong(field);
-      }
-    };
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> year() {
-    return make_op(Storage.Maps.YEAR, ChronoField.YEAR);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> quarter() {
-    return new GenericUnaryIntegerOp<>(Storage.Maps.QUARTER) {
-      @Override
-      protected long doGenericOperation(Temporal value) {
-        long month = value.get(ChronoField.MONTH_OF_YEAR);
-        return (month - 1) / 3 + 1;
-      }
-    };
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> month() {
-    return make_op(Storage.Maps.MONTH, ChronoField.MONTH_OF_YEAR);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> week() {
-    return make_op(Storage.Maps.WEEK, IsoFields.WEEK_OF_WEEK_BASED_YEAR);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> day() {
-    return make_op(Storage.Maps.DAY, ChronoField.DAY_OF_MONTH);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> hour() {
-    return make_op(Storage.Maps.HOUR, ChronoField.HOUR_OF_DAY);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> minute() {
-    return make_op(Storage.Maps.MINUTE, ChronoField.MINUTE_OF_HOUR);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> second() {
-    return make_op(Storage.Maps.SECOND, ChronoField.SECOND_OF_MINUTE);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> millisecond() {
-    return make_op(Storage.Maps.MILLISECOND, ChronoField.MILLI_OF_SECOND);
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> microsecond() {
-    return new GenericUnaryIntegerOp<>(Storage.Maps.MICROSECOND) {
-      @Override
-      protected long doGenericOperation(Temporal value) {
-        long micros = value.get(ChronoField.MICRO_OF_SECOND);
-        return micros % 1000;
-      }
-    };
-  }
-
-  public static <T extends Temporal, I extends Storage<T>>
-      GenericUnaryIntegerOp<Temporal, T, I> nanosecond() {
-    return new GenericUnaryIntegerOp<>(Storage.Maps.NANOSECOND) {
-      @Override
-      protected long doGenericOperation(Temporal value) {
-        long micros = value.get(ChronoField.NANO_OF_SECOND);
-        return micros % 1000;
-      }
-    };
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleLongMapOpWithSpecialNumericHandling.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleLongMapOpWithSpecialNumericHandling.java
deleted file mode 100644
index 8997ac1d977d..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleLongMapOpWithSpecialNumericHandling.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.enso.table.data.column.operation.map.numeric;
-
-import java.util.BitSet;
-import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
-import org.enso.table.data.column.storage.numeric.DoubleStorage;
-import org.enso.table.data.column.storage.numeric.LongStorage;
-import org.enso.table.data.column.storage.type.IntegerType;
-import org.graalvm.polyglot.Context;
-
-public abstract class DoubleLongMapOpWithSpecialNumericHandling
-    extends UnaryMapOperation<Double, DoubleStorage> {
-  public DoubleLongMapOpWithSpecialNumericHandling(String name) {
-    super(name);
-  }
-
-  protected abstract long doOperation(double a);
-
-  @Override
-  public LongStorage runUnaryMap(
-      DoubleStorage storage, MapOperationProblemAggregator problemAggregator) {
-    Context context = Context.getCurrent();
-    long[] out = new long[storage.size()];
-    BitSet isMissing = new BitSet();
-
-    for (int i = 0; i < storage.size(); i++) {
-      if (!storage.isNa(i)) {
-        double item = storage.getItemAsDouble(i);
-        boolean special = Double.isNaN(item) || Double.isInfinite(item);
-        if (!special) {
-          out[i] = doOperation(item);
-        } else {
-          String msg = "Value is " + item;
-          problemAggregator.reportArithmeticError(msg, i);
-          isMissing.set(i);
-        }
-      } else {
-        isMissing.set(i);
-      }
-
-      context.safepoint();
-    }
-    return new LongStorage(out, storage.size(), isMissing, IntegerType.INT_64);
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleRoundOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleRoundOp.java
index badd717f6af4..28439815b769 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleRoundOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/DoubleRoundOp.java
@@ -39,10 +39,10 @@ public Storage<?> runTernaryMap(
     if (decimalPlaces <= 0) {
       // Return Long storage
       long[] out = new long[storage.size()];
-      BitSet isMissing = new BitSet();
+      BitSet isNothing = new BitSet();
 
       for (int i = 0; i < storage.size(); i++) {
-        if (!storage.isNa(i)) {
+        if (!storage.isNothing(i)) {
           double item = storage.getItemAsDouble(i);
           boolean special = Double.isNaN(item) || Double.isInfinite(item);
           if (!special) {
@@ -50,22 +50,22 @@ public Storage<?> runTernaryMap(
           } else {
             String msg = "Value is " + item;
             problemAggregator.reportArithmeticError(msg, i);
-            isMissing.set(i);
+            isNothing.set(i);
           }
         } else {
-          isMissing.set(i);
+          isNothing.set(i);
         }
 
         context.safepoint();
       }
-      return new LongStorage(out, storage.size(), isMissing, IntegerType.INT_64);
+      return new LongStorage(out, storage.size(), isNothing, IntegerType.INT_64);
     } else {
       // Return double storage.
       DoubleBuilder doubleBuilder =
           NumericBuilder.createDoubleBuilder(storage.size(), problemAggregator);
 
       for (int i = 0; i < storage.size(); i++) {
-        if (!storage.isNa(i)) {
+        if (!storage.isNothing(i)) {
           double item = storage.getItemAsDouble(i);
           boolean special = Double.isNaN(item) || Double.isInfinite(item);
           if (!special) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/GenericUnaryIntegerOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/GenericUnaryIntegerOp.java
deleted file mode 100644
index c591181292dc..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/GenericUnaryIntegerOp.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.enso.table.data.column.operation.map.numeric;
-
-import org.enso.table.data.column.storage.Storage;
-
-public abstract class GenericUnaryIntegerOp<U, T extends U, I extends Storage<T>>
-    extends UnaryIntegerOp<T, I> {
-  public GenericUnaryIntegerOp(String name) {
-    super(name);
-  }
-
-  protected abstract long doGenericOperation(U value);
-
-  @Override
-  protected long doOperation(T value) {
-    return doGenericOperation(value);
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/LongRoundOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/LongRoundOp.java
index 505cd3541a83..6d247b27dbad 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/LongRoundOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/LongRoundOp.java
@@ -45,10 +45,10 @@ public Storage<Long> runTernaryMap(
 
     Context context = Context.getCurrent();
     long[] out = new long[storage.size()];
-    BitSet isMissing = new BitSet();
+    BitSet isNothing = new BitSet();
 
     for (int i = 0; i < storage.size(); i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         long item = storage.getItem(i);
         boolean outOfRange = item < ROUND_MIN_LONG || item > ROUND_MAX_LONG;
         if (!outOfRange) {
@@ -62,16 +62,16 @@ public Storage<Long> runTernaryMap(
                   + " (inclusive), but was "
                   + item;
           problemAggregator.reportIllegalArgumentError(msg, i);
-          isMissing.set(i);
+          isNothing.set(i);
         }
 
       } else {
-        isMissing.set(i);
+        isNothing.set(i);
       }
 
       context.safepoint();
     }
 
-    return new LongStorage(out, storage.size(), isMissing, IntegerType.INT_64);
+    return new LongStorage(out, storage.size(), isNothing, IntegerType.INT_64);
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryIntegerOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryIntegerOp.java
deleted file mode 100644
index b2654807cc46..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryIntegerOp.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.enso.table.data.column.operation.map.numeric;
-
-import java.util.BitSet;
-import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
-import org.enso.table.data.column.storage.Storage;
-import org.enso.table.data.column.storage.numeric.LongStorage;
-import org.enso.table.data.column.storage.type.IntegerType;
-import org.graalvm.polyglot.Context;
-
-/** An operation that takes a single argument of some type and returns an integer. */
-public abstract class UnaryIntegerOp<T, I extends Storage<T>> extends UnaryMapOperation<T, I> {
-
-  private static final IntegerType RESULT_TYPE = IntegerType.INT_64;
-
-  public UnaryIntegerOp(String name) {
-    super(name);
-  }
-
-  protected abstract long doOperation(T value);
-
-  @Override
-  protected Storage<?> runUnaryMap(I storage, MapOperationProblemAggregator problemAggregator) {
-    Context context = Context.getCurrent();
-    BitSet newMissing = new BitSet();
-    long[] newVals = new long[storage.size()];
-    for (int i = 0; i < storage.size(); i++) {
-      if (!storage.isNa(i)) {
-        newVals[i] = doOperation(storage.getItemBoxed(i));
-      } else {
-        newMissing.set(i);
-      }
-
-      context.safepoint();
-    }
-
-    return new LongStorage(newVals, newVals.length, newMissing, RESULT_TYPE);
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryLongToLongOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryLongToLongOp.java
deleted file mode 100644
index 741122a549ee..000000000000
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/UnaryLongToLongOp.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.enso.table.data.column.operation.map.numeric;
-
-import java.util.BitSet;
-import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
-import org.enso.table.data.column.storage.numeric.AbstractLongStorage;
-import org.enso.table.data.column.storage.numeric.LongStorage;
-import org.graalvm.polyglot.Context;
-
-/** An operation that takes a single double argument and returns a long. */
-public abstract class UnaryLongToLongOp extends UnaryMapOperation<Long, AbstractLongStorage> {
-
-  public UnaryLongToLongOp(String name) {
-    super(name);
-  }
-
-  protected abstract long doOperation(long value);
-
-  @Override
-  protected LongStorage runUnaryMap(
-      AbstractLongStorage storage, MapOperationProblemAggregator problemAggregator) {
-    Context context = Context.getCurrent();
-    BitSet newMissing = new BitSet();
-    long[] newVals = new long[storage.size()];
-    for (int i = 0; i < storage.size(); i++) {
-      if (!storage.isNa(i)) {
-        newVals[i] = doOperation(storage.getItem(i));
-      } else {
-        newMissing.set(i);
-      }
-
-      context.safepoint();
-    }
-
-    // TODO is inheriting type ok? it may not be enough!
-    return new LongStorage(newVals, newVals.length, newMissing, storage.getType());
-  }
-}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
index ae03315f549d..ede9667b08e6 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
@@ -122,10 +122,10 @@ protected DoubleStorage runDoubleZip(
     int n = a.size();
     int m = Math.min(a.size(), b.size());
     long[] out = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < m; i++) {
-      if (a.isNa(i) || b.isNa(i)) {
-        newMissing.set(i);
+      if (a.isNothing(i) || b.isNothing(i)) {
+        isNothing.set(i);
       } else {
         double r = doDouble(a.getItemAsDouble(i), b.getItemAsDouble(i), i, problemAggregator);
         out[i] = Double.doubleToRawLongBits(r);
@@ -135,10 +135,10 @@ protected DoubleStorage runDoubleZip(
     }
 
     if (m < n) {
-      newMissing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new DoubleStorage(out, n, newMissing);
+    return new DoubleStorage(out, n, isNothing);
   }
 
   private static Storage<? extends Number> allNullStorageOfSameType(Storage<?> storage) {
@@ -161,10 +161,10 @@ protected DoubleStorage runDoubleMap(
     Context context = Context.getCurrent();
     int n = a.size();
     long[] out = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (a.isNa(i)) {
-        newMissing.set(i);
+      if (a.isNothing(i)) {
+        isNothing.set(i);
       } else {
         double r = doDouble(a.getItemAsDouble(i), bNonNull, i, problemAggregator);
         out[i] = Double.doubleToRawLongBits(r);
@@ -173,7 +173,7 @@ protected DoubleStorage runDoubleMap(
       context.safepoint();
     }
 
-    return new DoubleStorage(out, n, newMissing);
+    return new DoubleStorage(out, n, isNothing);
   }
 
   protected LongStorage runLongZip(
@@ -184,14 +184,14 @@ protected LongStorage runLongZip(
     int n = a.size();
     int m = Math.min(a.size(), b.size());
     long[] out = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < m; i++) {
-      if (a.isNa(i) || b.isNa(i)) {
-        newMissing.set(i);
+      if (a.isNothing(i) || b.isNothing(i)) {
+        isNothing.set(i);
       } else {
         Long r = doLong(a.getItem(i), b.getItem(i), i, problemAggregator);
         if (r == null) {
-          newMissing.set(i);
+          isNothing.set(i);
         } else {
           out[i] = r;
         }
@@ -201,10 +201,10 @@ protected LongStorage runLongZip(
     }
 
     if (m < n) {
-      newMissing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new LongStorage(out, n, newMissing, INTEGER_RESULT_TYPE);
+    return new LongStorage(out, n, isNothing, INTEGER_RESULT_TYPE);
   }
 
   protected LongStorage runLongMap(
@@ -217,14 +217,14 @@ protected LongStorage runLongMap(
     Context context = Context.getCurrent();
     int n = a.size();
     long[] out = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (a.isNa(i)) {
-        newMissing.set(i);
+      if (a.isNothing(i)) {
+        isNothing.set(i);
       } else {
         Long r = doLong(a.getItem(i), bNonNull, i, problemAggregator);
         if (r == null) {
-          newMissing.set(i);
+          isNothing.set(i);
         } else {
           out[i] = r;
         }
@@ -233,7 +233,7 @@ protected LongStorage runLongMap(
       context.safepoint();
     }
 
-    return new LongStorage(out, n, newMissing, INTEGER_RESULT_TYPE);
+    return new LongStorage(out, n, isNothing, INTEGER_RESULT_TYPE);
   }
 
   protected BigIntegerStorage runBigIntegerZip(
@@ -244,24 +244,16 @@ protected BigIntegerStorage runBigIntegerZip(
     int n = a.size();
     int m = Math.min(a.size(), b.size());
     BigInteger[] out = new BigInteger[n];
-    BitSet newMissing = new BitSet();
     for (int i = 0; i < m; i++) {
       BigInteger x = a.getItem(i);
       BigInteger y = b.getItem(i);
-      if (x == null || y == null) {
-        newMissing.set(i);
-      } else {
+      if (x != null && y != null) {
         BigInteger r = doBigInteger(x, y, i, problemAggregator);
         out[i] = r;
       }
-
       context.safepoint();
     }
 
-    if (m < n) {
-      newMissing.set(m, n);
-    }
-
     return new BigIntegerStorage(out, n);
   }
 
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java
index 8efe80a86746..fcef5f955574 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/comparisons/NumericComparison.java
@@ -67,13 +67,13 @@ public BoolStorage runBinaryMap(
       return runDoubleMap(lhs, rhs, problemAggregator);
     } else {
       int n = storage.size();
-      BitSet missing = new BitSet();
+      BitSet isNothing = new BitSet();
       BitSet comparisonResults = new BitSet();
       Context context = Context.getCurrent();
       for (int i = 0; i < n; ++i) {
         Object item = storage.getItemBoxed(i);
         if (item == null) {
-          missing.set(i);
+          isNothing.set(i);
         } else {
           boolean r = onOtherType(item, arg);
           if (r) {
@@ -84,7 +84,7 @@ public BoolStorage runBinaryMap(
         context.safepoint();
       }
 
-      return new BoolStorage(comparisonResults, missing, n, false);
+      return new BoolStorage(comparisonResults, isNothing, n, false);
     }
   }
 
@@ -92,10 +92,10 @@ protected BoolStorage runLongMap(
       AbstractLongStorage lhs, long rhs, MapOperationProblemAggregator problemAggregator) {
     int n = lhs.size();
     BitSet comparisonResults = new BitSet();
-    BitSet missing = BitSets.makeDuplicate(lhs.getIsMissing());
+    BitSet isNothing = BitSets.makeDuplicate(lhs.getIsNothingMap());
     Context context = Context.getCurrent();
     for (int i = 0; i < n; ++i) {
-      if (!lhs.isNa(i)) {
+      if (!lhs.isNothing(i)) {
         long item = lhs.getItem(i);
         boolean r = doLong(item, rhs);
         if (r) {
@@ -106,18 +106,18 @@ protected BoolStorage runLongMap(
       context.safepoint();
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   protected BoolStorage runDoubleMap(
       DoubleArrayAdapter lhs, double rhs, MapOperationProblemAggregator problemAggregator) {
     int n = lhs.size();
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < n; ++i) {
-      if (lhs.isNa(i)) {
-        missing.set(i);
+      if (lhs.isNothing(i)) {
+        isNothing.set(i);
       } else {
         double item = lhs.getItemAsDouble(i);
         boolean r = doDouble(item, rhs);
@@ -129,19 +129,19 @@ protected BoolStorage runDoubleMap(
       context.safepoint();
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   protected BoolStorage runBigIntegerMap(
       BigIntegerArrayAdapter lhs, BigInteger rhs, MapOperationProblemAggregator problemAggregator) {
     int n = lhs.size();
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < n; ++i) {
       BigInteger item = lhs.getItem(i);
       if (item == null) {
-        missing.set(i);
+        isNothing.set(i);
       } else {
         boolean r = doBigInteger(item, rhs);
         if (r) {
@@ -152,7 +152,7 @@ protected BoolStorage runBigIntegerMap(
       context.safepoint();
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   @Override
@@ -208,11 +208,11 @@ protected BoolStorage runLongZip(
     int n = lhs.size();
     int m = Math.min(lhs.size(), rhs.size());
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < m; ++i) {
-      if (lhs.isNa(i) || rhs.isNa(i)) {
-        missing.set(i);
+      if (lhs.isNothing(i) || rhs.isNothing(i)) {
+        isNothing.set(i);
       } else {
         long x = lhs.getItem(i);
         long y = rhs.getItem(i);
@@ -226,10 +226,10 @@ protected BoolStorage runLongZip(
     }
 
     if (m < n) {
-      missing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   protected BoolStorage runDoubleZip(
@@ -239,11 +239,11 @@ protected BoolStorage runDoubleZip(
     int n = lhs.size();
     int m = Math.min(lhs.size(), rhs.size());
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < m; ++i) {
-      if (lhs.isNa(i) || rhs.isNa(i)) {
-        missing.set(i);
+      if (lhs.isNothing(i) || rhs.isNothing(i)) {
+        isNothing.set(i);
       } else {
         double x = lhs.getItemAsDouble(i);
         double y = rhs.getItemAsDouble(i);
@@ -257,10 +257,10 @@ protected BoolStorage runDoubleZip(
     }
 
     if (m < n) {
-      missing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   protected BoolStorage runBigIntegerZip(
@@ -270,13 +270,13 @@ protected BoolStorage runBigIntegerZip(
     int n = lhs.size();
     int m = Math.min(lhs.size(), rhs.size());
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < m; ++i) {
       BigInteger x = lhs.getItem(i);
       BigInteger y = rhs.getItem(i);
       if (x == null || y == null) {
-        missing.set(i);
+        isNothing.set(i);
       } else {
         boolean r = doBigInteger(x, y);
         if (r) {
@@ -288,10 +288,10 @@ protected BoolStorage runBigIntegerZip(
     }
 
     if (m < n) {
-      missing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 
   protected BoolStorage runMixedZip(
@@ -299,13 +299,13 @@ protected BoolStorage runMixedZip(
     int n = lhs.size();
     int m = Math.min(lhs.size(), rhs.size());
     BitSet comparisonResults = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < m; ++i) {
       Object x = lhs.getItemBoxed(i);
       Object y = rhs.getItemBoxed(i);
       if (x == null || y == null) {
-        missing.set(i);
+        isNothing.set(i);
       } else {
         boolean r = false;
         // Any number is coercible to double, if the value is not coercible, it is not a supported
@@ -341,9 +341,9 @@ protected BoolStorage runMixedZip(
     }
 
     if (m < n) {
-      missing.set(m, n);
+      isNothing.set(m, n);
     }
 
-    return new BoolStorage(comparisonResults, missing, n, false);
+    return new BoolStorage(comparisonResults, isNothing, n, false);
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
index 62f2bbc919c2..2d6032791dbe 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
@@ -44,7 +44,7 @@ private LongStorageAsBigInteger(AbstractLongStorage storage) {
 
     @Override
     public BigInteger getItem(int i) {
-      if (storage.isNa(i)) {
+      if (storage.isNothing(i)) {
         return null;
       } else {
         long x = storage.getItem(i);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
index 628eda61b075..aa28de2128a9 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
@@ -9,7 +9,7 @@
 public interface DoubleArrayAdapter {
   double getItemAsDouble(int i);
 
-  boolean isNa(int i);
+  boolean isNothing(long i);
 
   int size();
 
@@ -49,8 +49,8 @@ public double getItemAsDouble(int i) {
     }
 
     @Override
-    public boolean isNa(int i) {
-      return storage.isNa(i);
+    public boolean isNothing(long i) {
+      return storage.isNothing(i);
     }
 
     @Override
@@ -73,7 +73,7 @@ public double getItemAsDouble(int i) {
     }
 
     @Override
-    public boolean isNa(int i) {
+    public boolean isNothing(long i) {
       return storage.getItem(i) == null;
     }
 
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/LikeOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/LikeOp.java
index eef9349eab20..ffdcde1512d2 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/LikeOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/LikeOp.java
@@ -41,24 +41,24 @@ public BoolStorage runBinaryMap(
       MapOperationProblemAggregator problemAggregator) {
     if (arg == null) {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
-      newMissing.set(0, storage.size());
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      BitSet newIsNothing = new BitSet();
+      newIsNothing.set(0, storage.size());
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     } else if (arg instanceof String argString) {
       Pattern pattern = createRegexPatternFromSql(argString);
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
+      BitSet newIsNothing = new BitSet();
       Context context = Context.getCurrent();
       for (int i = 0; i < storage.size(); i++) {
-        if (storage.isNa(i)) {
-          newMissing.set(i);
+        if (storage.isNothing(i)) {
+          newIsNothing.set(i);
         } else if (pattern.matcher(storage.getItem(i)).matches()) {
           newVals.set(i);
         }
 
         context.safepoint();
       }
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     } else {
       throw new UnexpectedTypeException("a Text");
     }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
index f90c42ebb3a3..10dcad687de5 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
@@ -29,37 +29,37 @@ public BoolStorage runBinaryMap(
       MapOperationProblemAggregator problemAggregator) {
     if (arg == null) {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
-      newMissing.set(0, storage.size());
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      BitSet newIsNothing = new BitSet();
+      newIsNothing.set(0, storage.size());
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     } else if (arg instanceof String argString) {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
+      BitSet newIsNothing = new BitSet();
       Context context = Context.getCurrent();
       for (int i = 0; i < storage.size(); i++) {
-        if (storage.isNa(i)) {
-          newMissing.set(i);
+        if (storage.isNothing(i)) {
+          newIsNothing.set(i);
         } else if (doString(storage.getItem(i), argString)) {
           newVals.set(i);
         }
 
         context.safepoint();
       }
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     } else {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
+      BitSet newIsNothing = new BitSet();
       Context context = Context.getCurrent();
       for (int i = 0; i < storage.size(); i++) {
-        if (storage.isNa(i)) {
-          newMissing.set(i);
+        if (storage.isNothing(i)) {
+          newIsNothing.set(i);
         } else if (doObject(storage.getItem(i), arg)) {
           newVals.set(i);
         }
 
         context.safepoint();
       }
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     }
   }
 
@@ -71,24 +71,24 @@ public BoolStorage runZip(
     Context context = Context.getCurrent();
     if (arg instanceof StringStorage v) {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
+      BitSet newIsNothing = new BitSet();
       for (int i = 0; i < storage.size(); i++) {
-        if (!storage.isNa(i) && i < v.size() && !v.isNa(i)) {
+        if (!storage.isNothing(i) && i < v.size() && !v.isNothing(i)) {
           if (doString(storage.getItem(i), v.getItem(i))) {
             newVals.set(i);
           }
         } else {
-          newMissing.set(i);
+          newIsNothing.set(i);
         }
 
         context.safepoint();
       }
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     } else {
       BitSet newVals = new BitSet();
-      BitSet newMissing = new BitSet();
+      BitSet newIsNothing = new BitSet();
       for (int i = 0; i < storage.size(); i++) {
-        if (!storage.isNa(i) && i < arg.size() && !arg.isNa(i)) {
+        if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) {
           Object x = arg.getItemBoxed(i);
           if (x instanceof String) {
             if (doString(storage.getItem(i), (String) x)) {
@@ -100,12 +100,12 @@ public BoolStorage runZip(
             }
           }
         } else {
-          newMissing.set(i);
+          newIsNothing.set(i);
         }
 
         context.safepoint();
       }
-      return new BoolStorage(newVals, newMissing, storage.size(), false);
+      return new BoolStorage(newVals, newIsNothing, storage.size(), false);
     }
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringLongToStringOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringLongToStringOp.java
index c58b9d5fad75..e6c784e3cf84 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringLongToStringOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringLongToStringOp.java
@@ -33,7 +33,7 @@ public Storage<?> runBinaryMap(
       String[] newVals = new String[size];
       Context context = Context.getCurrent();
       for (int i = 0; i < size; i++) {
-        if (storage.isNa(i)) {
+        if (storage.isNothing(i)) {
           newVals[i] = null;
         } else {
           newVals[i] = doOperation(storage.getItem(i), argLong);
@@ -58,7 +58,7 @@ public Storage<?> runZip(
       String[] newVals = new String[size];
       Context context = Context.getCurrent();
       for (int i = 0; i < size; i++) {
-        if (storage.isNa(i) || v.isNa(i)) {
+        if (storage.isNothing(i) || v.isNothing(i)) {
           newVals[i] = null;
         } else {
           newVals[i] = doOperation(storage.getItem(i), v.getItem(i));
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringStringOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringStringOp.java
index 893ee17db127..5638056ba7ef 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringStringOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringStringOp.java
@@ -34,7 +34,7 @@ public Storage<?> runBinaryMap(
       String[] newVals = new String[size];
       Context context = Context.getCurrent();
       for (int i = 0; i < size; i++) {
-        if (storage.isNa(i)) {
+        if (storage.isNothing(i)) {
           newVals[i] = null;
         } else {
           newVals[i] = doString(storage.getItem(i), argString);
@@ -61,7 +61,7 @@ public Storage<?> runZip(
       String[] newVals = new String[size];
       Context context = Context.getCurrent();
       for (int i = 0; i < size; i++) {
-        if (storage.isNa(i) || v.isNa(i)) {
+        if (storage.isNothing(i) || v.isNothing(i)) {
           newVals[i] = null;
         } else {
           newVals[i] = doString(storage.getItem(i), v.getItem(i));
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryBooleanOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryBooleanOperation.java
new file mode 100644
index 000000000000..471a726d5900
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryBooleanOperation.java
@@ -0,0 +1,38 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnStorage;
+
+/** An abstract base class for unary operations returning a boolean column. */
+abstract class AbstractUnaryBooleanOperation extends AbstractUnaryOperation {
+  /**
+   * Creates a new AbstractUnaryOperation.
+   *
+   * @param name the name of the operation
+   * @param nothingUnchanged whether the operation should return nothing if the input is nothing
+   */
+  protected AbstractUnaryBooleanOperation(String name, boolean nothingUnchanged) {
+    super(name, nothingUnchanged);
+  }
+
+  @Override
+  protected BoolBuilder createBuilder(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage.getSize() > Integer.MAX_VALUE) {
+      throw new IllegalArgumentException(
+          "Cannot currently operate on columns larger than " + Integer.MAX_VALUE + ".");
+    }
+    return new BoolBuilder((int) storage.getSize());
+  }
+
+  @Override
+  protected final void applyObjectRow(
+      Object value, Builder builder, MapOperationProblemAggregator problemAggregator) {
+    applyObjectRow(value, (BoolBuilder) builder, problemAggregator);
+  }
+
+  protected abstract void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator);
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryLongOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryLongOperation.java
new file mode 100644
index 000000000000..9d5a02f7e77f
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryLongOperation.java
@@ -0,0 +1,45 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.builder.LongBuilder;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.IntegerType;
+
+/** An abstract base class for unary operations returning a long column. */
+abstract class AbstractUnaryLongOperation extends AbstractUnaryOperation {
+  private final IntegerType returnType;
+
+  /**
+   * Creates a new AbstractUnaryOperation.
+   *
+   * @param name the name of the operation
+   * @param nothingUnchanged whether the operation should return nothing if the input is nothing
+   * @param returnType the type of the column that will be returned
+   */
+  protected AbstractUnaryLongOperation(
+      String name, boolean nothingUnchanged, IntegerType returnType) {
+
+    super(name, nothingUnchanged);
+    this.returnType = returnType;
+  }
+
+  @Override
+  protected LongBuilder createBuilder(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage.getSize() > Integer.MAX_VALUE) {
+      throw new IllegalArgumentException(
+          "Cannot currently operate on columns larger than " + Integer.MAX_VALUE + ".");
+    }
+    return LongBuilder.createLongBuilder((int) storage.getSize(), returnType, problemAggregator);
+  }
+
+  @Override
+  protected final void applyObjectRow(
+      Object value, Builder builder, MapOperationProblemAggregator problemAggregator) {
+    applyObjectRow(value, (LongBuilder) builder, problemAggregator);
+  }
+
+  protected abstract void applyObjectRow(
+      Object value, LongBuilder builder, MapOperationProblemAggregator problemAggregator);
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryOperation.java
new file mode 100644
index 000000000000..29246791dd5f
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/AbstractUnaryOperation.java
@@ -0,0 +1,104 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.builder.InferredBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnBooleanStorage;
+import org.enso.table.data.column.storage.ColumnDoubleStorage;
+import org.enso.table.data.column.storage.ColumnLongStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+
+/**
+ * An abstract base class for unary operations. This class provides a default implementation for
+ * applying the operation to a column storage.
+ */
+abstract class AbstractUnaryOperation implements UnaryOperation {
+  private final String name;
+  private final boolean nothingUnchanged;
+
+  /**
+   * Creates a new AbstractUnaryOperation.
+   *
+   * @param name the name of the operation
+   * @param nothingUnchanged whether the operation should return nothing if the input is nothing
+   */
+  protected AbstractUnaryOperation(String name, boolean nothingUnchanged) {
+    this.name = name;
+    this.nothingUnchanged = nothingUnchanged;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public abstract boolean canApply(ColumnStorage storage);
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    var builder = createBuilder(storage, problemAggregator);
+
+    switch (storage) {
+      case ColumnBooleanStorage booleanStorage -> applyBoolean(
+          booleanStorage, builder, problemAggregator);
+      case ColumnLongStorage longStorage -> applyLong(longStorage, builder, problemAggregator);
+      case ColumnDoubleStorage doubleStorage -> applyDouble(
+          doubleStorage, builder, problemAggregator);
+      default -> applyObject(storage, builder, problemAggregator);
+    }
+
+    return builder.seal();
+  }
+
+  protected Builder createBuilder(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage.getSize() > Integer.MAX_VALUE) {
+      throw new IllegalArgumentException(
+          "Cannot currently operate on columns larger than " + Integer.MAX_VALUE + ".");
+    }
+
+    return new InferredBuilder((int) storage.getSize(), problemAggregator);
+  }
+
+  /** Apply the operation to a Boolean Storage. */
+  protected void applyBoolean(
+      ColumnBooleanStorage booleanStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    applyObject(booleanStorage, builder, problemAggregator);
+  }
+
+  /** Apply the operation to a Long Storage. */
+  protected void applyLong(
+      ColumnLongStorage longStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    applyObject(longStorage, builder, problemAggregator);
+  }
+
+  /** Apply the operation to a Double Storage. */
+  protected void applyDouble(
+      ColumnDoubleStorage doubleStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    applyObject(doubleStorage, builder, problemAggregator);
+  }
+
+  /** Apply the operation to an Object Storage. */
+  protected void applyObject(
+      ColumnStorage objectStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    UnaryOperation.applyOverObjectStorage(
+        objectStorage,
+        nothingUnchanged,
+        builder,
+        o -> applyObjectRow(o, builder, problemAggregator));
+  }
+
+  protected abstract void applyObjectRow(
+      Object value, Builder builder, MapOperationProblemAggregator problemAggregator);
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/DatePartOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/DatePartOperation.java
new file mode 100644
index 000000000000..ce5e29382e15
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/DatePartOperation.java
@@ -0,0 +1,75 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.time.temporal.ChronoField;
+import java.time.temporal.IsoFields;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalField;
+import org.enso.table.data.column.builder.LongBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.IntegerType;
+
+public class DatePartOperation extends AbstractUnaryLongOperation {
+  public static final String YEAR = "year";
+  public static final UnaryOperation YEAR_INSTANCE =
+      new DatePartOperation(YEAR, ChronoField.YEAR, false);
+
+  public static final String QUARTER = "quarter";
+  public static final UnaryOperation QUARTER_INSTANCE =
+      new DatePartOperation(QUARTER, IsoFields.QUARTER_OF_YEAR, false);
+
+  public static final String MONTH = "month";
+  public static final UnaryOperation MONTH_INSTANCE =
+      new DatePartOperation(MONTH, ChronoField.MONTH_OF_YEAR, false);
+
+  public static final String WEEK = "week";
+  public static final UnaryOperation WEEK_INSTANCE =
+      new DatePartOperation(WEEK, IsoFields.WEEK_OF_WEEK_BASED_YEAR, false);
+
+  public static final String DAY = "day";
+  public static final UnaryOperation DAY_INSTANCE =
+      new DatePartOperation(DAY, ChronoField.DAY_OF_MONTH, false);
+
+  public static final String HOUR = "hour";
+  public static final UnaryOperation HOUR_INSTANCE =
+      new DatePartOperation(HOUR, ChronoField.HOUR_OF_DAY, true);
+
+  public static final String MINUTE = "minute";
+  public static final UnaryOperation MINUTE_INSTANCE =
+      new DatePartOperation(MINUTE, ChronoField.MINUTE_OF_HOUR, true);
+
+  public static final String SECOND = "second";
+  public static final UnaryOperation SECOND_INSTANCE =
+      new DatePartOperation(SECOND, ChronoField.SECOND_OF_MINUTE, true);
+
+  public static final String MILLISECOND = "millisecond";
+  public static final UnaryOperation MILLISECOND_INSTANCE =
+      new DatePartOperation(MILLISECOND, ChronoField.MILLI_OF_SECOND, true);
+
+  protected final TemporalField field;
+  protected final boolean timeField;
+
+  protected DatePartOperation(String name, TemporalField field, boolean timeField) {
+    super(name, true, IntegerType.INT_64);
+    this.field = field;
+    this.timeField = timeField;
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return timeField ? storage.getType().hasTime() : storage.getType().hasDate();
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, LongBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    if (value instanceof Temporal s) {
+      var longValue = s.getLong(field);
+      builder.appendLong(longValue);
+    } else {
+      throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected date/time type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java
new file mode 100644
index 000000000000..cf8af70b59dd
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java
@@ -0,0 +1,39 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.TextType;
+
+/* An operation that checks if a column's row values are empty.
+ * Only supported on Text values. */
+public class IsEmptyOperation extends AbstractUnaryBooleanOperation {
+  public static String NAME = "is_empty";
+
+  public static final UnaryOperation INSTANCE = new IsEmptyOperation();
+
+  private IsEmptyOperation() {
+    super(NAME, false);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType() instanceof TextType;
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    if (value == null) {
+      builder.appendBoolean(true);
+    } else {
+      if (value instanceof String s) {
+        builder.appendBoolean(s.isEmpty());
+      } else {
+        throw new IllegalArgumentException(
+            "Unsupported type: " + value.getClass() + " (expected text type).");
+      }
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsInfiniteOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsInfiniteOperation.java
new file mode 100644
index 000000000000..422bf5ede4d5
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsInfiniteOperation.java
@@ -0,0 +1,71 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.util.BitSet;
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.*;
+
+public class IsInfiniteOperation extends AbstractUnaryBooleanOperation {
+  public static final String NAME = "is_infinite";
+  public static final UnaryOperation INSTANCE = new IsInfiniteOperation();
+
+  private IsInfiniteOperation() {
+    super(NAME, true);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType().isNumeric();
+  }
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage instanceof ColumnLongStorage
+        && storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      // For a Column of Longs where we have the Nothing map, we can produce result immediately.
+      return new BoolStorage(
+          new BitSet(), withNothingMap.getIsNothingMap(), (int) storage.getSize(), false);
+    }
+
+    return super.apply(storage, problemAggregator);
+  }
+
+  @Override
+  protected void applyLong(
+      ColumnLongStorage longStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    var boolBuilder = (BoolBuilder) builder;
+    UnaryOperation.applyOverLongStorage(
+        longStorage, true, builder, (isNothing, value) -> boolBuilder.appendBoolean(false));
+  }
+
+  @Override
+  protected void applyDouble(
+      ColumnDoubleStorage doubleStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    var boolBuilder = (BoolBuilder) builder;
+    UnaryOperation.applyOverDoubleStorage(
+        doubleStorage,
+        true,
+        builder,
+        (isNothing, value) -> boolBuilder.appendBoolean(Double.isInfinite(value)));
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    // Null handled by base class
+    switch (value) {
+      case Double d -> builder.appendBoolean(Double.isInfinite(d));
+      case Float f -> builder.appendBoolean(Float.isInfinite(f));
+      case Number ignored -> builder.appendBoolean(false);
+      default -> throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected numeric type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java
new file mode 100644
index 000000000000..a7738f718929
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java
@@ -0,0 +1,75 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.util.BitSet;
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.BoolStorage;
+import org.enso.table.data.column.storage.ColumnDoubleStorage;
+import org.enso.table.data.column.storage.ColumnLongStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.ColumnStorageWithNothingMap;
+
+public class IsNaNOperation extends AbstractUnaryBooleanOperation {
+  public static final String NAME = "is_nan";
+  public static final UnaryOperation INSTANCE = new IsNaNOperation();
+
+  private IsNaNOperation() {
+    super(NAME, true);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType().isNumeric();
+  }
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage instanceof ColumnLongStorage
+        && storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      // For a Column of Longs where we have the Nothing map, we can produce result immediately.
+      return new BoolStorage(
+          new BitSet(), withNothingMap.getIsNothingMap(), (int) storage.getSize(), false);
+    }
+
+    return super.apply(storage, problemAggregator);
+  }
+
+  @Override
+  protected void applyLong(
+      ColumnLongStorage longStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    var boolBuilder = (BoolBuilder) builder;
+    UnaryOperation.applyOverLongStorage(
+        longStorage, true, builder, (isNothing, value) -> boolBuilder.appendBoolean(false));
+  }
+
+  @Override
+  protected void applyDouble(
+      ColumnDoubleStorage doubleStorage,
+      Builder builder,
+      MapOperationProblemAggregator problemAggregator) {
+    var boolBuilder = (BoolBuilder) builder;
+    UnaryOperation.applyOverDoubleStorage(
+        doubleStorage,
+        true,
+        builder,
+        (isNothing, value) -> boolBuilder.appendBoolean(Double.isNaN(value)));
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    // Null handled by base class
+    switch (value) {
+      case Double d -> builder.appendBoolean(Double.isNaN(d));
+      case Float f -> builder.appendBoolean(Float.isNaN(f));
+      case Number ignored -> builder.appendBoolean(false);
+      default -> throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected numeric type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNothingOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNothingOperation.java
new file mode 100644
index 000000000000..b3665eed94e5
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNothingOperation.java
@@ -0,0 +1,45 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.util.BitSet;
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.BoolStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.ColumnStorageWithNothingMap;
+
+public class IsNothingOperation extends AbstractUnaryBooleanOperation {
+  public static final String NAME = "is_nothing";
+
+  public static final UnaryOperation INSTANCE = new IsNothingOperation();
+
+  private IsNothingOperation() {
+    super(NAME, false);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return true;
+  }
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage instanceof ColumnStorageWithNothingMap withNothingMap) {
+      return new BoolStorage(
+          withNothingMap.getIsNothingMap(), new BitSet(), (int) storage.getSize(), false);
+    }
+
+    var builder = createBuilder(storage, problemAggregator);
+    for (long i = 0; i < storage.getSize(); i++) {
+      builder.appendBoolean(storage.isNothing(i));
+    }
+    return builder.seal();
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java
new file mode 100644
index 000000000000..0d51e196903a
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java
@@ -0,0 +1,63 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.table.data.column.builder.BoolBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.BoolStorage;
+import org.enso.table.data.column.storage.ColumnBooleanStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.BooleanType;
+
+public class NotOperation extends AbstractUnaryBooleanOperation {
+  public static final String NAME = "not";
+
+  public static final UnaryOperation INSTANCE = new NotOperation();
+
+  private NotOperation() {
+    super(NAME, false);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType() instanceof BooleanType;
+  }
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage instanceof BoolStorage boolStorage) {
+      return new BoolStorage(
+          boolStorage.getValues(),
+          boolStorage.getIsNothingMap(),
+          boolStorage.size(),
+          !boolStorage.isNegated());
+    }
+
+    var builder = createBuilder(storage, problemAggregator);
+    if (storage instanceof ColumnBooleanStorage booleanStorage) {
+      UnaryOperation.applyOverBooleanStorage(
+          booleanStorage, true, builder, (isNothing, value) -> builder.appendBoolean(!value));
+    } else {
+      UnaryOperation.applyOverObjectStorage(
+          storage,
+          true,
+          builder,
+          (value) -> {
+            if (value instanceof Boolean b) {
+              builder.appendBoolean(!b);
+            } else {
+              throw new IllegalArgumentException(
+                  "Unsupported type: " + value.getClass() + " (expected boolean type).");
+            }
+          });
+    }
+
+    return builder.seal();
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, BoolBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TextLengthOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TextLengthOperation.java
new file mode 100644
index 000000000000..cec41eddf066
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TextLengthOperation.java
@@ -0,0 +1,35 @@
+package org.enso.table.data.column.operation.unary;
+
+import org.enso.base.Text_Utils;
+import org.enso.table.data.column.builder.LongBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.IntegerType;
+import org.enso.table.data.column.storage.type.TextType;
+
+public class TextLengthOperation extends AbstractUnaryLongOperation {
+  public static final String NAME = "text_length";
+  public static final UnaryOperation INSTANCE = new TextLengthOperation();
+
+  private TextLengthOperation() {
+    super(NAME, true, IntegerType.INT_64);
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType() instanceof TextType;
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, LongBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    if (value instanceof String s) {
+      var longValue = Text_Utils.grapheme_length(s);
+      builder.appendLong(longValue);
+    } else {
+      throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected text type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TruncatedTimePartOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TruncatedTimePartOperation.java
new file mode 100644
index 000000000000..c7ccde742a8c
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/TruncatedTimePartOperation.java
@@ -0,0 +1,37 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.time.temporal.ChronoField;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalField;
+import org.enso.table.data.column.builder.LongBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+
+public class TruncatedTimePartOperation extends DatePartOperation {
+  public static final String MICROSECOND = "microsecond";
+  public static final UnaryOperation MICROSECOND_INSTANCE =
+      new TruncatedTimePartOperation(MICROSECOND, ChronoField.MICRO_OF_SECOND, 1000);
+
+  public static final String NANOSECOND = "nanosecond";
+  public static final UnaryOperation NANOSECOND_INSTANCE =
+      new TruncatedTimePartOperation(NANOSECOND, ChronoField.NANO_OF_SECOND, 1000);
+
+  private final int truncation;
+
+  private TruncatedTimePartOperation(String name, TemporalField field, int truncation) {
+    super(name, field, true);
+    this.truncation = truncation;
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, LongBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    if (value instanceof Temporal s) {
+      var longValue = s.getLong(field);
+      builder.appendLong(longValue % truncation);
+    } else {
+      throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected date/time type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/UnaryRoundOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/UnaryRoundOperation.java
new file mode 100644
index 000000000000..efce629ff08f
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/UnaryRoundOperation.java
@@ -0,0 +1,67 @@
+package org.enso.table.data.column.operation.unary;
+
+import java.util.function.DoubleToLongFunction;
+import org.enso.table.data.column.builder.LongBuilder;
+import org.enso.table.data.column.operation.UnaryOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.ColumnLongStorage;
+import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.IntegerType;
+
+public class UnaryRoundOperation extends AbstractUnaryLongOperation {
+  public static final String CEIL = "ceil";
+  public static final UnaryOperation CEIL_INSTANCE =
+      new UnaryRoundOperation(CEIL, d -> (long) Math.ceil(d));
+
+  public static final String FLOOR = "floor";
+  public static final UnaryOperation FLOOR_INSTANCE =
+      new UnaryRoundOperation(FLOOR, d -> (long) Math.floor(d));
+
+  public static String TRUNCATE = "truncate";
+  public static final UnaryOperation TRUNCATE_INSTANCE =
+      new UnaryRoundOperation(TRUNCATE, d -> (long) d);
+
+  private final DoubleToLongFunction function;
+
+  private UnaryRoundOperation(String name, DoubleToLongFunction function) {
+    super(name, true, IntegerType.INT_64);
+    this.function = function;
+  }
+
+  @Override
+  public boolean canApply(ColumnStorage storage) {
+    return storage.getType().isNumeric();
+  }
+
+  @Override
+  public ColumnStorage apply(
+      ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
+    if (storage instanceof ColumnLongStorage longStorage) {
+      // For a long storage, the operation is an identity operation.
+      return longStorage;
+    }
+
+    return super.apply(storage, problemAggregator);
+  }
+
+  @Override
+  protected void applyObjectRow(
+      Object value, LongBuilder builder, MapOperationProblemAggregator problemAggregator) {
+    // Null handled by base class
+    switch (value) {
+      case Double d -> {
+        if (Double.isNaN(d) || Double.isInfinite(d)) {
+          String msg = "Value is " + d;
+          problemAggregator.reportArithmeticError(msg, builder.getCurrentSize());
+          builder.appendNulls(1);
+        } else {
+          builder.appendLong(function.applyAsLong(d));
+        }
+      }
+      case Float f -> applyObjectRow((double) f, builder, problemAggregator);
+      case Number n -> applyObjectRow(n.doubleValue(), builder, problemAggregator);
+      default -> throw new IllegalArgumentException(
+          "Unsupported type: " + value.getClass() + " (expected numeric type).");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
index 1651082283e7..ea504b0ef43d 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
@@ -8,7 +8,6 @@
 import org.enso.table.data.column.operation.map.BinaryMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
 import org.enso.table.data.column.operation.map.bool.BooleanIsInOp;
 import org.enso.table.data.column.storage.type.BooleanType;
 import org.enso.table.data.column.storage.type.StorageType;
@@ -22,24 +21,25 @@
 import org.graalvm.polyglot.Value;
 
 /** A boolean column storage. */
-public final class BoolStorage extends Storage<Boolean> {
+public final class BoolStorage extends Storage<Boolean>
+    implements ColumnBooleanStorage, ColumnStorageWithNothingMap {
   private static final MapOperationStorage<Boolean, BoolStorage> ops = buildOps();
   private final BitSet values;
-  private final BitSet isMissing;
+  private final BitSet isNothing;
   private final int size;
   private final boolean negated;
 
-  public BoolStorage(BitSet values, BitSet isMissing, int size, boolean negated) {
+  public BoolStorage(BitSet values, BitSet isNothing, int size, boolean negated) {
     this.values = values;
-    this.isMissing = isMissing;
+    this.isNothing = isNothing;
     this.size = size;
     this.negated = negated;
   }
 
   public static BoolStorage makeEmpty(int size) {
-    BitSet isMissing = new BitSet(size);
-    isMissing.set(0, size);
-    return new BoolStorage(new BitSet(), isMissing, size, false);
+    BitSet isNothing = new BitSet(size);
+    isNothing.set(0, size);
+    return new BoolStorage(new BitSet(), isNothing, size, false);
   }
 
   public static BoolStorage makeConstant(int size, boolean r) {
@@ -51,14 +51,6 @@ public int size() {
     return size;
   }
 
-  /**
-   * @inheritDoc
-   */
-  @Override
-  public int countMissing() {
-    return isMissing.cardinality();
-  }
-
   @Override
   public StorageType getType() {
     return BooleanType.INSTANCE;
@@ -66,18 +58,7 @@ public StorageType getType() {
 
   @Override
   public Boolean getItemBoxed(int idx) {
-    return isMissing.get(idx) ? null : getItem(idx);
-  }
-
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return ops.isSupportedUnary(name);
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return ops.runUnaryMap(name, this, problemAggregator);
+    return isNothing.get(idx) ? null : getItem(idx);
   }
 
   public boolean getItem(long idx) {
@@ -85,8 +66,8 @@ public boolean getItem(long idx) {
   }
 
   @Override
-  public boolean isNa(long idx) {
-    return isMissing.get((int) idx);
+  public boolean isNothing(long idx) {
+    return isNothing.get((int) idx);
   }
 
   @Override
@@ -110,10 +91,6 @@ public BitSet getValues() {
     return values;
   }
 
-  public BitSet getIsMissing() {
-    return isMissing;
-  }
-
   /**
    * Creates a new BoolStorage in which all missing values have been replaced by arg.
    *
@@ -124,9 +101,9 @@ public BitSet getIsMissing() {
   private Storage<?> fillMissingBoolean(boolean arg) {
     final var newValues = (BitSet) values.clone();
     if (arg != negated) {
-      newValues.or(isMissing);
+      newValues.or(isNothing);
     } else {
-      newValues.andNot(isMissing);
+      newValues.andNot(isNothing);
     }
     return new BoolStorage(newValues, new BitSet(), size, negated);
   }
@@ -150,17 +127,17 @@ public Storage<?> fillMissingFromPrevious(BoolStorage missingIndicator) {
 
     boolean previousValue = false;
     boolean hasPrevious = false;
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     BitSet newValues = new BitSet();
 
     Context context = Context.getCurrent();
     for (int i = 0; i < size; i++) {
-      boolean isCurrentValueMissing = isMissing.get(i);
+      boolean isCurrentValueMissing = isNothing.get(i);
       if (isCurrentValueMissing) {
         if (hasPrevious) {
           newValues.set(i, previousValue);
         } else {
-          newMissing.set(i);
+          newIsNothing.set(i);
         }
       } else {
         boolean currentValue = getItem(i);
@@ -172,19 +149,19 @@ public Storage<?> fillMissingFromPrevious(BoolStorage missingIndicator) {
       context.safepoint();
     }
 
-    return new BoolStorage(newValues, newMissing, size, false);
+    return new BoolStorage(newValues, newIsNothing, size, false);
   }
 
   @Override
   public BoolStorage applyFilter(BitSet filterMask, int newLength) {
     Context context = Context.getCurrent();
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     BitSet newValues = new BitSet();
     int resultIx = 0;
     for (int i = 0; i < size; i++) {
       if (filterMask.get(i)) {
-        if (isMissing.get(i)) {
-          newMissing.set(resultIx++);
+        if (isNothing.get(i)) {
+          newIsNothing.set(resultIx++);
         } else if (values.get(i)) {
           newValues.set(resultIx++);
         } else {
@@ -196,7 +173,7 @@ public BoolStorage applyFilter(BitSet filterMask, int newLength) {
 
       context.safepoint();
     }
-    return new BoolStorage(newValues, newMissing, newLength, negated);
+    return new BoolStorage(newValues, newIsNothing, newLength, negated);
   }
 
   @Override
@@ -206,7 +183,7 @@ public BoolStorage applyMask(OrderMask mask) {
     BitSet newVals = new BitSet();
     for (int i = 0; i < mask.length(); i++) {
       int position = mask.get(i);
-      if (position == Storage.NOT_FOUND_INDEX || isMissing.get(position)) {
+      if (position == Storage.NOT_FOUND_INDEX || isNothing.get(position)) {
         newNa.set(i);
       } else if (values.get(position)) {
         newVals.set(i);
@@ -231,7 +208,7 @@ public Storage<?> iif(
     var on_false = makeRowProvider(when_false);
     Builder builder = Builder.getForType(resultStorageType, size, problemAggregator);
     for (int i = 0; i < size; i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.append(null);
       } else if (getItem(i)) {
         builder.append(on_true.apply(i));
@@ -256,15 +233,6 @@ private static IntFunction<Object> makeRowProvider(Value value) {
   private static MapOperationStorage<Boolean, BoolStorage> buildOps() {
     MapOperationStorage<Boolean, BoolStorage> ops = new MapOperationStorage<>();
     ops.add(
-            new UnaryMapOperation<>(Maps.NOT) {
-              @Override
-              protected BoolStorage runUnaryMap(
-                  BoolStorage storage, MapOperationProblemAggregator problemAggregator) {
-                return new BoolStorage(
-                    storage.values, storage.isMissing, storage.size, !storage.negated);
-              }
-            })
-        .add(
             new BinaryMapOperation<>(Maps.EQ) {
               @Override
               public BoolStorage runBinaryMap(
@@ -278,10 +246,10 @@ public BoolStorage runBinaryMap(
                     return storage;
                   } else {
                     return new BoolStorage(
-                        storage.values, storage.isMissing, storage.size, !storage.negated);
+                        storage.values, storage.isNothing, storage.size, !storage.negated);
                   }
                 } else {
-                  return new BoolStorage(new BitSet(), storage.isMissing, storage.size, false);
+                  return new BoolStorage(new BitSet(), storage.isNothing, storage.size, false);
                 }
               }
 
@@ -292,19 +260,19 @@ public BoolStorage runZip(
                   MapOperationProblemAggregator problemAggregator) {
                 Context context = Context.getCurrent();
                 BitSet out = new BitSet();
-                BitSet missing = new BitSet();
+                BitSet isNothing = new BitSet();
                 for (int i = 0; i < storage.size; i++) {
-                  if (!storage.isNa(i) && i < arg.size() && !arg.isNa(i)) {
+                  if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) {
                     if (((Boolean) storage.getItem(i)).equals(arg.getItemBoxed(i))) {
                       out.set(i);
                     }
                   } else {
-                    missing.set(i);
+                    isNothing.set(i);
                   }
 
                   context.safepoint();
                 }
-                return new BoolStorage(out, missing, storage.size, false);
+                return new BoolStorage(out, isNothing, storage.size, false);
               }
             })
         .add(
@@ -321,7 +289,7 @@ public BoolStorage runBinaryMap(
                     newMissing.xor(storage.values);
                     return new BoolStorage(storage.values, newMissing, storage.size, true);
                   } else {
-                    var newMissing = storage.isMissing.get(0, storage.size);
+                    var newMissing = storage.isNothing.get(0, storage.size);
                     newMissing.or(storage.values);
                     return new BoolStorage(new BitSet(), newMissing, storage.size, false);
                   }
@@ -360,20 +328,20 @@ public BoolStorage runZip(
                   negated = false;
                 }
 
-                BitSet missing = BitSets.makeDuplicate(storage.isMissing);
-                missing.or(v.isMissing);
-                int current = missing.nextSetBit(0);
+                BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
+                isNothing.or(v.isNothing);
+                int current = isNothing.nextSetBit(0);
                 while (current != -1) {
                   var value = negated != out.get(current);
                   if (!value
                       && (storage.getItemBoxed(current) == Boolean.FALSE
                           || v.getItemBoxed(current) == Boolean.FALSE)) {
-                    missing.clear(current);
+                    isNothing.clear(current);
                   }
-                  current = missing.nextSetBit(current + 1);
+                  current = isNothing.nextSetBit(current + 1);
                 }
 
-                return new BoolStorage(out, missing, storage.size, negated);
+                return new BoolStorage(out, isNothing, storage.size, negated);
               }
             })
         .add(
@@ -385,7 +353,7 @@ public BoolStorage runBinaryMap(
                   MapOperationProblemAggregator problemAggregator) {
                 if (arg == null) {
                   if (storage.negated) {
-                    var newMissing = storage.isMissing.get(0, storage.size);
+                    var newMissing = storage.isNothing.get(0, storage.size);
                     newMissing.or(storage.values);
                     return new BoolStorage(new BitSet(), newMissing, storage.size, true);
                   } else {
@@ -430,28 +398,20 @@ public BoolStorage runZip(
                   negated = false;
                 }
 
-                BitSet missing = BitSets.makeDuplicate(storage.isMissing);
-                missing.or(v.isMissing);
-                int current = missing.nextSetBit(0);
+                BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
+                isNothing.or(v.isNothing);
+                int current = isNothing.nextSetBit(0);
                 while (current != -1) {
                   var value = negated != out.get(current);
                   if (value
                       && (storage.getItemBoxed(current) == Boolean.TRUE
                           || v.getItemBoxed(current) == Boolean.TRUE)) {
-                    missing.clear(current);
+                    isNothing.clear(current);
                   }
-                  current = missing.nextSetBit(current + 1);
+                  current = isNothing.nextSetBit(current + 1);
                 }
 
-                return new BoolStorage(out, missing, storage.size, negated);
-              }
-            })
-        .add(
-            new UnaryMapOperation<>(Maps.IS_NOTHING) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  BoolStorage storage, MapOperationProblemAggregator problemAggregator) {
-                return new BoolStorage(storage.isMissing, new BitSet(), storage.size, false);
+                return new BoolStorage(out, isNothing, storage.size, negated);
               }
             })
         .add(new BooleanIsInOp());
@@ -465,7 +425,7 @@ public static BitSet toMask(BoolStorage storage) {
     if (storage.isNegated()) {
       mask.flip(0, storage.size());
     }
-    mask.andNot(storage.getIsMissing());
+    mask.andNot(storage.getIsNothingMap());
     return mask;
   }
 
@@ -474,16 +434,16 @@ public BoolStorage slice(int offset, int limit) {
     int newSize = Math.min(size - offset, limit);
     return new BoolStorage(
         values.get(offset, offset + limit),
-        isMissing.get(offset, offset + limit),
+        isNothing.get(offset, offset + limit),
         newSize,
         negated);
   }
 
   @Override
   public Storage<?> appendNulls(int count) {
-    BitSet newMissing = BitSets.makeDuplicate(isMissing);
-    newMissing.set(size, size + count);
-    return new BoolStorage(values, newMissing, size + count, negated);
+    BitSet isNothing = BitSets.makeDuplicate(this.isNothing);
+    isNothing.set(size, size + count);
+    return new BoolStorage(values, isNothing, size + count, negated);
   }
 
   @Override
@@ -491,18 +451,31 @@ public BoolStorage slice(List<SliceRange> ranges) {
     Context context = Context.getCurrent();
     int newSize = SliceRange.totalLength(ranges);
     BitSet newValues = new BitSet(newSize);
-    BitSet newMissing = new BitSet(newSize);
+    BitSet newIsNothing = new BitSet(newSize);
     int offset = 0;
     for (SliceRange range : ranges) {
       int length = range.end() - range.start();
       for (int i = 0; i < length; ++i) {
         newValues.set(offset + i, values.get(range.start() + i));
-        newMissing.set(offset + i, isMissing.get(range.start() + i));
+        newIsNothing.set(offset + i, isNothing.get(range.start() + i));
         context.safepoint();
       }
       offset += length;
     }
 
-    return new BoolStorage(newValues, newMissing, newSize, negated);
+    return new BoolStorage(newValues, newIsNothing, newSize, negated);
+  }
+
+  @Override
+  public BitSet getIsNothingMap() {
+    return isNothing;
+  }
+
+  @Override
+  public boolean get(long index) throws ValueIsNothingException {
+    if (isNothing(index)) {
+      throw new ValueIsNothingException(index);
+    }
+    return getItem(index);
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnBooleanStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnBooleanStorage.java
new file mode 100644
index 000000000000..16c778cf8b50
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnBooleanStorage.java
@@ -0,0 +1,6 @@
+package org.enso.table.data.column.storage;
+
+public interface ColumnBooleanStorage extends ColumnStorage {
+  /** Gets the value at a given index. Throws ValueIsNothingException if the index is nothing. */
+  boolean get(long index) throws ValueIsNothingException;
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnDoubleStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnDoubleStorage.java
new file mode 100644
index 000000000000..658222d153bc
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnDoubleStorage.java
@@ -0,0 +1,6 @@
+package org.enso.table.data.column.storage;
+
+public interface ColumnDoubleStorage extends ColumnStorage {
+  /** Gets the value at a given index. Throws ValueIsNothingException if the index is nothing. */
+  double get(long index) throws ValueIsNothingException;
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnLongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnLongStorage.java
new file mode 100644
index 000000000000..0a07c3e8cf75
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnLongStorage.java
@@ -0,0 +1,6 @@
+package org.enso.table.data.column.storage;
+
+public interface ColumnLongStorage extends ColumnStorage {
+  /** Gets the value at a given index. Throws ValueIsNothingException if the index is nothing. */
+  long get(long index) throws ValueIsNothingException;
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorage.java
new file mode 100644
index 000000000000..362503ce27b5
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorage.java
@@ -0,0 +1,23 @@
+package org.enso.table.data.column.storage;
+
+import org.enso.table.data.column.storage.type.StorageType;
+
+/** Basic interface of a column storage. */
+public interface ColumnStorage {
+  /* Gets the size of the storage. */
+  long getSize();
+
+  /* Gets the value type of the storage. */
+  StorageType getType();
+
+  /**
+   * Checks whether the value at idx is Nothing.
+   *
+   * @param index – the index to check.
+   * @return whether the value is Nothing.
+   */
+  boolean isNothing(long index);
+
+  /* Gets the value at a given index. */
+  Object getItemAsObject(long index);
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithInferredStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithInferredStorage.java
new file mode 100644
index 000000000000..1cdbcaec9d61
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithInferredStorage.java
@@ -0,0 +1,9 @@
+package org.enso.table.data.column.storage;
+
+import org.enso.table.data.column.storage.type.StorageType;
+
+public interface ColumnStorageWithInferredStorage {
+  StorageType inferPreciseType();
+
+  ColumnStorage getInferredStorage();
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithNothingMap.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithNothingMap.java
new file mode 100644
index 000000000000..1c2d3c81a9ab
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ColumnStorageWithNothingMap.java
@@ -0,0 +1,8 @@
+package org.enso.table.data.column.storage;
+
+import java.util.BitSet;
+
+public interface ColumnStorageWithNothingMap extends ColumnStorage {
+  /** Gets the isNothing map for the storage. */
+  BitSet getIsNothingMap();
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java
index 99c26e6c42cc..1291992cd350 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorage.java
@@ -17,7 +17,7 @@
  * more precise type if all values have a common type, and will allow operations on this more
  * specific type.
  */
-public final class MixedStorage extends ObjectStorage {
+public final class MixedStorage extends ObjectStorage implements ColumnStorageWithInferredStorage {
   private StorageType inferredType = null;
 
   /**
@@ -119,7 +119,7 @@ public StorageType inferPreciseTypeShrunk() {
     return specialized.inferPreciseTypeShrunk();
   }
 
-  private Storage<?> getInferredStorage() {
+  public Storage<?> getInferredStorage() {
     if (!hasSpecializedStorageBeenInferred) {
       StorageType inferredType = inferPreciseType();
       if (inferredType instanceof AnyObjectType) {
@@ -147,37 +147,6 @@ private enum VectorizedOperationAvailability {
     AVAILABLE_IN_SUPER
   }
 
-  /**
-   * The resolution depends on the following philosophy:
-   *
-   * <p>1. If the inferred storage is already cached, we prefer to use it since it will provide us
-   * with a more efficient implementation.
-   *
-   * <p>2. If it is not yet cached, we do not want to compute it (since it is costly) unless it is
-   * necessary - if our basic storage already provides the operation, we will use that
-   * implementation - even if it may not be as fast as a specialized one, the cost of computing the
-   * precise storage may just not be worth it. If our storage does not provide the operation, we now
-   * need to try getting the inferred storage, to check if it may provide it.
-   */
-  private VectorizedOperationAvailability resolveUnaryOp(String name) {
-    // Shortcut - if the storage is already specialized - we prefer it.
-    if (cachedInferredStorage != null && cachedInferredStorage.isUnaryOpVectorized(name)) {
-      return VectorizedOperationAvailability.AVAILABLE_IN_SPECIALIZED_STORAGE;
-    }
-
-    // Otherwise, we try to avoid specializing if not yet necessary.
-    if (super.isUnaryOpVectorized(name)) {
-      return VectorizedOperationAvailability.AVAILABLE_IN_SUPER;
-    } else {
-      // But if our storage does not provide the operation, we have to try checking the other one.
-      if (getInferredStorage() != null && getInferredStorage().isUnaryOpVectorized(name)) {
-        return VectorizedOperationAvailability.AVAILABLE_IN_SPECIALIZED_STORAGE;
-      } else {
-        return VectorizedOperationAvailability.NOT_AVAILABLE;
-      }
-    }
-  }
-
   /** {@see resolveUnaryOp} for explanations. */
   private VectorizedOperationAvailability resolveBinaryOp(String name) {
     // Shortcut - if the storage is already specialized - we prefer it.
@@ -218,22 +187,6 @@ private VectorizedOperationAvailability resolveTernaryOp(String name) {
     }
   }
 
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return resolveUnaryOp(name) != VectorizedOperationAvailability.NOT_AVAILABLE;
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    if (resolveUnaryOp(name) == VectorizedOperationAvailability.AVAILABLE_IN_SPECIALIZED_STORAGE) {
-      return getInferredStorage().runVectorizedUnaryMap(name, problemAggregator);
-    } else {
-      // Even if the operation is not available, we rely on super to report an exception.
-      return super.runVectorizedUnaryMap(name, problemAggregator);
-    }
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String name) {
     return resolveBinaryOp(name) != VectorizedOperationAvailability.NOT_AVAILABLE;
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java
index 61309b8ed427..aa728f3b8f34 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/MixedStorageFacade.java
@@ -26,11 +26,6 @@ public int size() {
     return underlyingStorage.size();
   }
 
-  @Override
-  public int countMissing() {
-    return underlyingStorage.countMissing();
-  }
-
   @Override
   public StorageType getType() {
     return AnyObjectType.INSTANCE;
@@ -47,8 +42,8 @@ public StorageType inferPreciseTypeShrunk() {
   }
 
   @Override
-  public boolean isNa(long idx) {
-    return underlyingStorage.isNa(idx);
+  public boolean isNothing(long idx) {
+    return underlyingStorage.isNothing(idx);
   }
 
   @Override
@@ -56,17 +51,6 @@ public Object getItemBoxed(int idx) {
     return underlyingStorage.getItemBoxed(idx);
   }
 
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return underlyingStorage.isUnaryOpVectorized(name);
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return underlyingStorage.runVectorizedUnaryMap(name, problemAggregator);
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String name) {
     return underlyingStorage.isBinaryOpVectorized(name);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ObjectStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ObjectStorage.java
index 014e9ea110ca..6830baca374a 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ObjectStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ObjectStorage.java
@@ -1,12 +1,8 @@
 package org.enso.table.data.column.storage;
 
-import java.util.BitSet;
-import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
 import org.enso.table.data.column.storage.type.AnyObjectType;
 import org.enso.table.data.column.storage.type.StorageType;
-import org.graalvm.polyglot.Context;
 
 /** A column storing arbitrary Java objects. */
 public sealed class ObjectStorage extends SpecializedStorage<Object> permits MixedStorage {
@@ -35,23 +31,6 @@ public StorageType getType() {
 
   public static <T, S extends SpecializedStorage<T>> MapOperationStorage<T, S> buildObjectOps() {
     MapOperationStorage<T, S> ops = new MapOperationStorage<>();
-    ops.add(
-        new UnaryMapOperation<>(Maps.IS_NOTHING) {
-          @Override
-          protected BoolStorage runUnaryMap(
-              S storage, MapOperationProblemAggregator problemAggregator) {
-            Context context = Context.getCurrent();
-            BitSet r = new BitSet();
-            for (int i = 0; i < storage.size; i++) {
-              if (storage.data[i] == null) {
-                r.set(i);
-              }
-
-              context.safepoint();
-            }
-            return new BoolStorage(r, new BitSet(), storage.size, false);
-          }
-        });
     return ops;
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
index 6d557c40fc51..53e057963939 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
@@ -3,6 +3,7 @@
 import java.util.AbstractList;
 import java.util.BitSet;
 import java.util.List;
+import org.enso.table.data.column.operation.CountNothing;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.storage.type.StorageType;
@@ -42,23 +43,6 @@ public int size() {
     return size;
   }
 
-  /**
-   * @inheritDoc
-   */
-  @Override
-  public int countMissing() {
-    Context context = Context.getCurrent();
-    int count = 0;
-    for (int i = 0; i < size; i++) {
-      if (data[i] == null) {
-        count += 1;
-      }
-
-      context.safepoint();
-    }
-    return count;
-  }
-
   /**
    * @param idx an index
    * @return the data item contained at the given index.
@@ -72,25 +56,11 @@ public T getItemBoxed(int idx) {
     return data[idx];
   }
 
-  /**
-   * @inheritDoc
-   */
   @Override
-  public boolean isNa(long idx) {
+  public boolean isNothing(long idx) {
     return data[(int) idx] == null;
   }
 
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return ops.isSupportedUnary(name);
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return ops.runUnaryMap(name, this, problemAggregator);
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String name) {
     return ops.isSupportedBinary(name);
@@ -172,7 +142,7 @@ public Storage<?> appendNulls(int count) {
 
   @Override
   public Storage<T> fillMissingFromPrevious(BoolStorage missingIndicator) {
-    if (missingIndicator != null && missingIndicator.countMissing() > 0) {
+    if (missingIndicator != null && CountNothing.anyNothing(missingIndicator)) {
       throw new IllegalArgumentException(
           "Missing indicator must not contain missing values itself.");
     }
@@ -184,7 +154,7 @@ public Storage<T> fillMissingFromPrevious(BoolStorage missingIndicator) {
     Context context = Context.getCurrent();
     for (int i = 0; i < size; i++) {
       boolean isCurrentValueMissing =
-          missingIndicator == null ? isNa(i) : missingIndicator.getItem(i);
+          missingIndicator == null ? isNothing(i) : missingIndicator.getItem(i);
       if (!isCurrentValueMissing) {
         previous = data[i];
         hasPrevious = true;
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
index 7e0404d02549..cde141dcd583 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import org.enso.base.polyglot.Polyglot_Utils;
 import org.enso.table.data.column.builder.Builder;
 import org.enso.table.data.column.operation.cast.CastProblemAggregator;
@@ -20,7 +19,7 @@
 import org.graalvm.polyglot.Value;
 
 /** An abstract representation of a data column. */
-public abstract class Storage<T> {
+public abstract class Storage<T> implements ColumnStorage {
   /** A constant representing the index of a missing value in a column. */
   public static final int NOT_FOUND_INDEX = -1;
 
@@ -29,14 +28,12 @@ public abstract class Storage<T> {
    */
   public abstract int size();
 
-  /**
-   * @return the number of NA elements in this column
-   */
-  public abstract int countMissing();
+  @Override
+  public long getSize() {
+    return size();
+  }
 
-  /**
-   * @return the type tag of this column's storage.
-   */
+  @Override
   public abstract StorageType getType();
 
   /**
@@ -70,13 +67,8 @@ public Storage<?> tryGettingMoreSpecializedStorage() {
     return this;
   }
 
-  /**
-   * Checks whether the value at {@code idx} is missing.
-   *
-   * @param idx the index to check.
-   * @return whether or not the value is missing.
-   */
-  public abstract boolean isNa(long idx);
+  @Override
+  public abstract boolean isNothing(long index);
 
   /**
    * Returns a boxed representation of an item. Missing values are denoted with null.
@@ -99,45 +91,18 @@ public static final class Maps {
     public static final String DIV = "/";
     public static final String MOD = "%";
     public static final String POWER = "^";
-    public static final String TRUNCATE = "truncate";
-    public static final String CEIL = "ceil";
-    public static final String FLOOR = "floor";
     public static final String ROUND = "round";
-    public static final String NOT = "not";
     public static final String AND = "&&";
     public static final String OR = "||";
-    public static final String IS_NOTHING = "is_nothing";
-    public static final String IS_NAN = "is_nan";
-    public static final String IS_INFINITE = "is_infinite";
-    public static final String IS_EMPTY = "is_empty";
     public static final String STARTS_WITH = "starts_with";
     public static final String ENDS_WITH = "ends_with";
-    public static final String TEXT_LENGTH = "text_length";
     public static final String TEXT_LEFT = "text_left";
     public static final String TEXT_RIGHT = "text_right";
     public static final String CONTAINS = "contains";
     public static final String LIKE = "like";
     public static final String IS_IN = "is_in";
-    public static final String YEAR = "year";
-    public static final String QUARTER = "quarter";
-    public static final String MONTH = "month";
-    public static final String WEEK = "week";
-    public static final String DAY = "day";
-    public static final String HOUR = "hour";
-    public static final String MINUTE = "minute";
-    public static final String SECOND = "second";
-    public static final String MILLISECOND = "millisecond";
-    public static final String MICROSECOND = "microsecond";
-    public static final String NANOSECOND = "nanosecond";
   }
 
-  /* Specifies if the given unary operation has a vectorized implementation available for this storage.*/
-  public abstract boolean isUnaryOpVectorized(String name);
-
-  /** Runs a vectorized unary operation. */
-  public abstract Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator);
-
   /* Specifies if the given binary operation has a vectorized implementation available for this storage.*/
   public abstract boolean isBinaryOpVectorized(String name);
 
@@ -166,37 +131,6 @@ public Storage<?> runVectorizedTernaryMap(
   public abstract Storage<?> runVectorizedZip(
       String name, Storage<?> argument, MapOperationProblemAggregator problemAggregator);
 
-  /**
-   * Runs a unary function on each non-null element in this storage.
-   *
-   * @param function the function to run.
-   * @param skipNa whether rows containing missing values should be passed to the function.
-   * @param expectedResultType the expected type for the result storage; it is ignored if the
-   *     operation is vectorized
-   * @return the result of running the function on each row
-   */
-  public final Storage<?> unaryMap(
-      Function<Object, Value> function,
-      boolean skipNa,
-      StorageType expectedResultType,
-      ProblemAggregator problemAggregator) {
-    Builder storageBuilder = Builder.getForType(expectedResultType, size(), problemAggregator);
-    Context context = Context.getCurrent();
-    for (int i = 0; i < size(); i++) {
-      Object it = getItemBoxed(i);
-      if (skipNa && it == null) {
-        storageBuilder.appendNulls(1);
-      } else {
-        Value result = function.apply(it);
-        Object converted = Polyglot_Utils.convertPolyglotValue(result);
-        storageBuilder.appendNoGrow(converted);
-      }
-
-      context.safepoint();
-    }
-    return storageBuilder.seal();
-  }
-
   /**
    * Runs a 2-argument function on each element in this storage.
    *
@@ -269,34 +203,6 @@ public final Storage<?> zip(
     return storageBuilder.seal();
   }
 
-  /**
-   * Runs a unary operation.
-   *
-   * <p>If a vectorized implementation is available, it is used, otherwise the fallback is used.
-   *
-   * @param name the name of the vectorized operation
-   * @param problemAggregator the problem aggregator to use for the vectorized implementation
-   * @param fallback the fallback Enso function to run if vectorized implementation is not
-   *     available; it should never raise dataflow errors.
-   * @param skipNa whether rows containing missing values should be passed to the fallback function.
-   * @param expectedResultType the expected type for the result storage; it is ignored if the
-   *     operation is vectorized
-   * @return the result of running the operation on each row
-   */
-  public final Storage<?> vectorizedOrFallbackUnaryMap(
-      String name,
-      MapOperationProblemAggregator problemAggregator,
-      Function<Object, Value> fallback,
-      boolean skipNa,
-      StorageType expectedResultType) {
-    if (isUnaryOpVectorized(name)) {
-      return runVectorizedUnaryMap(name, problemAggregator);
-    } else {
-      checkFallback(fallback, expectedResultType, name);
-      return unaryMap(fallback, skipNa, expectedResultType, problemAggregator);
-    }
-  }
-
   /**
    * Runs a binary operation with a scalar argument.
    *
@@ -448,7 +354,7 @@ public Storage<?> fillMissingFrom(
     var builder = Builder.getForType(commonType, size(), problemAggregator);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isNa(i)) {
+      if (isNothing(i)) {
         builder.appendNoGrow(other.getItemBoxed(i));
       } else {
         builder.appendNoGrow(getItemBoxed(i));
@@ -532,4 +438,9 @@ public final Storage<?> cast(
     StorageConverter<?> converter = StorageConverter.fromStorageType(targetType);
     return converter.cast(this, castProblemAggregator);
   }
+
+  @Override
+  public Object getItemAsObject(long index) {
+    return getItemBoxed((int) index);
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
index 5baefb27e782..4a77e2104d0a 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
@@ -5,8 +5,6 @@
 import org.enso.table.data.column.operation.map.BinaryMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
-import org.enso.table.data.column.operation.map.numeric.UnaryIntegerOp;
 import org.enso.table.data.column.operation.map.text.LikeOp;
 import org.enso.table.data.column.operation.map.text.StringBooleanOp;
 import org.enso.table.data.column.operation.map.text.StringIsInOp;
@@ -56,18 +54,18 @@ public BoolStorage runBinaryMap(
               Object arg,
               MapOperationProblemAggregator problemAggregator) {
             BitSet r = new BitSet();
-            BitSet missing = new BitSet();
+            BitSet isNothing = new BitSet();
             Context context = Context.getCurrent();
             for (int i = 0; i < storage.size(); i++) {
               if (storage.getItem(i) == null || arg == null) {
-                missing.set(i);
+                isNothing.set(i);
               } else if (arg instanceof String s && Text_Utils.equals(storage.getItem(i), s)) {
                 r.set(i);
               }
 
               context.safepoint();
             }
-            return new BoolStorage(r, missing, storage.size(), false);
+            return new BoolStorage(r, isNothing, storage.size(), false);
           }
 
           @Override
@@ -76,11 +74,11 @@ public BoolStorage runZip(
               Storage<?> arg,
               MapOperationProblemAggregator problemAggregator) {
             BitSet r = new BitSet();
-            BitSet missing = new BitSet();
+            BitSet isNothing = new BitSet();
             Context context = Context.getCurrent();
             for (int i = 0; i < storage.size(); i++) {
-              if (storage.getItem(i) == null || i >= arg.size() || arg.isNa(i)) {
-                missing.set(i);
+              if (storage.getItem(i) == null || i >= arg.size() || arg.isNothing(i)) {
+                isNothing.set(i);
               } else if (arg.getItemBoxed(i) instanceof String s
                   && Text_Utils.equals(storage.getItem(i), s)) {
                 r.set(i);
@@ -88,25 +86,7 @@ public BoolStorage runZip(
 
               context.safepoint();
             }
-            return new BoolStorage(r, missing, storage.size(), false);
-          }
-        });
-    t.add(
-        new UnaryMapOperation<>(Maps.IS_EMPTY) {
-          @Override
-          protected BoolStorage runUnaryMap(
-              SpecializedStorage<String> storage, MapOperationProblemAggregator problemAggregator) {
-            BitSet r = new BitSet();
-            Context context = Context.getCurrent();
-            for (int i = 0; i < storage.size; i++) {
-              String s = storage.data[i];
-              if (s == null || s.isEmpty()) {
-                r.set(i);
-              }
-
-              context.safepoint();
-            }
-            return new BoolStorage(r, new BitSet(), storage.size, false);
+            return new BoolStorage(r, isNothing, storage.size(), false);
           }
         });
     t.add(
@@ -123,13 +103,6 @@ protected boolean doString(String a, String b) {
             return Text_Utils.ends_with(a, b);
           }
         });
-    t.add(
-        new UnaryIntegerOp<>(Maps.TEXT_LENGTH) {
-          @Override
-          protected long doOperation(String a) {
-            return Text_Utils.grapheme_length(a);
-          }
-        });
     t.add(
         new StringLongToStringOp(Maps.TEXT_LEFT) {
           @Override
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/ValueIsNothingException.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ValueIsNothingException.java
new file mode 100644
index 000000000000..ce3739faf903
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/ValueIsNothingException.java
@@ -0,0 +1,9 @@
+package org.enso.table.data.column.storage;
+
+public class ValueIsNothingException extends RuntimeException {
+  public final long index;
+
+  public ValueIsNothingException(long index) {
+    this.index = index;
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
index f51233108be7..e2aa509c5fb0 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDate;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.datetime.DatePartExtractors;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
@@ -22,11 +21,6 @@ private static MapOperationStorage<LocalDate, SpecializedStorage<LocalDate>> bui
     MapOperationStorage<LocalDate, SpecializedStorage<LocalDate>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(LocalDate.class));
-    t.add(DatePartExtractors.year());
-    t.add(DatePartExtractors.quarter());
-    t.add(DatePartExtractors.month());
-    t.add(DatePartExtractors.week());
-    t.add(DatePartExtractors.day());
     return t;
   }
 
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
index 7725947e4e9c..4023104c4cc6 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
@@ -6,7 +6,6 @@
 import org.enso.table.data.column.builder.ObjectBuilder;
 import org.enso.table.data.column.operation.map.GenericBinaryObjectMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.datetime.DatePartExtractors;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
@@ -26,17 +25,6 @@ private static MapOperationStorage<ZonedDateTime, SpecializedStorage<ZonedDateTi
     MapOperationStorage<ZonedDateTime, SpecializedStorage<ZonedDateTime>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(ZonedDateTime.class));
-    t.add(DatePartExtractors.year());
-    t.add(DatePartExtractors.quarter());
-    t.add(DatePartExtractors.month());
-    t.add(DatePartExtractors.week());
-    t.add(DatePartExtractors.day());
-    t.add(DatePartExtractors.hour());
-    t.add(DatePartExtractors.minute());
-    t.add(DatePartExtractors.second());
-    t.add(DatePartExtractors.millisecond());
-    t.add(DatePartExtractors.microsecond());
-    t.add(DatePartExtractors.nanosecond());
     t.add(
         new GenericBinaryObjectMapOperation<
             ZonedDateTime, SpecializedStorage<ZonedDateTime>, Duration>(
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
index 6005db934cb4..90ac18225037 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
@@ -6,7 +6,6 @@
 import org.enso.table.data.column.builder.ObjectBuilder;
 import org.enso.table.data.column.operation.map.GenericBinaryObjectMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.datetime.DatePartExtractors;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
@@ -26,12 +25,6 @@ private static MapOperationStorage<LocalTime, SpecializedStorage<LocalTime>> bui
     MapOperationStorage<LocalTime, SpecializedStorage<LocalTime>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(LocalTime.class));
-    t.add(DatePartExtractors.hour());
-    t.add(DatePartExtractors.minute());
-    t.add(DatePartExtractors.second());
-    t.add(DatePartExtractors.millisecond());
-    t.add(DatePartExtractors.microsecond());
-    t.add(DatePartExtractors.nanosecond());
     t.add(
         new GenericBinaryObjectMapOperation<LocalTime, SpecializedStorage<LocalTime>, Duration>(
             Maps.SUB, LocalTime.class, TimeOfDayStorage.class) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
index 9012612ede23..bd4717dc334e 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
@@ -3,9 +3,7 @@
 import java.util.BitSet;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
 import org.enso.table.data.column.operation.map.numeric.LongRoundOp;
-import org.enso.table.data.column.operation.map.numeric.UnaryLongToLongOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.DivideOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.ModOp;
@@ -18,30 +16,17 @@
 import org.enso.table.data.column.operation.map.numeric.comparisons.LessComparison;
 import org.enso.table.data.column.operation.map.numeric.comparisons.LessOrEqualComparison;
 import org.enso.table.data.column.operation.map.numeric.isin.LongIsInOp;
-import org.enso.table.data.column.storage.BoolStorage;
-import org.enso.table.data.column.storage.Storage;
+import org.enso.table.data.column.storage.*;
 import org.enso.table.data.column.storage.type.IntegerType;
 import org.enso.table.data.column.storage.type.StorageType;
 import org.graalvm.polyglot.Context;
 
-public abstract class AbstractLongStorage extends NumericStorage<Long> {
+public abstract class AbstractLongStorage extends NumericStorage<Long>
+    implements ColumnLongStorage, ColumnStorageWithNothingMap {
   public abstract long getItem(int idx);
 
-  public abstract BitSet getIsMissing();
-
   private static final MapOperationStorage<Long, AbstractLongStorage> ops = buildOps();
 
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return ops.isSupportedUnary(name);
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return ops.runUnaryMap(name, this, problemAggregator);
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String name) {
     return ops.isSupportedBinary(name);
@@ -97,7 +82,7 @@ public StorageType inferPreciseTypeShrunk() {
     int n = size();
     Context context = Context.getCurrent();
     for (int i = 0; i < n; i++) {
-      if (isNa(i)) {
+      if (isNothing(i)) {
         continue;
       }
 
@@ -124,59 +109,12 @@ private static MapOperationStorage<Long, AbstractLongStorage> buildOps() {
         .add(new DivideOp<>())
         .add(new ModOp<>())
         .add(new PowerOp<>())
-        .add(
-            new UnaryLongToLongOp(Maps.TRUNCATE) {
-              @Override
-              protected long doOperation(long a) {
-                return a;
-              }
-            })
-        .add(
-            new UnaryLongToLongOp(Maps.CEIL) {
-              @Override
-              protected long doOperation(long a) {
-                return a;
-              }
-            })
-        .add(
-            new UnaryLongToLongOp(Maps.FLOOR) {
-              @Override
-              protected long doOperation(long a) {
-                return a;
-              }
-            })
         .add(new LongRoundOp(Maps.ROUND))
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
         .add(new GreaterOrEqualComparison<>())
         .add(new GreaterComparison<>())
-        .add(
-            new UnaryMapOperation<>(Storage.Maps.IS_NOTHING) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  AbstractLongStorage storage, MapOperationProblemAggregator problemAggregator) {
-                return new BoolStorage(storage.getIsMissing(), new BitSet(), storage.size(), false);
-              }
-            })
-        .add(
-            new UnaryMapOperation<>(Storage.Maps.IS_NAN) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  AbstractLongStorage storage, MapOperationProblemAggregator problemAggregator) {
-                BitSet isNaN = new BitSet();
-                return new BoolStorage(isNaN, storage.getIsMissing(), storage.size(), false);
-              }
-            })
-        .add(
-            new UnaryMapOperation<>(Storage.Maps.IS_INFINITE) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  AbstractLongStorage storage, MapOperationProblemAggregator problemAggregator) {
-                BitSet isInfinite = new BitSet();
-                return new BoolStorage(isInfinite, storage.getIsMissing(), storage.size(), false);
-              }
-            })
         .add(new LongIsInOp());
     return ops;
   }
@@ -190,18 +128,18 @@ public AbstractLongStorage fillMissingFromPrevious(BoolStorage missingIndicator)
 
     int n = size();
     long[] newData = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long previousValue = 0;
     boolean hasPrevious = false;
 
     Context context = Context.getCurrent();
     for (int i = 0; i < n; i++) {
-      boolean isCurrentMissing = isNa(i);
-      if (isCurrentMissing) {
+      boolean isCurrentNothing = isNothing(i);
+      if (isCurrentNothing) {
         if (hasPrevious) {
           newData[i] = previousValue;
         } else {
-          newMissing.set(i);
+          newIsNothing.set(i);
         }
       } else {
         long currentValue = getItem(i);
@@ -213,7 +151,7 @@ public AbstractLongStorage fillMissingFromPrevious(BoolStorage missingIndicator)
       context.safepoint();
     }
 
-    return new LongStorage(newData, n, newMissing, getType());
+    return new LongStorage(newData, n, newIsNothing, getType());
   }
 
   /**
@@ -222,4 +160,15 @@ public AbstractLongStorage fillMissingFromPrevious(BoolStorage missingIndicator)
    * <p>Ideally it should avoid copying the data, if it's possible.
    */
   public abstract AbstractLongStorage widen(IntegerType widerType);
+
+  @Override
+  public long get(long index) throws ValueIsNothingException {
+    if (isNothing(index)) {
+      throw new ValueIsNothingException(index);
+    }
+    return getItem((int) index);
+  }
+
+  @Override
+  public abstract BitSet getIsNothingMap();
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedLongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedLongStorage.java
index 37bedc257c6c..774397997bd2 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedLongStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedLongStorage.java
@@ -27,18 +27,13 @@ public int size() {
     return size;
   }
 
-  @Override
-  public int countMissing() {
-    return 0;
-  }
-
   @Override
   public IntegerType getType() {
     return IntegerType.INT_64;
   }
 
   @Override
-  public boolean isNa(long idx) {
+  public boolean isNothing(long idx) {
     return false;
   }
 
@@ -56,14 +51,9 @@ public long getItem(int idx) {
     return computeItem(idx);
   }
 
-  @Override
-  public BitSet getIsMissing() {
-    return EMPTY;
-  }
-
   @Override
   public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long[] newData = new long[newLength];
     int resIx = 0;
     Context context = Context.getCurrent();
@@ -74,25 +64,25 @@ public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
 
       context.safepoint();
     }
-    return new LongStorage(newData, newLength, newMissing, getType());
+    return new LongStorage(newData, newLength, newIsNothing, getType());
   }
 
   @Override
   public Storage<Long> applyMask(OrderMask mask) {
     long[] newData = new long[mask.length()];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < mask.length(); i++) {
       int position = mask.get(i);
       if (position == Storage.NOT_FOUND_INDEX) {
-        newMissing.set(i);
+        newIsNothing.set(i);
       } else {
         newData[i] = getItem(position);
       }
 
       context.safepoint();
     }
-    return new LongStorage(newData, newData.length, newMissing, getType());
+    return new LongStorage(newData, newData.length, newIsNothing, getType());
   }
 
   @Override
@@ -112,7 +102,7 @@ public Storage<Long> slice(int offset, int limit) {
   public Storage<Long> slice(List<SliceRange> ranges) {
     int newSize = SliceRange.totalLength(ranges);
     long[] newData = new long[newSize];
-    BitSet newMissing = new BitSet(newSize);
+    BitSet newIsNothing = new BitSet(newSize);
     int offset = 0;
     Context context = Context.getCurrent();
     for (SliceRange range : ranges) {
@@ -125,7 +115,7 @@ public Storage<Long> slice(List<SliceRange> ranges) {
       offset += length;
     }
 
-    return new LongStorage(newData, newSize, newMissing, getType());
+    return new LongStorage(newData, newSize, newIsNothing, getType());
   }
 
   private static final BitSet EMPTY = new BitSet();
@@ -153,4 +143,9 @@ protected Long computeItem(int idx) {
       }
     };
   }
+
+  @Override
+  public BitSet getIsNothingMap() {
+    return EMPTY;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedNullableLongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedNullableLongStorage.java
index 0e72870ef197..8cbefdc2525f 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedNullableLongStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/ComputedNullableLongStorage.java
@@ -17,6 +17,8 @@
 public abstract class ComputedNullableLongStorage extends AbstractLongStorage {
   protected final int size;
 
+  protected BitSet isNothing = null;
+
   protected abstract Long computeItem(int idx);
 
   protected ComputedNullableLongStorage(int size) {
@@ -28,18 +30,13 @@ public int size() {
     return size;
   }
 
-  @Override
-  public int countMissing() {
-    return 0;
-  }
-
   @Override
   public IntegerType getType() {
     return IntegerType.INT_64;
   }
 
   @Override
-  public boolean isNa(long idx) {
+  public boolean isNothing(long idx) {
     if (idx < 0 || idx >= size) {
       throw new IndexOutOfBoundsException(
           "Index " + idx + " is out of bounds for range of length " + size + ".");
@@ -63,22 +60,26 @@ public long getItem(int idx) {
   }
 
   @Override
-  public BitSet getIsMissing() {
-    BitSet missing = new BitSet();
-    Context context = Context.getCurrent();
-    for (int i = 0; i < size; i++) {
-      if (computeItem(i) == null) {
-        missing.set(i);
-      }
+  public BitSet getIsNothingMap() {
+    if (isNothing == null) {
+      // Only compute once as needed.
+      BitSet newIsNothing = new BitSet();
+      Context context = Context.getCurrent();
+      for (int i = 0; i < size; i++) {
+        if (computeItem(i) == null) {
+          newIsNothing.set(i);
+        }
 
-      context.safepoint();
+        context.safepoint();
+      }
+      isNothing = newIsNothing;
     }
-    return missing;
+    return isNothing;
   }
 
   @Override
   public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long[] newData = new long[newLength];
     int resIx = 0;
     Context context = Context.getCurrent();
@@ -86,7 +87,7 @@ public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
       if (filterMask.get(i)) {
         Long item = computeItem(i);
         if (item == null) {
-          newMissing.set(resIx++);
+          newIsNothing.set(resIx++);
         } else {
           newData[resIx++] = item;
         }
@@ -94,22 +95,22 @@ public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
 
       context.safepoint();
     }
-    return new LongStorage(newData, newLength, newMissing, getType());
+    return new LongStorage(newData, newLength, newIsNothing, getType());
   }
 
   @Override
   public Storage<Long> applyMask(OrderMask mask) {
     long[] newData = new long[mask.length()];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < mask.length(); i++) {
       int position = mask.get(i);
       if (position == Storage.NOT_FOUND_INDEX) {
-        newMissing.set(i);
+        newIsNothing.set(i);
       } else {
         Long item = computeItem(position);
         if (item == null) {
-          newMissing.set(i);
+          newIsNothing.set(i);
         } else {
           newData[i] = item;
         }
@@ -117,32 +118,32 @@ public Storage<Long> applyMask(OrderMask mask) {
 
       context.safepoint();
     }
-    return new LongStorage(newData, newData.length, newMissing, getType());
+    return new LongStorage(newData, newData.length, newIsNothing, getType());
   }
 
   @Override
   public Storage<Long> slice(int offset, int limit) {
     int newSize = Math.min(size - offset, limit);
     long[] newData = new long[newSize];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < newSize; i++) {
       Long item = computeItem(offset + i);
       if (item == null) {
-        newMissing.set(i);
+        newIsNothing.set(i);
       } else {
         newData[i] = item;
       }
       context.safepoint();
     }
-    return new LongStorage(newData, newSize, newMissing, getType());
+    return new LongStorage(newData, newSize, newIsNothing, getType());
   }
 
   @Override
   public Storage<Long> slice(List<SliceRange> ranges) {
     int newSize = SliceRange.totalLength(ranges);
     long[] newData = new long[newSize];
-    BitSet newMissing = new BitSet(newSize);
+    BitSet newIsNothing = new BitSet(newSize);
     int offset = 0;
     Context context = Context.getCurrent();
     for (SliceRange range : ranges) {
@@ -151,7 +152,7 @@ public Storage<Long> slice(List<SliceRange> ranges) {
       for (int i = 0; i < length; i++) {
         Long item = computeItem(rangeStart + i);
         if (item == null) {
-          newMissing.set(offset + i);
+          newIsNothing.set(offset + i);
         } else {
           newData[offset + i] = item;
         }
@@ -160,7 +161,7 @@ public Storage<Long> slice(List<SliceRange> ranges) {
       offset += length;
     }
 
-    return new LongStorage(newData, newSize, newMissing, getType());
+    return new LongStorage(newData, newSize, newIsNothing, getType());
   }
 
   @Override
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
index dbed265ee67b..01f92b3b18df 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
@@ -6,8 +6,6 @@
 import org.enso.table.data.column.builder.NumericBuilder;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
-import org.enso.table.data.column.operation.map.UnaryMapOperation;
-import org.enso.table.data.column.operation.map.numeric.DoubleLongMapOpWithSpecialNumericHandling;
 import org.enso.table.data.column.operation.map.numeric.DoubleRoundOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.DivideOp;
@@ -23,6 +21,7 @@
 import org.enso.table.data.column.operation.map.numeric.helpers.DoubleArrayAdapter;
 import org.enso.table.data.column.operation.map.numeric.isin.DoubleIsInOp;
 import org.enso.table.data.column.storage.BoolStorage;
+import org.enso.table.data.column.storage.ColumnStorageWithNothingMap;
 import org.enso.table.data.column.storage.Storage;
 import org.enso.table.data.column.storage.type.FloatType;
 import org.enso.table.data.column.storage.type.IntegerType;
@@ -35,28 +34,29 @@
 import org.graalvm.polyglot.Value;
 
 /** A column containing floating point numbers. */
-public final class DoubleStorage extends NumericStorage<Double> implements DoubleArrayAdapter {
+public final class DoubleStorage extends NumericStorage<Double>
+    implements DoubleArrayAdapter, ColumnStorageWithNothingMap {
   private final long[] data;
-  private final BitSet isMissing;
+  private final BitSet isNothing;
   private final int size;
   private static final MapOperationStorage<Double, DoubleStorage> ops = buildOps();
 
   /**
    * @param data the underlying data
    * @param size the number of items stored
-   * @param isMissing a bit set denoting at index {@code i} whether the value at index {@code i} is
-   *     missing.
+   * @param isNothing a bit set denoting at index {@code i} whether the value at index {@code i} is
+   *     Nothing.
    */
-  public DoubleStorage(long[] data, int size, BitSet isMissing) {
+  public DoubleStorage(long[] data, int size, BitSet isNothing) {
     this.data = data;
-    this.isMissing = isMissing;
+    this.isNothing = isNothing;
     this.size = size;
   }
 
   public static DoubleStorage makeEmpty(int size) {
-    BitSet isMissing = new BitSet(size);
-    isMissing.set(0, size);
-    return new DoubleStorage(new long[0], size, isMissing);
+    BitSet isNothing = new BitSet(size);
+    isNothing.set(0, size);
+    return new DoubleStorage(new long[0], size, isNothing);
   }
 
   /**
@@ -67,14 +67,6 @@ public int size() {
     return size;
   }
 
-  /**
-   * @inheritDoc
-   */
-  @Override
-  public int countMissing() {
-    return isMissing.cardinality();
-  }
-
   /**
    * @param idx an index
    * @return the data item contained at the given index.
@@ -85,18 +77,7 @@ public double getItem(long idx) {
 
   @Override
   public Double getItemBoxed(int idx) {
-    return isMissing.get(idx) ? null : Double.longBitsToDouble(data[idx]);
-  }
-
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return ops.isSupportedUnary(name);
-  }
-
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return ops.runUnaryMap(name, this, problemAggregator);
+    return isNothing.get(idx) ? null : Double.longBitsToDouble(data[idx]);
   }
 
   /**
@@ -111,8 +92,8 @@ public StorageType getType() {
    * @inheritDoc
    */
   @Override
-  public boolean isNa(long idx) {
-    return isMissing.get((int) idx);
+  public boolean isNothing(long idx) {
+    return isNothing.get((int) idx);
   }
 
   @Override
@@ -120,11 +101,6 @@ public double getItemAsDouble(int i) {
     return Double.longBitsToDouble(data[i]);
   }
 
-  @Override
-  public boolean isNa(int i) {
-    return isMissing.get(i);
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String op) {
     return ops.isSupportedBinary(op);
@@ -161,7 +137,7 @@ private Storage<?> fillMissingDouble(double arg, ProblemAggregator problemAggreg
     long rawArg = Double.doubleToRawLongBits(arg);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendRawNoGrow(rawArg);
       } else {
         builder.appendRawNoGrow(data[i]);
@@ -177,7 +153,7 @@ private Storage<?> fillMissingBigInteger(BigInteger arg, ProblemAggregator probl
     final var builder = NumericBuilder.createDoubleBuilder(size(), problemAggregator);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendBigInteger(arg);
       } else {
         builder.appendRawNoGrow(data[i]);
@@ -193,7 +169,7 @@ private Storage<?> fillMissingLong(long arg, ProblemAggregator problemAggregator
     final var builder = NumericBuilder.createDoubleBuilder(size(), problemAggregator);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendLong(arg);
       } else {
         builder.appendRawNoGrow(data[i]);
@@ -229,18 +205,18 @@ public DoubleStorage fillMissingFromPrevious(BoolStorage missingIndicator) {
 
     int n = size();
     long[] newData = new long[n];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long previousValueRaw = 0;
     boolean hasPrevious = false;
 
     Context context = Context.getCurrent();
     for (int i = 0; i < n; i++) {
-      boolean isCurrentMissing = isNa(i);
+      boolean isCurrentMissing = isNothing(i);
       if (isCurrentMissing) {
         if (hasPrevious) {
           newData[i] = previousValueRaw;
         } else {
-          newMissing.set(i);
+          newIsNothing.set(i);
         }
       } else {
         long currentValueRaw = data[i];
@@ -252,19 +228,19 @@ public DoubleStorage fillMissingFromPrevious(BoolStorage missingIndicator) {
       context.safepoint();
     }
 
-    return new DoubleStorage(newData, n, newMissing);
+    return new DoubleStorage(newData, n, newIsNothing);
   }
 
   @Override
   public Storage<Double> applyFilter(BitSet filterMask, int newLength) {
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long[] newData = new long[newLength];
     int resIx = 0;
     Context context = Context.getCurrent();
     for (int i = 0; i < size; i++) {
       if (filterMask.get(i)) {
-        if (isMissing.get(i)) {
-          newMissing.set(resIx++);
+        if (isNothing.get(i)) {
+          newIsNothing.set(resIx++);
         } else {
           newData[resIx++] = data[i];
         }
@@ -272,29 +248,25 @@ public Storage<Double> applyFilter(BitSet filterMask, int newLength) {
 
       context.safepoint();
     }
-    return new DoubleStorage(newData, newLength, newMissing);
+    return new DoubleStorage(newData, newLength, newIsNothing);
   }
 
   @Override
   public Storage<Double> applyMask(OrderMask mask) {
     long[] newData = new long[mask.length()];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < mask.length(); i++) {
       int position = mask.get(i);
-      if (position == Storage.NOT_FOUND_INDEX || isMissing.get(position)) {
-        newMissing.set(i);
+      if (position == Storage.NOT_FOUND_INDEX || isNothing.get(position)) {
+        newIsNothing.set(i);
       } else {
         newData[i] = data[position];
       }
 
       context.safepoint();
     }
-    return new DoubleStorage(newData, newData.length, newMissing);
-  }
-
-  public BitSet getIsMissing() {
-    return isMissing;
+    return new DoubleStorage(newData, newData.length, newIsNothing);
   }
 
   public long[] getRawData() {
@@ -309,75 +281,12 @@ private static MapOperationStorage<Double, DoubleStorage> buildOps() {
         .add(new DivideOp<>())
         .add(new ModOp<>())
         .add(new PowerOp<>())
-        .add(
-            new DoubleLongMapOpWithSpecialNumericHandling(Maps.TRUNCATE) {
-              @Override
-              protected long doOperation(double a) {
-                return (long) a;
-              }
-            })
-        .add(
-            new DoubleLongMapOpWithSpecialNumericHandling(Maps.CEIL) {
-              @Override
-              protected long doOperation(double a) {
-                return (long) Math.ceil(a);
-              }
-            })
-        .add(
-            new DoubleLongMapOpWithSpecialNumericHandling(Maps.FLOOR) {
-              @Override
-              protected long doOperation(double a) {
-                return (long) Math.floor(a);
-              }
-            })
         .add(new DoubleRoundOp(Maps.ROUND))
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
         .add(new GreaterOrEqualComparison<>())
         .add(new GreaterComparison<>())
-        .add(
-            new UnaryMapOperation<>(Maps.IS_NOTHING) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  DoubleStorage storage, MapOperationProblemAggregator problemAggregator) {
-                return new BoolStorage(storage.isMissing, new BitSet(), storage.size, false);
-              }
-            })
-        .add(
-            new UnaryMapOperation<>(Maps.IS_NAN) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  DoubleStorage storage, MapOperationProblemAggregator problemAggregator) {
-                BitSet nans = new BitSet();
-                Context context = Context.getCurrent();
-                for (int i = 0; i < storage.size; i++) {
-                  if (!storage.isNa(i) && Double.isNaN(storage.getItemAsDouble(i))) {
-                    nans.set(i);
-                  }
-
-                  context.safepoint();
-                }
-                return new BoolStorage(nans, storage.isMissing, storage.size, false);
-              }
-            })
-        .add(
-            new UnaryMapOperation<>(Maps.IS_INFINITE) {
-              @Override
-              public BoolStorage runUnaryMap(
-                  DoubleStorage storage, MapOperationProblemAggregator problemAggregator) {
-                BitSet infintes = new BitSet();
-                Context context = Context.getCurrent();
-                for (int i = 0; i < storage.size; i++) {
-                  if (!storage.isNa(i) && Double.isInfinite(storage.getItemAsDouble(i))) {
-                    infintes.set(i);
-                  }
-
-                  context.safepoint();
-                }
-                return new BoolStorage(infintes, storage.isMissing, storage.size, false);
-              }
-            })
         .add(new DoubleIsInOp());
     return ops;
   }
@@ -387,38 +296,38 @@ public Storage<Double> slice(int offset, int limit) {
     int newSize = Math.min(size - offset, limit);
     long[] newData = new long[newSize];
     System.arraycopy(data, offset, newData, 0, newSize);
-    BitSet newMask = isMissing.get(offset, offset + limit);
+    BitSet newMask = isNothing.get(offset, offset + limit);
     return new DoubleStorage(newData, newSize, newMask);
   }
 
   @Override
   public DoubleStorage appendNulls(int count) {
-    BitSet newMissing = BitSets.makeDuplicate(isMissing);
-    newMissing.set(size, size + count);
+    BitSet newIsNothing = BitSets.makeDuplicate(isNothing);
+    newIsNothing.set(size, size + count);
 
     long[] newData = new long[size + count];
     System.arraycopy(data, 0, newData, 0, size);
-    return new DoubleStorage(newData, size + count, newMissing);
+    return new DoubleStorage(newData, size + count, newIsNothing);
   }
 
   @Override
   public Storage<Double> slice(List<SliceRange> ranges) {
     int newSize = SliceRange.totalLength(ranges);
     long[] newData = new long[newSize];
-    BitSet newMissing = new BitSet(newSize);
+    BitSet newIsNothing = new BitSet(newSize);
     int offset = 0;
     Context context = Context.getCurrent();
     for (SliceRange range : ranges) {
       int length = range.end() - range.start();
       System.arraycopy(data, range.start(), newData, offset, length);
       for (int i = 0; i < length; ++i) {
-        newMissing.set(offset + i, isMissing.get(range.start() + i));
+        newIsNothing.set(offset + i, isNothing.get(range.start() + i));
         context.safepoint();
       }
       offset += length;
     }
 
-    return new DoubleStorage(newData, newSize, newMissing);
+    return new DoubleStorage(newData, newSize, newIsNothing);
   }
 
   private StorageType inferredType = null;
@@ -429,7 +338,7 @@ public StorageType inferPreciseType() {
       boolean areAllIntegers = true;
       int visitedNumbers = 0;
       for (int i = 0; i < size; i++) {
-        if (isMissing.get(i)) {
+        if (isNothing.get(i)) {
           continue;
         }
 
@@ -470,7 +379,7 @@ private StorageType findSmallestIntegerTypeThatFits() {
         new ComputedNullableLongStorage(size) {
           @Override
           protected Long computeItem(int idx) {
-            if (parent.isNa(idx)) {
+            if (parent.isNothing(idx)) {
               return null;
             }
 
@@ -484,4 +393,9 @@ protected Long computeItem(int idx) {
     // And rely on its shrinking logic.
     return longAdapter.inferPreciseTypeShrunk();
   }
+
+  @Override
+  public BitSet getIsNothingMap() {
+    return isNothing;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongStorage.java
index 637dd6d239ca..a30332d64c0b 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/LongStorage.java
@@ -22,7 +22,7 @@ public final class LongStorage extends AbstractLongStorage {
   // for more compact storage and more efficient handling of smaller integers; for now we will be
   // handling this just by checking the bounds
   private final long[] data;
-  private final BitSet isMissing;
+  private final BitSet isNothing;
   private final int size;
 
   private final IntegerType type;
@@ -30,13 +30,13 @@ public final class LongStorage extends AbstractLongStorage {
   /**
    * @param data the underlying data
    * @param size the number of items stored
-   * @param isMissing a bit set denoting at index {@code i} whether or not the value at index {@code
+   * @param isNothing a bit set denoting at index {@code i} whether or not the value at index {@code
    *     i} is missing.
    * @param type the type specifying the bit-width of integers that are allowed in this storage
    */
-  public LongStorage(long[] data, int size, BitSet isMissing, IntegerType type) {
+  public LongStorage(long[] data, int size, BitSet isNothing, IntegerType type) {
     this.data = data;
-    this.isMissing = isMissing;
+    this.isNothing = isNothing;
     this.size = size;
     this.type = type;
   }
@@ -46,9 +46,9 @@ public static LongStorage fromArray(long[] data) {
   }
 
   public static LongStorage makeEmpty(int size, IntegerType type) {
-    BitSet isMissing = new BitSet(size);
-    isMissing.set(0, size);
-    return new LongStorage(new long[0], size, isMissing, type);
+    BitSet isNothing = new BitSet(size);
+    isNothing.set(0, size);
+    return new LongStorage(new long[0], size, isNothing, type);
   }
 
   public LongStorage(long[] data, IntegerType type) {
@@ -63,14 +63,6 @@ public int size() {
     return size;
   }
 
-  /**
-   * @inheritDoc
-   */
-  @Override
-  public int countMissing() {
-    return isMissing.cardinality();
-  }
-
   /**
    * @param idx an index
    * @return the data item contained at the given index.
@@ -81,7 +73,7 @@ public long getItem(int idx) {
 
   @Override
   public Long getItemBoxed(int idx) {
-    return isMissing.get(idx) ? null : data[idx];
+    return isNothing.get(idx) ? null : data[idx];
   }
 
   /**
@@ -96,8 +88,8 @@ public IntegerType getType() {
    * @inheritDoc
    */
   @Override
-  public boolean isNa(long idx) {
-    return isMissing.get((int) idx);
+  public boolean isNothing(long idx) {
+    return isNothing.get((int) idx);
   }
 
   private Storage<?> fillMissingDouble(double arg, ProblemAggregator problemAggregator) {
@@ -105,7 +97,7 @@ private Storage<?> fillMissingDouble(double arg, ProblemAggregator problemAggreg
     long rawArg = Double.doubleToRawLongBits(arg);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendRawNoGrow(rawArg);
       } else {
         double coerced = data[i];
@@ -123,7 +115,7 @@ private Storage<?> fillMissingLong(long arg, ProblemAggregator problemAggregator
         NumericBuilder.createLongBuilder(size, IntegerType.INT_64, problemAggregator);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendRawNoGrow(arg);
       } else {
         builder.appendRawNoGrow(data[i]);
@@ -140,7 +132,7 @@ private Storage<?> fillMissingBigInteger(
     final var builder = new BigIntegerBuilder(size, problemAggregator);
     Context context = Context.getCurrent();
     for (int i = 0; i < size(); i++) {
-      if (isMissing.get(i)) {
+      if (isNothing.get(i)) {
         builder.appendRawNoGrow(bigInteger);
       } else {
         builder.appendRawNoGrow(BigInteger.valueOf(data[i]));
@@ -170,14 +162,14 @@ public Storage<?> fillMissing(
 
   @Override
   public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     long[] newData = new long[newLength];
     int resIx = 0;
     Context context = Context.getCurrent();
     for (int i = 0; i < size; i++) {
       if (filterMask.get(i)) {
-        if (isMissing.get(i)) {
-          newMissing.set(resIx++);
+        if (isNothing.get(i)) {
+          newIsNothing.set(resIx++);
         } else {
           newData[resIx++] = data[i];
         }
@@ -185,30 +177,30 @@ public Storage<Long> applyFilter(BitSet filterMask, int newLength) {
 
       context.safepoint();
     }
-    return new LongStorage(newData, newLength, newMissing, type);
+    return new LongStorage(newData, newLength, newIsNothing, type);
   }
 
   @Override
   public Storage<Long> applyMask(OrderMask mask) {
     long[] newData = new long[mask.length()];
-    BitSet newMissing = new BitSet();
+    BitSet newIsNothing = new BitSet();
     Context context = Context.getCurrent();
     for (int i = 0; i < mask.length(); i++) {
       int position = mask.get(i);
-      if (position == Storage.NOT_FOUND_INDEX || isMissing.get(position)) {
-        newMissing.set(i);
+      if (position == Storage.NOT_FOUND_INDEX || isNothing.get(position)) {
+        newIsNothing.set(i);
       } else {
         newData[i] = data[position];
       }
 
       context.safepoint();
     }
-    return new LongStorage(newData, newData.length, newMissing, type);
+    return new LongStorage(newData, newData.length, newIsNothing, type);
   }
 
   @Override
-  public BitSet getIsMissing() {
-    return isMissing;
+  public BitSet getIsNothingMap() {
+    return isNothing;
   }
 
   public long[] getRawData() {
@@ -220,43 +212,43 @@ public LongStorage slice(int offset, int limit) {
     int newSize = Math.min(size - offset, limit);
     long[] newData = new long[newSize];
     System.arraycopy(data, offset, newData, 0, newSize);
-    BitSet newMask = isMissing.get(offset, offset + limit);
+    BitSet newMask = isNothing.get(offset, offset + limit);
     return new LongStorage(newData, newSize, newMask, type);
   }
 
   @Override
   public LongStorage appendNulls(int count) {
-    BitSet newMissing = BitSets.makeDuplicate(isMissing);
-    newMissing.set(size, size + count);
+    BitSet newIsNothing = BitSets.makeDuplicate(isNothing);
+    newIsNothing.set(size, size + count);
     long[] newData = new long[size + count];
     System.arraycopy(data, 0, newData, 0, size);
-    return new LongStorage(newData, size + count, newMissing, type);
+    return new LongStorage(newData, size + count, newIsNothing, type);
   }
 
   @Override
   public LongStorage slice(List<SliceRange> ranges) {
     int newSize = SliceRange.totalLength(ranges);
     long[] newData = new long[newSize];
-    BitSet newMissing = new BitSet(newSize);
+    BitSet newIsNothing = new BitSet(newSize);
     int offset = 0;
     Context context = Context.getCurrent();
     for (SliceRange range : ranges) {
       int length = range.end() - range.start();
       System.arraycopy(data, range.start(), newData, offset, length);
       for (int i = 0; i < length; ++i) {
-        newMissing.set(offset + i, isMissing.get(range.start() + i));
+        newIsNothing.set(offset + i, isNothing.get(range.start() + i));
         context.safepoint();
       }
       offset += length;
     }
 
-    return new LongStorage(newData, newSize, newMissing, type);
+    return new LongStorage(newData, newSize, newIsNothing, type);
   }
 
   /** Widening to a bigger type can be done without copying the data. */
   @Override
   public LongStorage widen(IntegerType widerType) {
     assert widerType.fits(type);
-    return new LongStorage(data, size, isMissing, widerType);
+    return new LongStorage(data, size, isNothing, widerType);
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/AnyObjectType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/AnyObjectType.java
index 7fd899541fcf..cbda0c39a214 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/AnyObjectType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/AnyObjectType.java
@@ -2,4 +2,19 @@
 
 public record AnyObjectType() implements StorageType {
   public static final AnyObjectType INSTANCE = new AnyObjectType();
+
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BigIntegerType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BigIntegerType.java
index f0d89d9ff40b..a54170085776 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BigIntegerType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BigIntegerType.java
@@ -2,4 +2,19 @@
 
 public record BigIntegerType() implements StorageType {
   public static final BigIntegerType INSTANCE = new BigIntegerType();
+
+  @Override
+  public boolean isNumeric() {
+    return true;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BooleanType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BooleanType.java
index 541d952fb786..302072b95f37 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BooleanType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/BooleanType.java
@@ -2,4 +2,19 @@
 
 public record BooleanType() implements StorageType {
   public static final BooleanType INSTANCE = new BooleanType();
+
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateTimeType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateTimeType.java
index 0f9410ecd888..5086091b8d8d 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateTimeType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateTimeType.java
@@ -2,4 +2,19 @@
 
 public record DateTimeType() implements StorageType {
   public static final DateTimeType INSTANCE = new DateTimeType();
+
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return true;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return true;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateType.java
index fa0b319a7473..f24076291e58 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/DateType.java
@@ -2,4 +2,19 @@
 
 public record DateType() implements StorageType {
   public static final DateType INSTANCE = new DateType();
+
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return true;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/FloatType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/FloatType.java
index 03b78186bbe4..a148dc3b1c1d 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/FloatType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/FloatType.java
@@ -8,4 +8,19 @@ public record FloatType(Bits bits) implements StorageType {
       throw new IllegalArgumentException("Only 64-bit floats are currently supported.");
     }
   }
+
+  @Override
+  public boolean isNumeric() {
+    return true;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/IntegerType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/IntegerType.java
index 63dd72b09617..5167e4a0cdc0 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/IntegerType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/IntegerType.java
@@ -17,6 +17,21 @@ public static IntegerType create(Bits bits) {
     };
   }
 
+  @Override
+  public boolean isNumeric() {
+    return true;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
+
   public long getMaxValue() {
     return switch (bits) {
       case BITS_8 -> Byte.MAX_VALUE;
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/StorageType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/StorageType.java
index f64a438c52c9..69ef0e264146 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/StorageType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/StorageType.java
@@ -50,4 +50,19 @@ static StorageType forBoxedItem(Object item) {
       default -> AnyObjectType.INSTANCE;
     };
   }
+
+  /**
+   * @return true if the storage type is numeric.
+   */
+  boolean isNumeric();
+
+  /**
+   * @return true if the storage type has a date part.
+   */
+  boolean hasDate();
+
+  /**
+   * @return true if the storage type has a time part.
+   */
+  boolean hasTime();
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TextType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TextType.java
index 3c6e8b76af5d..7544d5c2de4b 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TextType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TextType.java
@@ -10,6 +10,21 @@ public record TextType(long maxLength, boolean fixedLength) implements StorageTy
     }
   }
 
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return false;
+  }
+
   public static final TextType VARIABLE_LENGTH = new TextType(-1, false);
 
   public static TextType fixedLength(long length) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TimeOfDayType.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TimeOfDayType.java
index e1196cea49cd..b0fa0e9845da 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TimeOfDayType.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/type/TimeOfDayType.java
@@ -2,4 +2,19 @@
 
 public record TimeOfDayType() implements StorageType {
   public static final TimeOfDayType INSTANCE = new TimeOfDayType();
+
+  @Override
+  public boolean isNumeric() {
+    return false;
+  }
+
+  @Override
+  public boolean hasDate() {
+    return false;
+  }
+
+  @Override
+  public boolean hasTime() {
+    return true;
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueIndex.java b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueIndex.java
index 7500ba691892..827726cdab5e 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueIndex.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueIndex.java
@@ -14,6 +14,7 @@
 import org.enso.base.text.TextFoldingStrategy;
 import org.enso.table.aggregations.Aggregator;
 import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.CountNothing;
 import org.enso.table.data.column.storage.Storage;
 import org.enso.table.data.table.Column;
 import org.enso.table.data.table.Table;
@@ -166,7 +167,7 @@ public int size() {
    */
   public KeyType findAnyNullKey() {
     for (Column c : keyColumns) {
-      boolean containsNulls = c.getStorage().countMissing() > 0;
+      boolean containsNulls = CountNothing.anyNothing(c.getStorage());
       if (containsNulls) {
         for (KeyType key : locs.keySet()) {
           if (key.hasAnyNulls()) {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java
index e8ad683ac08c..db594a201637 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/index/MultiValueKeyBase.java
@@ -50,7 +50,7 @@ public int getNumberOfColumns() {
   /** Checks if all cells in the current row are missing. */
   public boolean areAllNull() {
     for (Storage<?> storage : storages) {
-      if (!storage.isNa(rowIndex)) {
+      if (!storage.isNothing(rowIndex)) {
         return false;
       }
     }
@@ -60,7 +60,7 @@ public boolean areAllNull() {
   /** Checks if any cells in the current row are missing. */
   public boolean hasAnyNulls() {
     for (Storage<?> storage : storages) {
-      if (storage.isNa(rowIndex)) {
+      if (storage.isNothing(rowIndex)) {
         return true;
       }
     }
diff --git a/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java b/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java
index d8fcc66815e7..51691148abc1 100644
--- a/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java
+++ b/std-bits/table/src/main/java/org/enso/table/parsing/TypeInferringParser.java
@@ -1,6 +1,7 @@
 package org.enso.table.parsing;
 
 import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.CountNothing;
 import org.enso.table.data.column.storage.Storage;
 import org.enso.table.parsing.problems.CommonParseProblemAggregator;
 import org.enso.table.parsing.problems.ParseProblemAggregator;
@@ -43,8 +44,7 @@ public Storage<?> parseColumn(
       Storage<String> sourceStorage, CommonParseProblemAggregator problemAggregator) {
     // If there are no values, the Auto parser would guess some random type (the first one that is
     // checked). Instead, we just return the empty column unchanged.
-    boolean hasNoValues =
-        (sourceStorage.size() == 0) || (sourceStorage.countMissing() == sourceStorage.size());
+    boolean hasNoValues = (sourceStorage.size() == 0) || CountNothing.allNothing(sourceStorage);
     if (hasNoValues) {
       return fallbackParser.parseColumn(sourceStorage, problemAggregator);
     }
diff --git a/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java b/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java
index 963e68070907..cfc2c698c707 100644
--- a/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java
+++ b/std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java
@@ -489,7 +489,7 @@ private static CellStyle getDateTimeStyle(Workbook workbook, String format) {
 
   private static void writeValueToCell(Cell cell, int j, Storage<?> storage, Workbook workbook)
       throws IllegalStateException {
-    if (storage.isNa(j)) {
+    if (storage.isNothing(j)) {
       cell.setBlank();
     } else if (storage instanceof DoubleStorage doubleStorage) {
       cell.setCellValue(doubleStorage.getItemAsDouble(j));
diff --git a/test/AWS_Tests/src/Main.enso b/test/AWS_Tests/src/Main.enso
index cd6ca27e9b92..ce5fe7875ca6 100644
--- a/test/AWS_Tests/src/Main.enso
+++ b/test/AWS_Tests/src/Main.enso
@@ -4,7 +4,7 @@ from Standard.Test import all
 
 import project.S3_Spec
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         S3_Spec.add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/AWS_Tests/src/S3_Spec.enso b/test/AWS_Tests/src/S3_Spec.enso
index 348110169b51..d0f63db85320 100644
--- a/test/AWS_Tests/src/S3_Spec.enso
+++ b/test/AWS_Tests/src/S3_Spec.enso
@@ -8,6 +8,7 @@ import Standard.Base.Runtime.Ref.Ref
 
 from Standard.AWS import S3, S3_File, AWS_Credential
 from Standard.AWS.Errors import AWS_SDK_Error, More_Records_Available, S3_Error, S3_Bucket_Not_Found, S3_Key_Not_Found
+import Standard.AWS.Internal.S3_Path.S3_Path
 
 # Needed for custom formats test
 from Standard.Table import Table, Excel, Worksheet
@@ -29,20 +30,77 @@ add_specs suite_builder =
     api_pending = if Environment.get "AWS_ACCESS_KEY_ID" . is_nothing then "No Access Key found." else Nothing
     cloud_setup = Cloud_Tests_Setup.prepare
 
-    suite_builder.group "S3.parse_uri" group_builder->
+    root = S3_File.new "s3://"+bucket_name+"/"
+    hello_txt = S3_File.new "s3://"+bucket_name+"/examples/folder 2/hello.txt"
+
+    suite_builder.group "S3 Path handling" group_builder->
         group_builder.specify "parse bucket only uris" <|
-            S3.parse_uri "s3://" . should_equal (Pair.new "" "")
-            S3.parse_uri "s3://asda" . should_equal (Pair.new "asda" "")
-            S3.parse_uri "s3://banana/" . should_equal (Pair.new "banana" "")
+            S3_Path.parse "s3://" . should_equal (S3_Path.Value "" "")
+            S3_Path.parse "s3://asda" . should_equal (S3_Path.Value "asda" "")
+            S3_Path.parse "s3://banana/" . should_equal (S3_Path.Value "banana" "")
 
         group_builder.specify "parse full paths uris" <|
-            S3.parse_uri "s3://banana/apple" . should_equal (Pair.new "banana" "apple")
-            S3.parse_uri "s3://banana/apple/orange" . should_equal (Pair.new "banana" "apple/orange")
+            S3_Path.parse "s3://banana/apple" . should_equal (S3_Path.Value "banana" "apple")
+            S3_Path.parse "s3://banana/apple/orange" . should_equal (S3_Path.Value "banana" "apple/orange")
 
         group_builder.specify "reject invalid urils" <|
-            S3.parse_uri "asda" . should_equal Nothing
-            S3.parse_uri "s3:///" . should_equal Nothing
-            S3.parse_uri "s3:///apple/orange" . should_equal Nothing
+            S3_Path.parse "asda" . should_fail_with Illegal_Argument
+            S3_Path.parse "s3:///" . should_fail_with Illegal_Argument
+            S3_Path.parse "s3:///apple/orange" . should_fail_with Illegal_Argument
+
+        group_builder.specify "should support path traversal using `/` and `parent`" <|
+            root.name . should_equal "/"
+            (root / "foo") . path . should_equal "s3://"+bucket_name+"/foo"
+            (root / "foo") . name . should_equal "foo"
+
+            (root / "foo/").is_directory . should_be_true
+            (root / "foo/" / "bar") . path . should_equal "s3://"+bucket_name+"/foo/bar"
+            # It also works if the trailing slash is missing:
+            (root / "foo" / "bar") . path . should_equal "s3://"+bucket_name+"/foo/bar"
+            # Even though it is not normally treated as directory:
+            (root / "foo").is_directory . should_be_false
+
+            (root / "foo/../././bar") . should_equal (root / "bar")
+            err = (root / "..")
+            err.should_fail_with S3_Error
+            err.catch.to_display_text . should_contain "Cannot move above root"
+
+            hello_txt.parent.parent.parent . should_equal root
+            (hello_txt / "../../..") . should_equal root
+            hello_txt.parent . should_equal (root / "examples/" / "folder 2/")
+            hello_txt.parent.is_directory . should_be_true
+
+            # Leading slash will mean starting back from bucket root:
+            (hello_txt / "/foo/bar") . should_equal (root / "foo/bar")
+            (hello_txt / "/") . should_equal root
+            (hello_txt / "////") . should_equal root
+
+        group_builder.specify "should support path traversal using `join`" <|
+            root.join ["foo", "bar"] . path . should_equal "s3://"+bucket_name+"/foo/bar"
+            root.join ["a/b/", "c/d", "e"] . path . should_equal "s3://"+bucket_name+"/a/b/c/d/e"
+            hello_txt.join ["../..", ".."] . should_equal root
+            hello_txt.join ["..", "a", ".."] . should_equal hello_txt.parent
+
+        group_builder.specify "will normalize paths upon parsing" <|
+            S3_File.new "s3://bucketA/a/b/c/../././d/../e" . path . should_equal "s3://bucketA/a/b/e"
+
+        group_builder.specify "should allow to check if one path is inside of another" <|
+            hello_txt.is_descendant_of root . should_be_true
+            root.is_descendant_of hello_txt . should_be_false
+
+            # A file or directory is not a descendant of itself:
+            hello_txt.is_descendant_of hello_txt . should_be_false
+            root.is_descendant_of root . should_be_false
+            hello_txt.parent.is_descendant_of hello_txt.parent . should_be_false
+
+            hello_txt.is_descendant_of hello_txt.parent . should_be_true
+            (root / "foo").is_descendant_of root . should_be_true
+            (root / "foo/bar").is_descendant_of (root / "foo/") . should_be_true
+            (root / "foo/bar").is_descendant_of (root / "fo/") . should_be_false
+            (root / "foo/bar").is_descendant_of (root / "fo") . should_be_false
+
+            # Correct path but different bucket will yield false:
+            (S3_File.new "s3://bucketA/foo/bar").is_descendant_of (S3_File.new "s3://bucketB/foo/") . should_be_false
 
     suite_builder.group "S3.list_buckets" pending=api_pending group_builder->
         group_builder.specify "should be able to list buckets" <|
@@ -142,8 +200,6 @@ add_specs suite_builder =
             S3.get_object bucket_name object_name credentials=(AWS_Credential.Profile "NoSuchProfile") . should_fail_with AWS_SDK_Error
 
     suite_builder.group "S3_File reading" pending=api_pending group_builder->
-        root = S3_File.new "s3://"+bucket_name+"/"
-        hello_txt = S3_File.new "s3://"+bucket_name+"/examples/folder 2/hello.txt"
         group_builder.specify "should be able to list the bucket's root directory" <|
             r = root.list
             r.should_succeed
@@ -156,6 +212,10 @@ add_specs suite_builder =
             r.should_be_a Vector
             r.at 0 . get "name" . should_equal "Green St Green"
 
+        group_builder.specify "should work with Data.read" <|
+            r = Data.read "s3://"+bucket_name+"/examples/folder 2/hello.txt"
+            r.should_equal "Hello WORLD!"
+
         group_builder.specify "should be able to read a file as bytes or stream" <|
             bytes = hello_txt.read_bytes
             bytes.should_equal "Hello WORLD!".utf_8
@@ -165,27 +225,9 @@ add_specs suite_builder =
 
             bytes2.should_equal bytes
 
-        group_builder.specify "should support path traversal" <|
-            root.prefix . should_equal ""
-            (root / "foo") . prefix . should_equal "foo"
-            (root / "foo") . path . should_equal "s3://"+bucket_name+"/foo"
-            (root / "foo/" / "bar") . prefix . should_equal "foo/bar"
-            (root / "foo/" / "bar") . path . should_equal "s3://"+bucket_name+"/foo/bar"
-
-            # If `foo` lacks a `/` it is treated as a directory and cannot have children.
-            (root / "foo" / "bar") . should_fail_with S3_Error
-
-            hello_txt.parent.parent.parent . should_equal root
-            hello_txt.parent . should_equal (root / "examples/" / "folder 2/")
-            hello_txt.parent.is_directory . should_be_true
-
-            hello_txt.is_descendant_of root . should_be_true
-            root.is_descendant_of hello_txt . should_be_false
-
         group_builder.specify "returns a valid name for files and 'directories'" <|
             hello_txt.name . should_equal "hello.txt"
-            # For the root, the name is the bucket name:
-            root.name . should_equal "enso-data-samples"
+            root.name . should_equal "/"
 
             (root / "foo/" / "bar") . name . should_equal "bar"
 
@@ -194,12 +236,18 @@ add_specs suite_builder =
 
         group_builder.specify "should be able to read file metadata" <|
             root.exists . should_be_true
-            hello_txt.exists . should_be_true
             root.is_directory . should_be_true
-            hello_txt.is_directory . should_be_false
             root.is_regular_file . should_be_false
+
+            hello_txt.exists . should_be_true
+            hello_txt.is_directory . should_be_false
             hello_txt.is_regular_file . should_be_true
 
+            parent = hello_txt.parent
+            parent.exists . should_be_true
+            parent.is_directory . should_be_true
+            parent.is_regular_file . should_be_false
+
             root.extension . should_fail_with S3_Error
             hello_txt.extension . should_equal ".txt"
 
@@ -211,17 +259,18 @@ add_specs suite_builder =
             # AWS S3 does not record creation time, only last modified time.
             hello_txt.creation_time . should_fail_with S3_Error
 
+    writable_root = S3_File.new "s3://"+writable_bucket_name+"/"
+    my_writable_dir = writable_root / "test-run-"+(Date_Time.now.format "yyyy-MM-dd_HHmmss.fV" . replace "/" "|")+"/"
+    delete_on_panic file ~action =
+        handler caught_panic =
+            file.delete
+            Panic.throw caught_panic
+        Panic.catch Any action handler
+    delete_afterwards file ~action =
+        Panic.with_finalizer file.delete action
+
     suite_builder.group "S3_File writing" pending=api_pending group_builder->
-        writable_root = S3_File.new "s3://"+writable_bucket_name+"/"
-        my_writable_dir = writable_root / "test-run-"+(Date_Time.now.format "yyyy-MM-dd_HHmmss.fV")+"/"
         assert my_writable_dir.is_directory
-        delete_on_panic file ~action =
-            handler caught_panic =
-                file.delete
-                Panic.throw caught_panic
-            Panic.catch Any action handler
-        delete_afterwards file ~action =
-            Panic.with_finalizer file.delete action
 
         group_builder.specify "should be able to write and delete a new file" <|
             new_file = my_writable_dir / "new_file1.txt"
@@ -234,6 +283,11 @@ add_specs suite_builder =
 
                 my_writable_dir.list . should_contain new_file
 
+                # But the file cannot be listed:
+                err = new_file.list
+                err.should_fail_with S3_Error
+                err.catch.to_display_text . should_contain "Only folders can be listed"
+
             new_file.delete . should_succeed
 
             with_retries <|
@@ -268,43 +322,6 @@ add_specs suite_builder =
                 r.catch.to_display_text . should_contain "already exists"
                 r.catch.to_display_text . should_contain "new_file-exists.txt"
 
-        group_builder.specify "should be able to copy a file" <|
-            base_file = my_writable_dir / "new_file-for-copy.txt"
-            "Hello".write base_file . should_succeed
-            delete_afterwards base_file <|
-                base_file.read . should_equal "Hello"
-
-                dest_file = my_writable_dir / "new_file-the-copy-2.txt"
-                base_file.copy_to dest_file . should_succeed
-                delete_afterwards dest_file <|
-                    dest_file.read . should_equal "Hello"
-
-        group_builder.specify "will fail if source file does not exist" <|
-            base_file = my_writable_dir / "nonexistent-src-file.txt"
-            dest_file = my_writable_dir / "nonexistent-dest-file.txt"
-            r = base_file.copy_to dest_file
-            r.should_fail_with File_Error
-            r.catch.should_be_a File_Error.Not_Found
-            dest_file.exists . should_be_false
-
-        group_builder.specify "respects replace_existing setting in copy_to" <|
-            base_file = my_writable_dir / "new_file-for-copy-2.txt"
-            "Hello".write base_file . should_succeed
-            delete_afterwards base_file <|
-                dest_file = my_writable_dir / "new_file-dest.txt"
-                "World".write dest_file . should_succeed
-                delete_afterwards dest_file <|
-                    r1 = base_file.copy_to dest_file replace_existing=False
-                    r1.should_fail_with File_Error
-                    r1.catch.should_be_a File_Error.Already_Exists
-                    r1.catch.to_display_text . should_contain "already exists"
-
-                    dest_file.read . should_equal "World"
-
-                    # Now allow the overwrite:
-                    r2 = base_file.copy_to dest_file replace_existing=True
-                    r2.should_equal dest_file
-
         group_builder.specify "should be able to write a raw stream" <|
             new_file = my_writable_dir / "new_file-stream.txt"
             r = new_file.with_output_stream [File_Access.Write] stream->
@@ -348,7 +365,7 @@ add_specs suite_builder =
             bak_file.exists.should_be_false
 
             "version1".write my_file . should_succeed
-            delete_afterwards my_file <|
+            delete_on_panic my_file <|
                 my_file.read . should_equal "version1"
                 bak_file.exists . should_be_false
 
@@ -371,6 +388,14 @@ add_specs suite_builder =
                     parent_dir = my_file.parent
                     parent_dir.list . should_contain_the_same_elements_as [my_file, bak_file]
 
+                    # If the original file is deleted and the backup file remains, the original file should _not_ count as existing (this used to fail).
+                    my_file.delete
+                    bak_file.exists . should_be_true
+                    my_file.exists . should_be_false
+                    files = my_file.parent.list
+                    files . should_contain bak_file
+                    files . should_not_contain my_file
+
         group_builder.specify "should fail cleanly if Auto_Detect fails to detect a format" <|
             weird_ext = my_writable_dir / "weird-ext.unknown"
             "Hello".write weird_ext . should_succeed
@@ -432,14 +457,94 @@ add_specs suite_builder =
 
         group_builder.specify "should fail to delete a file if the Output context is not enabled" <|
             Context.Output.with_disabled <|
-                new_file = my_writable_dir / "new_file-ctx.txt"
-                new_file.delete . should_fail_with Forbidden_Operation
+                hello_txt = S3_File.new "s3://"+bucket_name+"/examples/folder 2/hello.txt"
+                hello_txt.delete . should_fail_with Forbidden_Operation
+
+        group_builder.specify "may fail with Not_Found if the file to delete does not exist, even if the Output Context is disabled" <|
+            Context.Output.with_disabled <|
+                new_file = my_writable_dir / "nonexistent-file.txt"
+                r = new_file.delete
+                r.should_fail_with File_Error
+                r.catch.should_be_a File_Error.Not_Found
 
-        group_builder.specify "does not raise an exception if the file being deleted did not exist in the first place" <|
+        group_builder.specify "does not raise an exception if the file being `delete_if_exists` did not exist in the first place" <|
             new_file = my_writable_dir / "nonexistent-file.txt"
-            new_file.delete . should_succeed
+            new_file.delete_if_exists . should_succeed
+
+        group_builder.specify "fails if the file being deleted did not exist" <|
+            new_file = my_writable_dir / "nonexistent-file2.txt"
+            r = new_file.delete
+            r.should_fail_with File_Error
+            r.catch.should_be_a File_Error.Not_Found
+
+    sources = [my_writable_dir / "source1.txt", File.create_temporary_file "source2" ".txt"]
+    destinations = [my_writable_dir / "destination1.txt", File.create_temporary_file "destination2" ".txt"]
+    sources.each source_file-> destinations.each destination_file-> if source_file.is_a File && destination_file.is_a File then Nothing else
+        src_typ = Meta.type_of source_file . to_display_text
+        dest_typ = Meta.type_of destination_file . to_display_text
+        suite_builder.group "("+src_typ+" -> "+dest_typ+") copying/moving" pending=api_pending group_builder->
+            group_builder.teardown <|
+                source_file.delete_if_exists
+                destination_file.delete_if_exists
+
+            group_builder.specify "should be able to copy files" <|
+                "Hello".write source_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+                destination_file.delete_if_exists
+
+                source_file.copy_to destination_file . should_succeed
+                destination_file.read . should_equal "Hello"
+                source_file.exists . should_be_true
+
+            group_builder.specify "should be able to move files" <|
+                "Hello".write source_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+                destination_file.delete_if_exists
+
+                source_file.move_to destination_file . should_succeed
+                destination_file.read . should_equal "Hello"
+                source_file.exists . should_be_false
+
+            group_builder.specify "should fail if the source file does not exist" <|
+                source_file.delete_if_exists
+                destination_file.delete_if_exists
+
+                r = source_file.copy_to destination_file
+                r.should_fail_with File_Error
+                r.catch.should_be_a File_Error.Not_Found
+
+                r2 = source_file.move_to destination_file
+                r2.should_fail_with File_Error
+                r2.catch.should_be_a File_Error.Not_Found
+
+                destination_file.exists . should_be_false
+
+            group_builder.specify "should fail to copy/move a file if it exists and replace_existing=False" <|
+                "Hello".write source_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+                "World".write destination_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+
+                r = source_file.copy_to destination_file
+                r.should_fail_with File_Error
+                r.catch.should_be_a File_Error.Already_Exists
+
+                r2 = source_file.move_to destination_file
+                r2.should_fail_with File_Error
+                r2.catch.should_be_a File_Error.Already_Exists
+
+                destination_file.read . should_equal "World"
+
+            group_builder.specify "should overwrite existing destination in copy/move if replace_existing=True" <|
+                "Hello".write source_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+                "World".write destination_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+
+                source_file.copy_to destination_file replace_existing=True . should_succeed
+                destination_file.read . should_equal "Hello"
+                source_file.exists . should_be_true
+
+                "FooBar".write source_file on_existing_file=Existing_File_Behavior.Overwrite . should_succeed
+                source_file.move_to destination_file replace_existing=True . should_succeed
+                destination_file.read . should_equal "FooBar"
+                source_file.exists . should_be_false
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java b/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java
index d24a9de876df..865f111c439c 100644
--- a/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java
+++ b/test/Base_Tests/polyglot-sources/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java
@@ -34,18 +34,13 @@ public int size() {
     return array.length;
   }
 
-  @Override
-  public int countMissing() {
-    return 0;
-  }
-
   @Override
   public StorageType getType() {
     return IntegerType.INT_64;
   }
 
   @Override
-  public boolean isNa(long idx) {
+  public boolean isNothing(long idx) {
     checkIndex(idx);
     return false;
   }
@@ -60,22 +55,11 @@ public Long getItemBoxed(int idx) {
     return getItem(idx);
   }
 
-  @Override
-  public boolean isUnaryOpVectorized(String name) {
-    return false;
-  }
-
   @Override
   public boolean isBinaryOpVectorized(String name) {
     return false;
   }
 
-  @Override
-  public Storage<?> runVectorizedUnaryMap(
-      String name, MapOperationProblemAggregator problemAggregator) {
-    return null;
-  }
-
   @Override
   public Storage<?> runVectorizedBinaryMap(
       String name, Object argument, MapOperationProblemAggregator problemAggregator) {
diff --git a/test/Base_Tests/src/Data/Array_Polyglot_Spec.enso b/test/Base_Tests/src/Data/Array_Polyglot_Spec.enso
index 2f654d430802..646df4426633 100644
--- a/test/Base_Tests/src/Data/Array_Polyglot_Spec.enso
+++ b/test/Base_Tests/src/Data/Array_Polyglot_Spec.enso
@@ -63,10 +63,10 @@ add_specs suite_builder =
             (enso_vector.at 2).should_equal Nothing
             enso_vector.should_equal js_arr
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 foreign js data = """
diff --git a/test/Base_Tests/src/Data/Array_Proxy_Spec.enso b/test/Base_Tests/src/Data/Array_Proxy_Spec.enso
index 90a49c202522..769b9f9008ed 100644
--- a/test/Base_Tests/src/Data/Array_Proxy_Spec.enso
+++ b/test/Base_Tests/src/Data/Array_Proxy_Spec.enso
@@ -55,8 +55,8 @@ add_specs suite_builder =
             Meta.get_qualified_type_name proxy . should_equal "Standard.Base.Data.Array.Array"
             Meta.get_simple_type_name proxy . should_equal "Array"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Array_Spec.enso b/test/Base_Tests/src/Data/Array_Spec.enso
index fb4945687b49..74799f5f26fc 100644
--- a/test/Base_Tests/src/Data/Array_Spec.enso
+++ b/test/Base_Tests/src/Data/Array_Spec.enso
@@ -73,8 +73,8 @@ add_specs suite_builder =
             sorted.to_text . should_equal "[10, 32, 46, 98, 101, 106, 106, 115, 117, 117]"
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Base_64_Spec.enso b/test/Base_Tests/src/Data/Base_64_Spec.enso
index 22b664e6e3b2..2963b071a161 100644
--- a/test/Base_Tests/src/Data/Base_64_Spec.enso
+++ b/test/Base_Tests/src/Data/Base_64_Spec.enso
@@ -7,10 +7,10 @@ from Standard.Test import all
 
 polyglot java import java.lang.String as Java_String
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Base_Tests/src/Data/Bool_Spec.enso b/test/Base_Tests/src/Data/Bool_Spec.enso
index bfdb49343d8a..ef7346c93720 100644
--- a/test/Base_Tests/src/Data/Bool_Spec.enso
+++ b/test/Base_Tests/src/Data/Bool_Spec.enso
@@ -49,8 +49,8 @@ add_specs suite_builder =
             (1 == 0) && "foo" . should_equal False
             (1 == 1) && "foo" . should_equal "foo"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Function_Spec.enso b/test/Base_Tests/src/Data/Function_Spec.enso
index 8acf7f2d3719..0c56a458ace9 100644
--- a/test/Base_Tests/src/Data/Function_Spec.enso
+++ b/test/Base_Tests/src/Data/Function_Spec.enso
@@ -38,8 +38,8 @@ add_specs suite_builder =
             times = uncurry (*)
             times [6, 7] . should_equal 42
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Interval_Spec.enso b/test/Base_Tests/src/Data/Interval_Spec.enso
index bbf1eec0a237..c96cb342c54d 100644
--- a/test/Base_Tests/src/Data/Interval_Spec.enso
+++ b/test/Base_Tests/src/Data/Interval_Spec.enso
@@ -103,8 +103,8 @@ add_specs suite_builder =
             Interval.new 0 0 Interval_Type.Inclusive . not_empty . should_be_true
             Interval.new 10 0 Interval_Type.Inclusive . not_empty . should_be_false
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Json_Spec.enso b/test/Base_Tests/src/Data/Json_Spec.enso
index 64833663c78e..61f9206621a0 100644
--- a/test/Base_Tests/src/Data/Json_Spec.enso
+++ b/test/Base_Tests/src/Data/Json_Spec.enso
@@ -216,8 +216,8 @@ add_specs suite_builder =
             Json.parse '"foo"' . length . should_equal 3
             Json.parse '""' . length . should_equal 0
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/List_Spec.enso b/test/Base_Tests/src/Data/List_Spec.enso
index 04ba4942a3f8..293da3c67fef 100644
--- a/test/Base_Tests/src/Data/List_Spec.enso
+++ b/test/Base_Tests/src/Data/List_Spec.enso
@@ -294,8 +294,8 @@ add_specs suite_builder = suite_builder.group "List" group_builder->
         l.get 3 . should_equal Nothing
         l.get -4 . should_equal Nothing
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Locale_Spec.enso b/test/Base_Tests/src/Data/Locale_Spec.enso
index 4b0f4eb5a94f..e55323c6b4f8 100644
--- a/test/Base_Tests/src/Data/Locale_Spec.enso
+++ b/test/Base_Tests/src/Data/Locale_Spec.enso
@@ -80,8 +80,8 @@ add_specs suite_builder =
         locale_names = Locale.widget_options.map x-> case x of Option locale_name _ _ _ -> locale_name
         locale_names . should_equal ['Bangladesh', 'Brazil', 'Canada English', 'Canada French', 'China', 'France', 'Germany', 'India English', 'India Hindi', 'Indonesia', 'Italy', 'Japan', 'Mexico', 'Nigeria', 'Pakistan English', 'Pakistan Urdu', 'Poland', 'Russia', 'South Korea', 'UK', 'US']
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Map_Spec.enso b/test/Base_Tests/src/Data/Map_Spec.enso
index afc817e71edd..e55d779c79c4 100644
--- a/test/Base_Tests/src/Data/Map_Spec.enso
+++ b/test/Base_Tests/src/Data/Map_Spec.enso
@@ -51,6 +51,9 @@ foreign js js_dict_from_vec vec = """
     }
     return dict
 
+foreign python py_none = """
+    return None
+
 foreign python py_dict_from_vec vec = """
     d = {}
     for i in range(0, len(vec), 2):
@@ -92,42 +95,20 @@ type GrandParent
     Value parent
 
 add_specs suite_builder =
+    Vector.new_builder
+        . append ["Enso", _-> Map.empty, Nothing]
+        . append ["Java", _-> JavaMap.of, Nothing]
+        . append ["JavaScript", _-> js_empty_dict, Nothing]
+        . append ["Python", _-> py_empty_dict, pending_python_missing]
+        . to_vector
+        . each entry->
+            lang = entry.get 0
+            empty_map_fn = entry.get 1
+            pending = entry.get 2
+            add_common_specs suite_builder lang pending empty_map_fn
+            
     suite_builder.group "Enso maps" group_builder->
-        group_builder.specify "should allow checking for emptiness" <|
-            empty_map = Map.empty
-            non_empty = Map.empty . insert "foo" 1234
-            empty_map.is_empty . should_be_true
-            non_empty.is_empty . should_be_false
-
-        group_builder.specify "should get the default comparator for polyglot maps" <|
-            Comparable.from (Map.empty) . should_equal Default_Comparator
-            Comparable.from (js_empty_dict) . should_equal Default_Comparator
-            Comparable.from (JavaMap.of "A" 1 "B" 2) . should_equal Default_Comparator
-
-        group_builder.specify "should compare two hash maps" <|
-            (Map.singleton "a" 1).should_equal (Map.singleton "a" 1)
-            (Map.singleton "b" 2).should_not_equal (Map.singleton "a" 1)
-            Map.empty.should_equal Map.empty
-            Map.empty.should_not_equal (Map.singleton "a" 1)
-            (Map.empty.insert "a" 1 . insert "b" 2).should_equal (Map.empty.insert "b" 2 . insert "a" 1)
 
-        group_builder.specify "should allow checking for non emptiness" <|
-            empty_map = Map.empty
-            non_empty = Map.empty . insert "foo" 1234
-            empty_map.not_empty . should_be_false
-            non_empty.not_empty . should_be_true
-
-        group_builder.specify "should allow checking its size" <|
-            empty_map = Map.empty
-            non_empty = Map.singleton "a" "b" . insert "x" "y"
-            empty_map.size . should_equal 0
-            non_empty.size . should_equal 2
-
-        group_builder.specify "should support arbitrary atoms as keys" <|
-            map = Map.singleton (Pair.new "one" "two") 42
-            (map.get (Pair.new "one" "two")).should_equal 42
-            (map.get (Pair.new "A" "B")).should_equal Nothing
-            (map.get (Pair.new "two" "two")).should_equal Nothing
 
         group_builder.specify "should use proper hash code for keys" <|
             single_key_map key = Map.singleton key 42
@@ -144,40 +125,6 @@ add_specs suite_builder =
             (single_key_map (Json.parse '{"a": 1}') . at (Json.parse '{"a": 1}')) . should_equal 42
             (single_key_map (Child.Value 1) . at (Child.Value 1.0)) . should_equal 42
 
-        group_builder.specify "should support vectors as keys" <|
-            map = Map.singleton [1, "a", 2] "Value"
-            map.size.should_equal 1
-            map.get [1, "a", 2] . should_equal "Value"
-
-        group_builder.specify "should support NaN as keys" <|
-            Map.empty.insert Number.nan 1 . contains_key Number.nan . should_be_true
-            Map.empty.insert Number.nan 1 . values . should_equal [1]
-            Map.empty.insert Number.nan 1 . insert Number.nan 2 . contains_key Number.nan . should_be_true
-            Map.empty.insert Number.nan 1 . insert Number.nan 2 . values . should_equal [2]
-            Map.empty.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . contains_key Number.nan . should_be_true
-            Map.empty.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . contains_key "key" . should_be_true
-            Map.empty.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . at Number.nan . should_equal 3
-            Map.empty.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . at "key" . should_equal 2
-            Map.empty.insert Number.nan 1 . insert Number.nan Number.nan . at Number.nan . to_text . should_equal "NaN"
-            Map.empty.insert Number.nan 1 . insert Number.nan Number.nan . remove Number.nan . size . should_equal 0
-
-        group_builder.specify "should support dates as keys" <|
-            map = Map.empty.insert (Date.new 1993) 1 . insert (Date.new 1993 2 5) 2 . insert (Date_Time.new 1993 2 5 13 45) 3
-            map.size.should_equal 3
-            map.get (Date.new 1993 6 7) . should_equal Nothing
-            map.get (Date.new 1993) . should_equal 1
-            map.get (Date_Time.new 1993) . should_equal Nothing
-            map.get (Date.new 1993 2 5) . should_equal 2
-            map.get (Date_Time.new 1993 2 5) . should_equal Nothing
-            map.get (Date_Time.new 1993 2 5 13 45) . should_equal 3
-
-        group_builder.specify "should support another hash map as key" <|
-            key_map = Map.singleton (Pair.new "one" "two") 42
-            map = Map.singleton key_map 23
-            map.size.should_equal 1
-            (map.get "A").should_equal Nothing
-            (map.get key_map).should_equal 23
-            (map.get map).should_equal Nothing
 
         group_builder.specify "should support another hash map with NaN keys as key" <|
             Map.singleton (Map.singleton Number.nan 1) 42 . size . should_equal 1
@@ -220,38 +167,6 @@ add_specs suite_builder =
                     acc_map.insert item True
             distinct_key_values.size . should_equal 5
 
-        group_builder.specify "should handle keys with standard equality semantics" <|
-            map = Map.singleton 2 "Hello"
-            (map.get 2).should_equal "Hello"
-            (map.get 2.0).should_equal "Hello"
-            (Map.singleton 2 "Hello").should_equal (Map.singleton 2.0 "Hello")
-
-        group_builder.specify "should handle Nothing as keys" <|
-            Map.singleton Nothing 3 . get Nothing . should_equal 3
-            Map.singleton Nothing 1 . insert Nothing 2 . get Nothing . should_equal 2
-            Map.singleton Nothing 1 . should_equal (Map.singleton Nothing 1)
-            Map.singleton Nothing 1 . insert Nothing 2 . at Nothing . should_equal 2
-            Map.singleton js_null 1 . at Nothing . should_equal 1
-
-        group_builder.specify "should handle incomparable values as keys" <|
-            Map.empty.insert Number.nan 1 . insert Number.nan 2 . get Number.nan . should_equal 2
-
-        group_builder.specify "should handle Nothing as values" <|
-            Map.singleton 1 Nothing . at 1 . should_equal Nothing
-            Map.singleton Nothing Nothing . at Nothing . should_equal Nothing
-
-        group_builder.specify "should support rewriting values with same keys" <|
-            map = Map.empty.insert "a" 1 . insert "a" 42
-            map.size.should_equal 1
-            map.get "a" . should_equal 42
-
-        group_builder.specify "should allow storing atoms as values" <|
-            json = Json.parse '{"a": 1}'
-            pair = Pair.new "first" "second"
-            map = Map.empty.insert 0 json . insert 1 pair
-            map.get 0 . should_equal json
-            map.get 1 . should_equal pair
-
         group_builder.specify "should not drop warnings from keys" <|
             key = Warning.attach "my_warn" "my_key"
             map = Map.singleton key 42
@@ -287,6 +202,9 @@ add_specs suite_builder =
             vec = [[0, 0], [3, -5], [1, 2]]
             Map.from_vector vec . should_equal expected
 
+        group_builder.specify "should fail when building the map from wrong vector" <|
+          Map.from_vector [["A", 1, "B", 2]] . should_fail_with Illegal_Argument
+
         group_builder.specify "should not allow duplicates when building the map from a vector, unless explicitly allowed" <|
             vec = [[0, 0], [3, -5], [1, 2], [0, 1]]
             m1 = Map.from_vector vec
@@ -298,51 +216,6 @@ add_specs suite_builder =
             m2.get 0 . should_equal 1
             m2.get 3 . should_equal -5
 
-        group_builder.specify "should define a well-defined text conversion" <|
-            m = Map.empty . insert 0 0 . insert 3 -5 . insert 1 2
-            m.to_text . should_contain "0=0"
-            m.to_text . should_contain "3=-5"
-            m.to_text . should_contain "1=2"
-
-        group_builder.specify "should define structural equality" <|
-            map_1 = Map.empty . insert "1" 2 . insert "2" "1"
-            map_2 = Map.empty . insert "1" 2 . insert "2" "1"
-            map_3 = Map.empty
-            map_1==map_2 . should_be_true
-            map_1==map_3 . should_be_false
-            map_2==map_3 . should_be_false
-
-        group_builder.specify "should allow inserting and looking up values" <|
-            m = Map.empty . insert "foo" 134 . insert "bar" 654 . insert "baz" "spam"
-            m.at "foo" . should_equal 134
-            m.at "bar" . should_equal 654
-            m.at "baz" . should_equal "spam"
-            (m.at "nope").should_fail_with No_Such_Key
-
-        group_builder.specify "should support get" <|
-            m = Map.empty . insert 2 3
-            m.get 2 0 . should_equal 3
-            m.get 1 10 . should_equal 10
-            m.get 2 (Panic.throw "missing") . should_equal 3
-
-        group_builder.specify "should allow getting a vector of the keys" <|
-            m = Map.empty . insert 1 2 . insert 2 4
-            m.keys . should_equal [1, 2]
-
-        group_builder.specify "should allow getting a vector of the values" <|
-            m = Map.empty . insert 1 2 . insert 2 4
-            m.values . should_equal [2, 4]
-
-        group_builder.specify "should support contains_key" <|
-            m = Map.empty . insert 2 3
-            m.contains_key 2 . should_be_true
-            m.contains_key 1 . should_be_false
-
-        group_builder.specify "should allow transforming the map" <|
-            m = Map.empty . insert 1 2 . insert 2 4
-            expected = Map.empty . insert "1" 4 . insert "2" 8
-            m.transform (k -> v -> [k.to_text, v*2]) . should_equal expected
-
         group_builder.specify "should disallow duplicate keys when transforming the map" <|
             m = Map.from_vector [[1, 2], [11, 3]]
             m2 = m.transform (k -> v -> [k % 10, v*2])
@@ -398,26 +271,6 @@ add_specs suite_builder =
             m.at 200 . should_equal 3
             m.at Nothing . should_equal 1
 
-        group_builder.specify "should be able to remove entries (1)" <|
-            m1 = Map.empty.insert "A" 1 . insert "B" 2
-            m2 = m1.remove "B"
-            m2.get "A" . should_equal 1
-            m2.remove "A" . should_equal Map.empty
-            Test.expect_panic_with (m1.remove "foo") Any
-
-        group_builder.specify "should be able to remove entries (2)" <|
-            m1 = Map.empty.insert "A" 1
-            m2 = m1.insert "B" 2
-            m3 = m1.insert "C" 3
-            m2.remove "A" . to_vector . should_equal [["B", 2]]
-            m2.remove "B" . to_vector . should_equal [["A", 1]]
-            m3.remove "A" . to_vector . should_equal [["C", 3]]
-            m3.remove "C" . to_vector . should_equal [["A", 1]]
-
-        group_builder.specify "should be able to remove entries (3)" <|
-            m = Map.empty.insert "A" 1 . insert "B" 2 . insert "C" 3
-            m.remove "B" . should_equal (Map.singleton "A" 1 . insert "C" 3)
-
     suite_builder.group "Polyglot keys and values" group_builder->
         group_builder.specify "should support polyglot keys" <|
             map = Map.singleton (js_str "A") 42
@@ -583,6 +436,13 @@ add_specs suite_builder =
             py_empty_dict.is_empty.should_be_true
             py_empty_dict.insert "A" 1 . insert "A" 2 . get "A" . should_equal 2
 
+        group_builder.specify "should be able to remove entries" pending=pending_python_missing <|
+            py_dict_from_vec ["A", 1, "B", 2] . remove "A" . size . should_equal 1
+            py_dict_from_vec ["A", 1, "B", 2] . remove "A" . get "B" . should_equal 2
+
+        group_builder.specify "should be able to remove NaN keys" pending=pending_python_missing <|
+            py_dict_from_vec [Number.nan, 1] . remove Number.nan . size . should_equal 0
+
         group_builder.specify "should pass maps with null keys to Python and back" pending=pending_python_missing <|
             # Python supports None as keys, Enso support Nothing as keys
             py_dict = py_dict_from_map (Map.singleton Nothing 42)
@@ -597,8 +457,179 @@ add_specs suite_builder =
             py_vec_from_map map2 . should_contain_the_same_elements_as [["A", 1], [Nothing, 2]]
 
 
-main =
+add_common_specs suite_builder prefix:Text (pending : (Text | Nothing)) (empty_map_fn : (Nothing -> Map)) =
+    # Not on a single line - empty_map is a method, not a variable
+    empty_map =
+        empty_map_fn Nothing
+
+    suite_builder.group prefix+": Common polyglot Map operations" pending=pending group_builder->
+        group_builder.specify "should get the default comparator for polyglot maps" <|
+            Comparable.from empty_map . should_equal Default_Comparator
+            
+        group_builder.specify "should compare two hash maps" <|
+            (empty_map.insert "a" 1).should_equal (empty_map.insert "a" 1)
+            (empty_map.insert "b" 2).should_not_equal (empty_map.insert "a" 1)
+            empty_map.should_equal empty_map
+            empty_map.should_not_equal (empty_map.insert "a" 1)
+            (empty_map.insert "a" 1 . insert "b" 2).should_equal (empty_map.insert "b" 2 . insert "a" 1)
+            
+        group_builder.specify "should allow checking for non emptiness" <|
+            non_empty = empty_map . insert "foo" 1234
+            empty_map.not_empty . should_be_false
+            non_empty.not_empty . should_be_true
+
+        group_builder.specify "should allow checking its size" <|
+            non_empty = empty_map.insert "a" "b" . insert "x" "y"
+            empty_map.size . should_equal 0
+            non_empty.size . should_equal 2
+            
+        group_builder.specify "should allow checking for emptiness" <|
+            non_empty = empty_map . insert "foo" 1234
+            empty_map.is_empty . should_be_true
+            non_empty.is_empty . should_be_false
+
+        group_builder.specify "should handle incomparable values as keys" <|
+            empty_map.insert Number.nan 1 . insert Number.nan 2 . get Number.nan . should_equal 2
+
+        group_builder.specify "should handle Nothing as values" <|
+            empty_map.insert 1 Nothing . at 1 . should_equal Nothing
+            empty_map.insert Nothing Nothing . at Nothing . should_equal Nothing
+
+        group_builder.specify "should support rewriting values with same keys" <|
+            map = Map.empty.insert "a" 1 . insert "a" 42
+            map.size.should_equal 1
+            map.get "a" . should_equal 42
+
+        group_builder.specify "should allow storing atoms as values" <|
+            json = Json.parse '{"a": 1}'
+            pair = Pair.new "first" "second"
+            map = Map.empty.insert 0 json . insert 1 pair
+            map.get 0 . should_equal json
+            map.get 1 . should_equal pair
+
+        group_builder.specify "should support NaN as keys" <|
+            empty_map.insert Number.nan 1 . contains_key Number.nan . should_be_true
+            empty_map.insert Number.nan 1 . values . should_equal [1]
+            empty_map.insert Number.nan 1 . insert Number.nan 2 . contains_key Number.nan . should_be_true
+            empty_map.insert Number.nan 1 . insert Number.nan 2 . values . should_equal [2]
+            empty_map.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . contains_key Number.nan . should_be_true
+            empty_map.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . contains_key "key" . should_be_true
+            empty_map.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . at Number.nan . should_equal 3
+            empty_map.insert Number.nan 1 . insert "key" 2 . insert Number.nan 3 . at "key" . should_equal 2
+            empty_map.insert Number.nan 1 . insert Number.nan Number.nan . at Number.nan . to_text . should_equal "NaN"
+            empty_map.insert Number.nan 1 . insert Number.nan Number.nan . remove Number.nan . size . should_equal 0
+
+        group_builder.specify "should support arbitrary atoms as keys" <|
+            map = empty_map . insert (Pair.new "one" "two") 42
+            (map.get (Pair.new "one" "two")).should_equal 42
+            (map.get (Pair.new "A" "B")).should_equal Nothing
+            (map.get (Pair.new "two" "two")).should_equal Nothing
+
+        group_builder.specify "should support vectors as keys" <|
+            map = empty_map . insert [1, "a", 2] "Value"
+            map.size.should_equal 1
+            map.get [1, "a", 2] . should_equal "Value"
+
+        group_builder.specify "should support dates as keys" <|
+            map = empty_map.insert (Date.new 1993) 1 . insert (Date.new 1993 2 5) 2 . insert (Date_Time.new 1993 2 5 13 45) 3
+            map.size.should_equal 3
+            map.get (Date.new 1993 6 7) . should_equal Nothing
+            map.get (Date.new 1993) . should_equal 1
+            map.get (Date_Time.new 1993) . should_equal Nothing
+            map.get (Date.new 1993 2 5) . should_equal 2
+            map.get (Date_Time.new 1993 2 5) . should_equal Nothing
+            map.get (Date_Time.new 1993 2 5 13 45) . should_equal 3
+
+        group_builder.specify "should support another hash map as key" <|
+            key_map = empty_map.insert (Pair.new "one" "two") 42
+            map = empty_map.insert key_map 23
+            map.size.should_equal 1
+            (map.get "A").should_equal Nothing
+            (map.get key_map).should_equal 23
+            (map.get map).should_equal Nothing
+
+        group_builder.specify "should handle keys with standard equality semantics" <|
+            map = empty_map.insert 2 "Hello"
+            (map.get 2).should_equal "Hello"
+            (map.get 2.0).should_equal "Hello"
+            (empty_map.insert 2 "Hello").should_equal (empty_map.insert 2.0 "Hello")
+
+        group_builder.specify "should handle Nothing as keys" <|
+            empty_map.insert Nothing 3 . get Nothing . should_equal 3
+            empty_map.insert Nothing 1 . insert Nothing 2 . get Nothing . should_equal 2
+            empty_map.insert Nothing 1 . should_equal (empty_map.insert Nothing 1)
+            empty_map.insert Nothing 1 . insert Nothing 2 . at Nothing . should_equal 2
+            empty_map.insert js_null 1 . at Nothing . should_equal 1
+            empty_map.insert py_none 1 . at Nothing . should_equal 1
+
+        group_builder.specify "should define a well-defined text conversion" <|
+            m = empty_map . insert 0 0 . insert 3 -5 . insert 1 2
+            m.to_text . should_contain "0=0"
+            m.to_text . should_contain "3=-5"
+            m.to_text . should_contain "1=2"
+
+        group_builder.specify "should define structural equality" <|
+            map_1 = empty_map . insert "1" 2 . insert "2" "1"
+            map_2 = empty_map . insert "1" 2 . insert "2" "1"
+            map_3 = empty_map
+            map_1==map_2 . should_be_true
+            map_1==map_3 . should_be_false
+            map_2==map_3 . should_be_false
+
+        group_builder.specify "should allow inserting and looking up values" <|
+            m = empty_map . insert "foo" 134 . insert "bar" 654 . insert "baz" "spam"
+            m.at "foo" . should_equal 134
+            m.at "bar" . should_equal 654
+            m.at "baz" . should_equal "spam"
+            (m.at "nope").should_fail_with No_Such_Key
+
+        group_builder.specify "should support get" <|
+            m = empty_map . insert 2 3
+            m.get 2 0 . should_equal 3
+            m.get 1 10 . should_equal 10
+            m.get 2 (Panic.throw "missing") . should_equal 3
+
+        group_builder.specify "should allow getting a vector of the keys" <|
+            m = empty_map . insert 1 2 . insert 2 4
+            m.keys . should_equal [1, 2]
+
+        group_builder.specify "should allow getting a vector of the values" <|
+            m = empty_map . insert 1 2 . insert 2 4
+            m.values . should_equal [2, 4]
+
+        group_builder.specify "should support contains_key" <|
+            m = empty_map . insert 2 3
+            m.contains_key 2 . should_be_true
+            m.contains_key 1 . should_be_false
+
+        group_builder.specify "should allow transforming the map" <|
+            m = empty_map . insert 1 2 . insert 2 4
+            expected = empty_map . insert "1" 4 . insert "2" 8
+            m.transform (k -> v -> [k.to_text, v*2]) . should_equal expected
+
+        group_builder.specify "should be able to remove entries (1)" <|
+            m1 = empty_map.insert "A" 1 . insert "B" 2
+            m2 = m1.remove "B"
+            m2.get "A" . should_equal 1
+            m2.remove "A" . should_equal empty_map
+            Test.expect_panic_with (m1.remove "foo") Any
+
+        group_builder.specify "should be able to remove entries (2)" <|
+            m1 = empty_map.insert "A" 1
+            m2 = m1.insert "B" 2
+            m3 = m1.insert "C" 3
+            m2.remove "A" . to_vector . should_equal [["B", 2]]
+            m2.remove "B" . to_vector . should_equal [["A", 1]]
+            m3.remove "A" . to_vector . should_equal [["C", 3]]
+            m3.remove "C" . to_vector . should_equal [["A", 1]]
+
+        group_builder.specify "should be able to remove entries (3)" <|
+            m = empty_map.insert "A" 1 . insert "B" 2 . insert "C" 3
+            m.remove "B" . should_equal (empty_map.insert "A" 1 . insert "C" 3)
+
+
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Maybe_Spec.enso b/test/Base_Tests/src/Data/Maybe_Spec.enso
index 1ca4858acbf3..db31addc4328 100644
--- a/test/Base_Tests/src/Data/Maybe_Spec.enso
+++ b/test/Base_Tests/src/Data/Maybe_Spec.enso
@@ -18,8 +18,8 @@ add_specs suite_builder = suite_builder.group "Maybe" group_builder->
         Maybe.None.is_none . should_be_true
         Maybe.Some 2 . is_none . should_be_false
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Numbers_Spec.enso b/test/Base_Tests/src/Data/Numbers_Spec.enso
index 0c38843bf73d..f0afb9b48e0a 100644
--- a/test/Base_Tests/src/Data/Numbers_Spec.enso
+++ b/test/Base_Tests/src/Data/Numbers_Spec.enso
@@ -27,19 +27,17 @@ type Complex
     < self (that:Complex) = Complex_Comparator.compare self that == Ordering.Less
     > self (that:Complex) = Complex_Comparator.compare self that == Ordering.Greater
 
-    == self (that:Complex) = Complex_Comparator.compare self that == Ordering.Equal
-
-    pending_equality -> Text = "== with conversions isn't yet supported"
-
 Complex.from (that:Number) = Complex.new that
 
 type Complex_Comparator
     compare x:Complex y:Complex = if x.re==y.re && x.im==y.im then Ordering.Equal else
         if x.im==0 && y.im==0 then Ordering.compare x.re y.re else
             Nothing
-    hash x:Complex = 7*x.re + 11*x.im
+    hash x:Complex = if x.im == 0 then Default_Comparator.hash x.re else
+        7*x.re + 11*x.im
 
 Comparable.from (_:Complex) = Complex_Comparator
+Comparable.from (_:Number) = Complex_Comparator
 
 
 add_specs suite_builder =
@@ -591,21 +589,25 @@ add_specs suite_builder =
             v2 = (Complex.new 6 6)
             Ordering.compare v1 v2 . catch Incomparable_Values (_->42) . should_equal 42
 
-        group_builder.specify "Equality of complex and number" pending=Complex.pending_equality <|
+        group_builder.specify "Equality of complex and number" <|
             v1 = (Complex.new 3)
             v2 = 3
+            r1 = v1==v2
+            r2 = v2==v1
+            r1 . should_be_true
+            r2 . should_be_true
             v1 . should_equal v2
             v2 . should_equal v1
-            v1==v2 . should_be_true
-            v2==v1 . should_be_true
 
-        group_builder.specify "Equality of number and complex" pending=Complex.pending_equality <|
+        group_builder.specify "Equality of number and complex" <|
             v1 = 3
             v2 = (Complex.new 3)
+            r1 = v1==v2
+            r2 = v2==v1
+            r1 . should_be_true
+            r2 . should_be_true
             v1 . should_equal v2
             v2 . should_equal v1
-            v1==v2 . should_be_true
-            v2==v1 . should_be_true
 
         group_builder.specify "Greater or equal of complex and complex" <|
             v1 = (Complex.new 3)
@@ -699,10 +701,10 @@ add_specs suite_builder =
                 [x, y, z, w].each b->
                     a+b . should_equal 20
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 foreign js to_js_bigint n = """
diff --git a/test/Base_Tests/src/Data/Ordering/Comparator_Spec.enso b/test/Base_Tests/src/Data/Ordering/Comparator_Spec.enso
index fd8d012e3b57..72a7d8204c15 100644
--- a/test/Base_Tests/src/Data/Ordering/Comparator_Spec.enso
+++ b/test/Base_Tests/src/Data/Ordering/Comparator_Spec.enso
@@ -78,8 +78,8 @@ add_specs suite_builder = suite_builder.group "Object Comparator" group_builder-
         (default_comparator 1 True) . should_fail_with Incomparable_Values
         (default_comparator (No_Ord.Value 1) (No_Ord.Value 2)).should_fail_with Incomparable_Values
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Ordering/Natural_Order_Spec.enso b/test/Base_Tests/src/Data/Ordering/Natural_Order_Spec.enso
index 9d52b9559cda..1ea3d05f0c4b 100644
--- a/test/Base_Tests/src/Data/Ordering/Natural_Order_Spec.enso
+++ b/test/Base_Tests/src/Data/Ordering/Natural_Order_Spec.enso
@@ -59,8 +59,8 @@ add_specs suite_builder = suite_builder.group "Natural Order" group_builder->
 
         ["1.0002", "1.0001", "1.01", "1.1", "1.10", "1.2", "2", "0", "1.20"].sort by=Natural_Order.compare . should_equal ["0", "1.0001", "1.01", "1.1", "1.0002", "1.2", "1.10", "1.20", "2"]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso b/test/Base_Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso
index 1f45add5f2fa..020832c38fec 100644
--- a/test/Base_Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso
+++ b/test/Base_Tests/src/Data/Ordering/Vector_Lexicographic_Order_Spec.enso
@@ -20,8 +20,8 @@ add_specs suite_builder = suite_builder.group "Lexicographic Order on Vectors" g
         Vector_Lexicographic_Order.compare [My_Type.Value "a" 1, My_Type.Value "b" 1, My_Type.Value "c" 1] [My_Type.Value "b" 1, My_Type.Value "a" 1, My_Type.Value "c" 1] element_comparator=comparator . should_equal Ordering.Less
         Vector_Lexicographic_Order.compare [My_Type.Value "a" 1, My_Type.Value "b" 1, My_Type.Value "c" 1] [My_Type.Value "a" 100, My_Type.Value "b" 2, My_Type.Value "c" 3] element_comparator=comparator . should_equal Ordering.Equal
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Ordering_Spec.enso b/test/Base_Tests/src/Data/Ordering_Spec.enso
index af9e829f8832..8f8956fb1e5e 100644
--- a/test/Base_Tests/src/Data/Ordering_Spec.enso
+++ b/test/Base_Tests/src/Data/Ordering_Spec.enso
@@ -232,8 +232,8 @@ add_specs suite_builder =
 
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Pair_Spec.enso b/test/Base_Tests/src/Data/Pair_Spec.enso
index 23078cb7e9e8..9a682fedeb5f 100644
--- a/test/Base_Tests/src/Data/Pair_Spec.enso
+++ b/test/Base_Tests/src/Data/Pair_Spec.enso
@@ -114,8 +114,8 @@ add_specs suite_builder =
 foreign js js_pair a b = """
     return [a, b]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Polyglot_Spec.enso b/test/Base_Tests/src/Data/Polyglot_Spec.enso
index 4dbf7a5d483f..bd569cd0e46a 100644
--- a/test/Base_Tests/src/Data/Polyglot_Spec.enso
+++ b/test/Base_Tests/src/Data/Polyglot_Spec.enso
@@ -10,7 +10,7 @@ polyglot java import java.time.LocalDate
 polyglot java import java.util.function.Function as Java_Function
 polyglot java import org.enso.base_test_helpers.IntHolder
 
-spec = suite_builder.group "Polyglot" group_builder->
+add_specs suite_builder = suite_builder.group "Polyglot" group_builder->
     group_builder.specify "should be able to invoke a polyglot method by name and pass arguments" <|
         poly_date = LocalDate.now
         date = Date.today.to_date_time
@@ -50,8 +50,8 @@ spec = suite_builder.group "Polyglot" group_builder->
 foreign js js_meaning = """
     return { meaning : 6 * 7 };
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Problems_Spec.enso b/test/Base_Tests/src/Data/Problems_Spec.enso
index 0b05a0a3fe07..23ca572405de 100644
--- a/test/Base_Tests/src/Data/Problems_Spec.enso
+++ b/test/Base_Tests/src/Data/Problems_Spec.enso
@@ -4,10 +4,10 @@ import Standard.Base.Errors.Illegal_State.Illegal_State
 from Standard.Test import all
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder = suite_builder.group "Problem_Behavior" group_builder->
diff --git a/test/Base_Tests/src/Data/Range_Spec.enso b/test/Base_Tests/src/Data/Range_Spec.enso
index 0a378436a3a8..d87f2b22815e 100644
--- a/test/Base_Tests/src/Data/Range_Spec.enso
+++ b/test/Base_Tests/src/Data/Range_Spec.enso
@@ -578,8 +578,8 @@ add_specs suite_builder = suite_builder.group "Range" group_builder->
         invalid_range . find _->True . should_fail_with Illegal_State
         invalid_range . contains 0 . should_fail_with Illegal_State
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Regression_Spec.enso b/test/Base_Tests/src/Data/Regression_Spec.enso
index 51f442d1689a..bbb0fadc20c1 100644
--- a/test/Base_Tests/src/Data/Regression_Spec.enso
+++ b/test/Base_Tests/src/Data/Regression_Spec.enso
@@ -107,8 +107,8 @@ add_specs suite_builder =
             expected_ys = [0.222594, 0.302868, 0.3046, 0.309085]
             vector_compare (test_xs.map fitted.predict) expected_ys
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Set_Spec.enso b/test/Base_Tests/src/Data/Set_Spec.enso
index 5588e68ed882..1b8e1fc51335 100644
--- a/test/Base_Tests/src/Data/Set_Spec.enso
+++ b/test/Base_Tests/src/Data/Set_Spec.enso
@@ -62,8 +62,8 @@ add_specs suite_builder =
             (s1 == s1) . should_be_true
             (s1 == s3) . should_be_false
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Statistics_Spec.enso b/test/Base_Tests/src/Data/Statistics_Spec.enso
index 7850776b76d1..04ceb001e802 100644
--- a/test/Base_Tests/src/Data/Statistics_Spec.enso
+++ b/test/Base_Tests/src/Data/Statistics_Spec.enso
@@ -348,8 +348,8 @@ add_specs suite_builder =
             Statistic.covariance_matrix series . should_fail_with Illegal_Argument
             Statistic.pearson_correlation series . should_fail_with Illegal_Argument
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Encoding_Spec.enso b/test/Base_Tests/src/Data/Text/Encoding_Spec.enso
index a04b9bd952be..109522ff36dd 100644
--- a/test/Base_Tests/src/Data/Text/Encoding_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Encoding_Spec.enso
@@ -191,8 +191,8 @@ add_specs suite_builder =
             problems = [Encoding_Error.Error "Encoding issues at 16."]
             Problems.test_problem_handling action problems tester
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Parse_Spec.enso b/test/Base_Tests/src/Data/Text/Parse_Spec.enso
index 6e3f85ffd763..646b8eb5c052 100644
--- a/test/Base_Tests/src/Data/Text/Parse_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Parse_Spec.enso
@@ -51,8 +51,8 @@ add_specs suite_builder =
             "http://example.com".to_uri . should_equal <| URI.parse "http://example.com"
             ":::".to_uri . should_fail_with Syntax_Error
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Regex_Spec.enso b/test/Base_Tests/src/Data/Text/Regex_Spec.enso
index aea7bad49015..f74c05edbd63 100644
--- a/test/Base_Tests/src/Data/Text/Regex_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Regex_Spec.enso
@@ -534,8 +534,8 @@ add_specs suite_builder =
             replacer_cache_lookup "$1$1x0" . should_equal Nothing
             replacer_cache_lookup "$1$1x1" . should_not_equal Nothing
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Span_Spec.enso b/test/Base_Tests/src/Data/Text/Span_Spec.enso
index e6859ff8500e..c59059f831f0 100644
--- a/test/Base_Tests/src/Data/Text/Span_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Span_Spec.enso
@@ -38,8 +38,8 @@ add_specs suite_builder = suite_builder.group "Text.Span" group_builder->
         Utf_16_Span.Value (0.up_to 3) text . to_grapheme_span . should_equal (Span.Value (0.up_to 2) text)
         Utf_16_Span.Value (0.up_to 2) text . to_grapheme_span . should_equal (Span.Value (0.up_to 1) text)
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Text_Sub_Range_Spec.enso b/test/Base_Tests/src/Data/Text/Text_Sub_Range_Spec.enso
index 9438f09fb833..224de6fa111e 100644
--- a/test/Base_Tests/src/Data/Text/Text_Sub_Range_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Text_Sub_Range_Spec.enso
@@ -37,8 +37,8 @@ add_specs suite_builder = suite_builder.group "Text_Sub_Range_Data" group_builde
         character_ranges accent_2 . should_equal [0.up_to 2]
         character_ranges kshi+facepalm+accent_1+accent_2 . should_equal [0.up_to 4, 4.up_to 11, 11.up_to 12, 12.up_to 14]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text/Utils_Spec.enso b/test/Base_Tests/src/Data/Text/Utils_Spec.enso
index a70467c7de26..1257e7c43e5f 100644
--- a/test/Base_Tests/src/Data/Text/Utils_Spec.enso
+++ b/test/Base_Tests/src/Data/Text/Utils_Spec.enso
@@ -116,8 +116,8 @@ add_specs suite_builder =
             txt = '\u{1F926}\u{1F3FC}\u200D\u2642\uFE0F'*100
             txt.to_display_text . should_equal ('\u{1F926}\u{1F3FC}\u200D\u2642\uFE0F'*78 + ' …')
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Text_Spec.enso b/test/Base_Tests/src/Data/Text_Spec.enso
index 9dfd364a10f9..7fcf02b6dc8e 100644
--- a/test/Base_Tests/src/Data/Text_Spec.enso
+++ b/test/Base_Tests/src/Data/Text_Spec.enso
@@ -1662,8 +1662,8 @@ add_specs suite_builder =
         group_builder.specify "should error if start index is larger than string"
             "Hello World!".substring 20 5 . should_fail_with Index_Out_Of_Bounds
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Date_Range_Spec.enso b/test/Base_Tests/src/Data/Time/Date_Range_Spec.enso
index 8ebb1a42eb56..7c4ebf7efce4 100644
--- a/test/Base_Tests/src/Data/Time/Date_Range_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Date_Range_Spec.enso
@@ -6,10 +6,10 @@ import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 from Standard.Test import all
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Base_Tests/src/Data/Time/Date_Spec.enso b/test/Base_Tests/src/Data/Time/Date_Spec.enso
index 507bf23fc1f7..4b2d655fcd1b 100644
--- a/test/Base_Tests/src/Data/Time/Date_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Date_Spec.enso
@@ -527,10 +527,10 @@ spec_with suite_builder name create_new_date parse_date pending=Nothing =
 
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 parseNormally x y = (Date.parse x y) . to_text
diff --git a/test/Base_Tests/src/Data/Time/Date_Time_Formatter_Spec.enso b/test/Base_Tests/src/Data/Time/Date_Time_Formatter_Spec.enso
index d69bbb6e58cf..70eb5dae7b86 100644
--- a/test/Base_Tests/src/Data/Time/Date_Time_Formatter_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Date_Time_Formatter_Spec.enso
@@ -370,8 +370,8 @@ add_specs suite_builder =
         group_builder.specify "should allow to parse even when some patterns are unused" <|
             "2020-01-02 14:55".parse_date "yyyy-MM-dd HH:mm" . should_equal (Date.new 2020 1 2)
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Date_Time_Spec.enso b/test/Base_Tests/src/Data/Time/Date_Time_Spec.enso
index b3be2252cafd..2ab0c7f2c60c 100644
--- a/test/Base_Tests/src/Data/Time/Date_Time_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Date_Time_Spec.enso
@@ -838,8 +838,8 @@ java_parse date_text_raw pattern=Nothing =
       formatter = DateTimeFormatter.ofPattern(pattern)
       Panic.catch Any (maybe_parse_java_zoned date_text formatter) (cause -> parse_java_local cause.payload date_text pattern)
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Day_Of_Week_Spec.enso b/test/Base_Tests/src/Data/Time/Day_Of_Week_Spec.enso
index 5327f14014e2..32f3a14aa4a3 100644
--- a/test/Base_Tests/src/Data/Time/Day_Of_Week_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Day_Of_Week_Spec.enso
@@ -53,8 +53,8 @@ add_specs suite_builder =
             Day_Of_Week.from 4 Day_Of_Week.Monday True . should_equal Day_Of_Week.Friday
             Day_Of_Week.from 5 Day_Of_Week.Monday True . should_equal Day_Of_Week.Saturday
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Duration_Spec.enso b/test/Base_Tests/src/Data/Time/Duration_Spec.enso
index 9be6a61b9dcc..b2418b9d0efa 100644
--- a/test/Base_Tests/src/Data/Time/Duration_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Duration_Spec.enso
@@ -109,8 +109,8 @@ foreign js js_datetime_impl year month day hour minute second nanosecond = """
     }
     return new Date(year, month - 1, day, hour, minute, second, nanosecond / 1000000);
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Period_Spec.enso b/test/Base_Tests/src/Data/Time/Period_Spec.enso
index 438c3e017404..f61c4abfbbb8 100644
--- a/test/Base_Tests/src/Data/Time/Period_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Period_Spec.enso
@@ -50,8 +50,8 @@ add_specs suite_builder =
             Period.new years=2 days=3 . to_display_text . should_equal "2Y 0M 3D"
             Period.new days=18 . to_display_text . should_equal "18D"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Spec.enso b/test/Base_Tests/src/Data/Time/Spec.enso
index 50beb5023dbe..853eb895b58a 100644
--- a/test/Base_Tests/src/Data/Time/Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Spec.enso
@@ -24,8 +24,8 @@ add_specs suite_builder =
     Time_Zone_Spec.add_specs suite_builder
     Day_Of_Week_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Time/Time_Of_Day_Spec.enso b/test/Base_Tests/src/Data/Time/Time_Of_Day_Spec.enso
index f7a088f04a26..79e7b4432fb9 100644
--- a/test/Base_Tests/src/Data/Time/Time_Of_Day_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Time_Of_Day_Spec.enso
@@ -305,10 +305,10 @@ python_parse time_text pattern=Date_Time_Formatter.iso_time =
     t = Time_Of_Day.parse time_text pattern
     python_time t.hour t.minute t.second t.nanosecond
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 foreign python python_time_impl hour minute second nanoOfSecond = """
diff --git a/test/Base_Tests/src/Data/Time/Time_Zone_Spec.enso b/test/Base_Tests/src/Data/Time/Time_Zone_Spec.enso
index 801fd45535fa..f3c48e9aeed6 100644
--- a/test/Base_Tests/src/Data/Time/Time_Zone_Spec.enso
+++ b/test/Base_Tests/src/Data/Time/Time_Zone_Spec.enso
@@ -74,8 +74,8 @@ add_specs suite_builder =
             zone = ZoneId.systemDefault
             Meta.type_of zone . should_equal_type Time_Zone
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Vector/Slicing_Helpers_Spec.enso b/test/Base_Tests/src/Data/Vector/Slicing_Helpers_Spec.enso
index 2fa92f8f862e..8a69cc7164f7 100644
--- a/test/Base_Tests/src/Data/Vector/Slicing_Helpers_Spec.enso
+++ b/test/Base_Tests/src/Data/Vector/Slicing_Helpers_Spec.enso
@@ -19,8 +19,8 @@ add_specs suite_builder = suite_builder.group "Vector Slicing Helpers" group_bui
         merge [0.up_to 1, 0.up_to 1] . should_equal [0.up_to 1]
         merge [0.up_to 1, 1.up_to 2] . should_equal [0.up_to 2]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Data/Vector_Spec.enso b/test/Base_Tests/src/Data/Vector_Spec.enso
index 67eaa9759757..fba189b9d39f 100644
--- a/test/Base_Tests/src/Data/Vector_Spec.enso
+++ b/test/Base_Tests/src/Data/Vector_Spec.enso
@@ -1082,7 +1082,7 @@ type Fib
         start = Fib.Number 1 <| Fib.Number 1 (sum_two start)
         start
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/Data/XML/XML_Spec.enso b/test/Base_Tests/src/Data/XML/XML_Spec.enso
index 8b120832776c..f40bdc61c7bf 100644
--- a/test/Base_Tests/src/Data/XML/XML_Spec.enso
+++ b/test/Base_Tests/src/Data/XML/XML_Spec.enso
@@ -7,7 +7,7 @@ from Standard.Test import all
 
 type Test_Data
     Value ~data
-    
+
     test_file self = self.data.at 0
     document self = self.data.at 1
     root self = self.data.at 2
@@ -236,8 +236,8 @@ add_specs suite_builder =
             js = root.to_js_object
             js.should_equal expected
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Main.enso b/test/Base_Tests/src/Main.enso
index dded44ce541d..b6e945903156 100644
--- a/test/Base_Tests/src/Main.enso
+++ b/test/Base_Tests/src/Main.enso
@@ -40,6 +40,7 @@ import project.Data.Ordering.Comparator_Spec
 import project.Data.Ordering.Natural_Order_Spec
 import project.Data.Ordering.Vector_Lexicographic_Order_Spec
 import project.Data.Pair_Spec
+import project.Data.Polyglot_Spec
 import project.Data.Problems_Spec
 import project.Data.Range_Spec
 import project.Data.Regression_Spec
@@ -137,6 +138,7 @@ main filter=Nothing =
         R_Interop_Spec.add_specs suite_builder
         Pair_Spec.add_specs suite_builder
         Parse_Spec.add_specs suite_builder
+        Polyglot_Spec.add_specs suite_builder
         Problems_Spec.add_specs suite_builder
         Range_Spec.add_specs suite_builder
         Ref_Spec.add_specs suite_builder
diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Cloud_Tests_Setup.enso b/test/Base_Tests/src/Network/Enso_Cloud/Cloud_Tests_Setup.enso
index a7066a726f24..bebb923879ad 100644
--- a/test/Base_Tests/src/Network/Enso_Cloud/Cloud_Tests_Setup.enso
+++ b/test/Base_Tests/src/Network/Enso_Cloud/Cloud_Tests_Setup.enso
@@ -113,7 +113,7 @@ with_retries ~action =
 
     # Delays are in seconds
     sleep_time = 0.1
-    total_sleep_delay = if Environment.get "CI" . is_nothing . not then 10 else 5
+    total_sleep_delay = if Environment.get "CI" . is_nothing . not then 10 else 2
 
     max_iterations = total_sleep_delay / sleep_time
     go i =
diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Enso_Cloud_Spec.enso b/test/Base_Tests/src/Network/Enso_Cloud/Enso_Cloud_Spec.enso
index 24a5d3192d10..600a547f6d57 100644
--- a/test/Base_Tests/src/Network/Enso_Cloud/Enso_Cloud_Spec.enso
+++ b/test/Base_Tests/src/Network/Enso_Cloud/Enso_Cloud_Spec.enso
@@ -1,8 +1,8 @@
 from Standard.Base import all
-import Standard.Base.Data.Enso_Cloud.Errors.Not_Logged_In
+import Standard.Base.Enso_Cloud.Errors.Enso_Cloud_Error
+import Standard.Base.Enso_Cloud.Errors.Not_Logged_In
 import Standard.Base.Errors.Common.No_Such_Conversion
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
-import Standard.Base.Network.HTTP.HTTP_Error.HTTP_Error
 
 from Standard.Test import all
 import Standard.Test.Test_Environment
@@ -34,7 +34,9 @@ add_specs suite_builder setup:Cloud_Tests_Setup =
                 parsed_user.home.is_directory.should_be_true
 
                 invalid_json = Json.parse "{}"
-                Enso_User.from invalid_json . should_fail_with Illegal_Argument
+                r = Enso_User.from invalid_json
+                r.should_fail_with Enso_Cloud_Error
+                r.catch.should_be_a Enso_Cloud_Error.Invalid_Response_Payload
                 Test.expect_panic No_Such_Conversion (Enso_User.from (Json.parse "[]"))
 
         suite_builder.group "Enso_User - local mock integration tests" group_builder->
@@ -59,29 +61,33 @@ add_specs suite_builder setup:Cloud_Tests_Setup =
                 users.at 1 . name . should_equal "My test User 2"
                 users.at 1 . is_enabled . should_be_false
 
+                users.should_contain Enso_User.current
+
+            group_builder.specify "user can be fetched from real API" pending=(setup.real_cloud_pending.if_nothing "Disabled until https://github.com/enso-org/cloud-v2/issues/912 is resolved.") <|
+                Enso_User.list . should_contain Enso_User.current
+
             group_builder.specify "will fail if the user is not logged in" <|
                 non_existent_file = (enso_project.data / "nonexistent-file") . absolute . normalize
                 non_existent_file.exists.should_be_false
-                r = Test_Environment.unsafe_with_environment_override "ENSO_CLOUD_CREDENTIALS_FILE" non_existent_file.path <|
-                    Cloud_Tests_Setup.reset_token
-                    Enso_User.current
-                r.should_fail_with Not_Logged_In
+                Panic.with_finalizer Cloud_Tests_Setup.reset_token <|
+                    r = Test_Environment.unsafe_with_environment_override "ENSO_CLOUD_CREDENTIALS_FILE" non_existent_file.path <|
+                        Cloud_Tests_Setup.reset_token
+                        Enso_User.current
+                    r.should_fail_with Not_Logged_In
 
             group_builder.specify "will fail if the token is invalid" pending=setup.pending <|
                 invalid_token_file = File.create_temporary_file "enso-test-credentials" "-invalid.txt"
                 "invalid-token".write invalid_token_file . should_succeed
                 Cloud_Tests_Setup.reset_token
-                r = Test_Environment.unsafe_with_environment_override "ENSO_CLOUD_CREDENTIALS_FILE" invalid_token_file.absolute.normalize.path <|
-                    Enso_User.current
-                r.should_fail_with HTTP_Error
-                r.catch.should_be_a HTTP_Error.Status_Error
-                [401, 403].should_contain r.catch.status_code.code
+                Panic.with_finalizer Cloud_Tests_Setup.reset_token <|
+                    r = Test_Environment.unsafe_with_environment_override "ENSO_CLOUD_CREDENTIALS_FILE" invalid_token_file.absolute.normalize.path <|
+                        Enso_User.current
+                    r.should_fail_with Enso_Cloud_Error
+                    r.catch.should_be_a Enso_Cloud_Error.Unauthorized
+                    r.catch.to_display_text . should_contain "401"
 
-            # Ensure the token is reset after the last test, so that any other tests will again use the correct one.
-            Cloud_Tests_Setup.reset_token
-
-main =
+main filter=Nothing =
+    setup = Cloud_Tests_Setup.prepare
     suite = Test.build suite_builder->
-        add_specs suite_builder
-    suite.run_with_filter
-
+        add_specs suite_builder setup
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso b/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso
index 7d196f23737f..d7e56db3c32b 100644
--- a/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso
+++ b/test/Base_Tests/src/Network/Enso_Cloud/Enso_File_Spec.enso
@@ -1,6 +1,7 @@
 from Standard.Base import all
 import Standard.Base.Errors.Common.Not_Found
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
+import Standard.Base.Errors.Unimplemented.Unimplemented
 
 from Standard.Test import all
 import Standard.Test.Test_Environment
@@ -33,17 +34,12 @@ add_specs suite_builder setup:Cloud_Tests_Setup = setup.with_prepared_environmen
                 my_dir.is_directory . should_be_true
                 my_dir.exists . should_be_true
                 my_dir.name . should_equal my_name
-
-                # TODO this is a workaround because create does not return organizationId!
-                # Enso_File.root.list . should_contain my_dir
-                Enso_File.root.list.map .name . should_contain my_name
+                Enso_File.root.list . should_contain my_dir
 
             my_dir.delete . should_succeed
 
             with_retries <|
-                # TODO workaround for missing organizationId
-                # Enso_File.root.list . should_not_contain my_dir
-                Enso_File.root.list.map .name . should_not_contain my_name
+                Enso_File.root.list . should_not_contain my_dir
 
                 # TODO the dir still shows as 'existing' after deletion, probably because it still is there in the Trash
                 # my_dir.exists . should_be_false
@@ -153,8 +149,16 @@ add_specs suite_builder setup:Cloud_Tests_Setup = setup.with_prepared_environmen
             nested_file.is_directory.should_be_false
             nested_file.is_regular_file.should_be_true
             nested_file.size . should_equal nested_file.read_bytes.length
+            nested_file.creation_time . should_be_a Date_Time
+            nested_file.last_modified_time . should_be_a Date_Time
+
+        group_builder.specify "currently does not support metadata for directories" <|
+            # TODO this test should be 'reversed' and merged with above once the metadata is implemented
+            dir = Enso_File.root / "test-directory"
+            Test.expect_panic Unimplemented dir.creation_time
+            Test.expect_panic Unimplemented dir.last_modified_time
 
-        group_builder.specify "should be able to read file metadata (v2)" pending="TODO Enso_File more detailed metadata, waiting on https://github.com/enso-org/cloud-v2/issues/870" <|
+        group_builder.specify "should be able to read file metadata (v2)" pending="TODO Enso_File parent and path resolution" <|
             Enso_File.root.parent . should_equal Nothing
             Enso_File.root.path . should_equal "enso://"
 
@@ -163,16 +167,14 @@ add_specs suite_builder setup:Cloud_Tests_Setup = setup.with_prepared_environmen
             dir.parent . should_equal Enso_File.root
             dir.is_descendant_of Enso_File.root . should_be_true
             Enso_File.root.is_descendant_of dir . should_be_false
-            dir.creation_time . should_be_a Date_Time
-            dir.last_modified_time . should_be_a Date_Time
 
             nested_file = dir / "another.txt"
             nested_file.path . should_equal "enso://test-directory/another.txt"
             nested_file.parent . should_equal dir
+            ## TODO test for `enso://test-directory-longer-name` . is_descendant_of `enso://test-directory` . should_be_false
+               (even though one is a prefix of the other, but not in the directory tree sense)
             nested_file.is_descendant_of dir . should_be_true
             nested_file.is_descendant_of Enso_File.root . should_be_true
-            nested_file.creation_time . should_be_a Date_Time
-            nested_file.last_modified_time . should_be_a Date_Time
 
         group_builder.specify "should be able to read other file metadata" pending="TODO needs further design" <|
             nested_file = Enso_File.root / "test-directory" / "another.txt"
@@ -196,8 +198,8 @@ add_specs suite_builder setup:Cloud_Tests_Setup = setup.with_prepared_environmen
             nested_file.move_to "TODO this needs design"
             nested_file.exists . should_be_false
 
-main =
+main filter=Nothing =
+    setup = Cloud_Tests_Setup.prepare
     suite = Test.build suite_builder->
-        add_specs suite_builder
-    suite.run_with_filter
-
+        add_specs suite_builder setup
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Main.enso b/test/Base_Tests/src/Network/Enso_Cloud/Main.enso
index 154b21cce490..b41d54781967 100644
--- a/test/Base_Tests/src/Network/Enso_Cloud/Main.enso
+++ b/test/Base_Tests/src/Network/Enso_Cloud/Main.enso
@@ -12,9 +12,9 @@ add_specs suite_builder setup =
     Enso_File_Spec.add_specs suite_builder setup
     Secrets_Spec.add_specs suite_builder setup
 
-main =
+main filter=Nothing =
     setup = Cloud_Tests_Setup.prepare
     suite = Test.build suite_builder->
         add_specs suite_builder setup
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Network/Enso_Cloud/Secrets_Spec.enso b/test/Base_Tests/src/Network/Enso_Cloud/Secrets_Spec.enso
index 90c67d7d4fc8..bb1e040ff743 100644
--- a/test/Base_Tests/src/Network/Enso_Cloud/Secrets_Spec.enso
+++ b/test/Base_Tests/src/Network/Enso_Cloud/Secrets_Spec.enso
@@ -1,14 +1,14 @@
 from Standard.Base import all
 import Standard.Base.Data.Base_64.Base_64
-import Standard.Base.Data.Enso_Cloud.Enso_Secret.Derived_Secret_Value
-import Standard.Base.Data.Enso_Cloud.Enso_Secret.Enso_Secret_Error
+import Standard.Base.Enso_Cloud.Enso_Secret.Derived_Secret_Value
+import Standard.Base.Enso_Cloud.Enso_Secret.Enso_Secret_Error
 import Standard.Base.Errors.Common.Forbidden_Operation
 import Standard.Base.Errors.Common.Not_Found
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Network.HTTP.Request.Request
 import Standard.Base.Runtime.Context
-from Standard.Base.Data.Enso_Cloud.Enso_Secret import as_hideable_value
+from Standard.Base.Enso_Cloud.Enso_Secret import as_hideable_value
 
 from Standard.Test import all
 from Standard.Test.Execution_Context_Helpers import run_with_and_without_output
@@ -221,10 +221,11 @@ add_specs suite_builder setup:Cloud_Tests_Setup = setup.with_prepared_environmen
                     with_retries <| Enso_Secret.get "my_test_secret-13" . should_equal secret1
 
 
-main =
+main filter=Nothing =
+    setup = Cloud_Tests_Setup.prepare
     suite = Test.build suite_builder->
-        add_specs suite_builder
-    suite.run_with_filter
+        add_specs suite_builder setup
+    suite.run_with_filter filter
 
 
 wait_until_secret_is_propagated secret =
diff --git a/test/Base_Tests/src/Network/Http/Header_Spec.enso b/test/Base_Tests/src/Network/Http/Header_Spec.enso
index caa828c6c0ec..413fa6df833d 100644
--- a/test/Base_Tests/src/Network/Http/Header_Spec.enso
+++ b/test/Base_Tests/src/Network/Http/Header_Spec.enso
@@ -11,8 +11,8 @@ add_specs suite_builder =
             (Header.new "A" "B" == Header.new "A" "b") . should_equal False
             (Header.new "A" "B" == Header.new "a" "b") . should_equal False
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Network/Http/Http_Auto_Parse_Spec.enso b/test/Base_Tests/src/Network/Http/Http_Auto_Parse_Spec.enso
index a3385f82fd3d..b82dd4a5ebc6 100644
--- a/test/Base_Tests/src/Network/Http/Http_Auto_Parse_Spec.enso
+++ b/test/Base_Tests/src/Network/Http/Http_Auto_Parse_Spec.enso
@@ -7,10 +7,10 @@ import Standard.Base.Network.HTTP.Response.Response
 
 from Standard.Test import all
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Base_Tests/src/Network/Http/Request_Spec.enso b/test/Base_Tests/src/Network/Http/Request_Spec.enso
index af837663dfbe..59fb5b75eac2 100644
--- a/test/Base_Tests/src/Network/Http/Request_Spec.enso
+++ b/test/Base_Tests/src/Network/Http/Request_Spec.enso
@@ -47,8 +47,8 @@ add_specs suite_builder =
             req.body.should_equal (Request_Body.Form_Data body_form)
             req.headers.should_equal [Header.application_x_www_form_urlencoded]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Network/Http_Spec.enso b/test/Base_Tests/src/Network/Http_Spec.enso
index ce37441cc107..6f51a86b74ba 100644
--- a/test/Base_Tests/src/Network/Http_Spec.enso
+++ b/test/Base_Tests/src/Network/Http_Spec.enso
@@ -624,12 +624,12 @@ add_specs suite_builder =
             # Invalid token
             r3 = Data.fetch url headers=[Header.authorization_bearer "invalid-token"]
             r3.should_fail_with HTTP_Error
-            r3.catch.status_code.code . should_equal 403
+            r3.catch.status_code.code . should_equal 401
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 echo_response_template method path data content_type content_length=data.length =
diff --git a/test/Base_Tests/src/Network/URI_Spec.enso b/test/Base_Tests/src/Network/URI_Spec.enso
index d8dc64f23a74..23f18d92df0f 100644
--- a/test/Base_Tests/src/Network/URI_Spec.enso
+++ b/test/Base_Tests/src/Network/URI_Spec.enso
@@ -1,5 +1,5 @@
 from Standard.Base import all
-import Standard.Base.Data.Enso_Cloud.Enso_Secret.Enso_Secret_Error
+import Standard.Base.Enso_Cloud.Enso_Secret.Enso_Secret_Error
 import Standard.Base.Errors.Common.Syntax_Error
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 import Standard.Base.Network.HTTP.Request.Request
@@ -330,10 +330,10 @@ add_specs suite_builder =
                     r1.should_fail_with Illegal_Argument
                     r1.catch.to_display_text . should_contain "Secrets are not allowed in HTTP connections, use HTTPS instead."
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 decode_query_params : Json -> Vector (Pair Text Text)
diff --git a/test/Base_Tests/src/Random_Spec.enso b/test/Base_Tests/src/Random_Spec.enso
index 9da9eb1111e0..023dd6180d21 100644
--- a/test/Base_Tests/src/Random_Spec.enso
+++ b/test/Base_Tests/src/Random_Spec.enso
@@ -153,8 +153,8 @@ add_specs suite_builder = suite_builder.group "Random" group_builder->
         Random.new_generator 12345 . float . should_equal 0.3618031071604718 epsilon=0.00000001
         Random.new_generator 12345 . gaussian . should_equal -0.187808989658912 epsilon=0.00000001
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Ascribed_Parameters_Spec.enso b/test/Base_Tests/src/Runtime/Ascribed_Parameters_Spec.enso
index dedf71a2115b..45e137b10b55 100644
--- a/test/Base_Tests/src/Runtime/Ascribed_Parameters_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Ascribed_Parameters_Spec.enso
@@ -61,8 +61,8 @@ add_specs suite_builder = suite_builder.group "Function Ascribed Parameters" gro
         with_type_error (t4 "hi") . should_fail_with Type_Error
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Asserts_Spec.enso b/test/Base_Tests/src/Runtime/Asserts_Spec.enso
index a7085bcdb589..54c479c6abc9 100644
--- a/test/Base_Tests/src/Runtime/Asserts_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Asserts_Spec.enso
@@ -34,8 +34,8 @@ add_specs suite_builder = suite_builder.group "Asserts" group_builder->
         Meta.type_of p.payload . should_be_a Type_Error
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Lazy_Generator_Spec.enso b/test/Base_Tests/src/Runtime/Lazy_Generator_Spec.enso
index 91a322f46d77..858be3e87bed 100644
--- a/test/Base_Tests/src/Runtime/Lazy_Generator_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Lazy_Generator_Spec.enso
@@ -1,3 +1,4 @@
+from Standard.Base import all
 from Standard.Test import all
 
 
@@ -17,8 +18,8 @@ add_specs suite_builder = suite_builder.group "Lazy Generator" group_builder->
         four = three.next
         four.n . should_equal 4
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Lazy_Spec.enso b/test/Base_Tests/src/Runtime/Lazy_Spec.enso
index fb53fd782825..126ebdb35e01 100644
--- a/test/Base_Tests/src/Runtime/Lazy_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Lazy_Spec.enso
@@ -96,8 +96,8 @@ add_specs suite_builder = suite_builder.group "Lazy" group_builder->
         Test.expect_panic_with matcher=Illegal_Argument <|
             Lazy.new_eager (Panic.throw (Illegal_Argument.Error "FOO"))
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Managed_Resource_Spec.enso b/test/Base_Tests/src/Runtime/Managed_Resource_Spec.enso
index cfa7d519c0cd..f97192838db6 100644
--- a/test/Base_Tests/src/Runtime/Managed_Resource_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Managed_Resource_Spec.enso
@@ -56,8 +56,8 @@ add_specs suite_builder = suite_builder.group "Managed_Resource" group_builder->
         r_3 = Panic.recover Any <| Managed_Resource.bracket 42 (_-> Nothing) (_-> Panic.throw "action")
         r_3.catch . should_equal "action"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Missing_Required_Arguments_Spec.enso b/test/Base_Tests/src/Runtime/Missing_Required_Arguments_Spec.enso
index 63c7ea48c3ff..44a22c18f1aa 100644
--- a/test/Base_Tests/src/Runtime/Missing_Required_Arguments_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Missing_Required_Arguments_Spec.enso
@@ -84,8 +84,8 @@ add_specs suite_builder = suite_builder.group "Missing_Required_Argument" group_
         mf4.should_be_a Function
         (mf4 "Hello") . should_equal "Foo(44, 100): Hello"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/Ref_Spec.enso b/test/Base_Tests/src/Runtime/Ref_Spec.enso
index f0f7e1d5b60b..8f6fdae25303 100644
--- a/test/Base_Tests/src/Runtime/Ref_Spec.enso
+++ b/test/Base_Tests/src/Runtime/Ref_Spec.enso
@@ -21,8 +21,8 @@ add_specs suite_builder = suite_builder.group "Refs" group_builder->
     group_builder.specify "Example" <|
         (Ref.new 10) . modify (_+1) . should_equal 10
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Runtime/State_Spec.enso b/test/Base_Tests/src/Runtime/State_Spec.enso
index d34b88b39c52..fa1d43038a6b 100644
--- a/test/Base_Tests/src/Runtime/State_Spec.enso
+++ b/test/Base_Tests/src/Runtime/State_Spec.enso
@@ -22,8 +22,8 @@ add_specs suite_builder = suite_builder.group "State" group_builder->
         Meta.type_of p . should_equal Unsupported_Argument_Types
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Any_Spec.enso b/test/Base_Tests/src/Semantic/Any_Spec.enso
index 4972db2ed454..2ac68f7ad3d5 100644
--- a/test/Base_Tests/src/Semantic/Any_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Any_Spec.enso
@@ -109,8 +109,8 @@ add_specs suite_builder =
             Vector.is_empty [] . should_be_true
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Case_Spec.enso b/test/Base_Tests/src/Semantic/Case_Spec.enso
index 4225904acddb..3b17bcb0725e 100644
--- a/test/Base_Tests/src/Semantic/Case_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Case_Spec.enso
@@ -327,8 +327,8 @@ add_specs suite_builder = suite_builder.group "Pattern Matches" group_builder->
             _ : Function -> Nothing
             _ -> Test.fail "Expected to match on Function type."
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Conversion_Spec.enso b/test/Base_Tests/src/Semantic/Conversion_Spec.enso
index ab436844ea73..d321387038f2 100644
--- a/test/Base_Tests/src/Semantic/Conversion_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Conversion_Spec.enso
@@ -235,6 +235,8 @@ add_specs suite_builder =
             # no conversions needed when calling `exchange` methods
             nine . should_equal one
 
+    suite_builder.group "MultiValue Conversions" group_builder->
+
         group_builder.specify "Requesting Text & Foo" <|
             check a (n : Text & Foo) = case a of
                 0 -> n.foo
@@ -546,8 +548,8 @@ Hello.from (that:Any) suffix="?" = Hello.Say <| ("Any fallback:"+that.to_text) +
 Hello.from (that:Foo) suffix=" " = Hello.Say <| (that.foo.to_case Case.Upper) + suffix
 Hello.from (that:Bar) suffix="!" = Hello.Say <| (that.bar.to_case Case.Lower) + suffix
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Deep_Export/Spec.enso b/test/Base_Tests/src/Semantic/Deep_Export/Spec.enso
index a358651945a0..54954a975e5c 100644
--- a/test/Base_Tests/src/Semantic/Deep_Export/Spec.enso
+++ b/test/Base_Tests/src/Semantic/Deep_Export/Spec.enso
@@ -10,8 +10,8 @@ add_specs suite_builder =
         group_builder.specify "should allow to re-export a symbol through a module hierarchy" <|
             Internal.my_fun.should_equal 478
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Default_Args_Spec.enso b/test/Base_Tests/src/Semantic/Default_Args_Spec.enso
index 3a18fb29ba4e..a0656f17b4ce 100644
--- a/test/Base_Tests/src/Semantic/Default_Args_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Default_Args_Spec.enso
@@ -54,8 +54,8 @@ add_specs suite_builder =
         group_builder.specify "should apply default arguments that involve local functions" <|
             local_fun 0 . should_equal 43
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Equals_Spec.enso b/test/Base_Tests/src/Semantic/Equals_Spec.enso
index 040c1ce2c596..ac6b7f2fd688 100644
--- a/test/Base_Tests/src/Semantic/Equals_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Equals_Spec.enso
@@ -279,8 +279,8 @@ add_specs suite_builder =
             y = js_map 10 5
             x==y . should_be_true
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Error_Spec.enso b/test/Base_Tests/src/Semantic/Error_Spec.enso
index 54ef014b3b1c..a414a0a58f67 100644
--- a/test/Base_Tests/src/Semantic/Error_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Error_Spec.enso
@@ -484,8 +484,8 @@ type C
 
 C.to_num self a b c = a+b+c
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Instrumentor_Spec.enso b/test/Base_Tests/src/Semantic/Instrumentor_Spec.enso
index 6bbb3cea16b4..90bb347523b4 100644
--- a/test/Base_Tests/src/Semantic/Instrumentor_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Instrumentor_Spec.enso
@@ -254,10 +254,10 @@ add_specs suite_builder =
             result3 = fib2 10
             result3 . should_equal 89
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 
diff --git a/test/Base_Tests/src/Semantic/Java_Interop_Spec.enso b/test/Base_Tests/src/Semantic/Java_Interop_Spec.enso
index be22cc96f07b..28a61b4db9e1 100644
--- a/test/Base_Tests/src/Semantic/Java_Interop_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Java_Interop_Spec.enso
@@ -91,8 +91,8 @@ add_specs suite_builder =
             err.to_text . contains "NON_EXISTING" . should_be_true
             err.to_text . contains "is not visible in this scope" . should_be_true
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Js_Interop_Spec.enso b/test/Base_Tests/src/Semantic/Js_Interop_Spec.enso
index f74655858ccb..5a9a2796bbd7 100644
--- a/test/Base_Tests/src/Semantic/Js_Interop_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Js_Interop_Spec.enso
@@ -215,8 +215,8 @@ add_specs suite_builder = suite_builder.group "Polyglot JS" group_builder->
     group_builder.specify "allow use of JavaScript debugger statement" <|
         debug
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Meta_Location_Spec.enso b/test/Base_Tests/src/Semantic/Meta_Location_Spec.enso
index 3beaf51ca31a..ff3d8a877834 100644
--- a/test/Base_Tests/src/Semantic/Meta_Location_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Meta_Location_Spec.enso
@@ -32,8 +32,8 @@ add_specs suite_builder = suite_builder.group "Meta-Value Inspection" group_buil
     group_builder.specify "should allow to fetch enso project description from a module" <|
         (Project_Description.new Standard.Base.Data.Vector).name.should_equal "Base"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Meta_Spec.enso b/test/Base_Tests/src/Semantic/Meta_Spec.enso
index 821995f0f3ca..bc49d5ae6354 100644
--- a/test/Base_Tests/src/Semantic/Meta_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Meta_Spec.enso
@@ -398,26 +398,22 @@ add_specs suite_builder =
         group_builder.specify "fail if non-atom is created" <|
             key = Panic.catch Uninitialized_State handler=(caught_panic-> caught_panic.payload.key) <|
                 Meta.atom_with_hole (_ -> 2)
-            case key of
-                t : Number ->
-                    t . should_equal 2
+            key . should_equal 2
+
+        group_builder.specify "only one hole can be used" <|
+            Panic.catch Uninitialized_State (Meta.atom_with_hole (e -> My_Type.Value e e e)) err->
+                err.payload.should_be_a Uninitialized_State
 
-        group_builder.specify "only one atom_with_hole is used" <|
-            pair = Meta.atom_with_hole (e -> My_Type.Value e e e)
+        group_builder.specify "fill called twice does not change anything" <|
+            pair = Meta.atom_with_hole (e -> My_Type.Value e 2 3)
             atom = pair.value
             fill = pair.fill
 
             Meta.is_atom atom . should_be_true
 
-            case atom.foo of
-                n : Number -> Test.fail "Shouldn't be number yet: "+n
-                _ -> Nothing
-            case atom.baz of
-                n : Number -> Test.fail "Shouldn't be number yet: "+n
-                _ -> Nothing
-            case atom.bar of
-                n : Number -> Test.fail "Shouldn't be number yet: "+n
-                _ -> Nothing
+            atom.foo.to_text . should_equal "Meta.atom_with_hole"
+            atom.bar.to_text . should_equal "2"
+            atom.baz.to_text . should_equal "3"
 
             fill 2
             atom.foo . should_equal 2
@@ -425,12 +421,26 @@ add_specs suite_builder =
             fill 10 # no change
             atom.foo . should_equal 2
 
-            case atom.baz of
-                n : Number -> Test.fail "Not changed to number: "+n
-                _ -> Nothing
-            case atom.bar of
-                n : Number -> Test.fail "Not changed to number: "+n
-                _ -> Nothing
+        group_builder.specify "should not leak index value to different atoms" <|
+            at1 = Meta.atom_with_hole (e -> My_Type.Value 1 e 3)
+            at1.fill 2
+            at1.value.foo . should_equal 1
+            at1.value.bar . should_equal 2
+            at1.value.baz . should_equal 3
+
+            at2 = Meta.atom_with_hole (e -> My_Type.Value e 2 3)
+            at2.fill 1
+            at2.value.foo . should_equal 1
+            at2.value.bar . should_equal 2
+            at2.value.baz . should_equal 3
+
+            at3 = Meta.atom_with_hole (e -> My_Type.Value 1 2 e)
+            at3.fill 3
+            at3.value.foo . should_equal 1
+            at3.value.bar . should_equal 2
+            at3.value.baz . should_equal 3
+
+
     suite_builder.group "Unresolved symbol" group_builder->
         group_builder.specify "should be treated as a Function" <|
             (_.is_nothing) . is_a Function . should_equal True
@@ -466,8 +476,8 @@ add_specs suite_builder =
             typ = Meta.Type.find fqn
             typ . should_equal meta_type
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Python_Interop_Spec.enso b/test/Base_Tests/src/Semantic/Python_Interop_Spec.enso
index 213c3b02de74..d96a1f0e79a9 100644
--- a/test/Base_Tests/src/Semantic/Python_Interop_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Python_Interop_Spec.enso
@@ -211,9 +211,9 @@ add_specs suite_builder =
             error = Error.throw 42
             my_method error 0 . should_fail_with Integer
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
diff --git a/test/Base_Tests/src/Semantic/R_Interop_Spec.enso b/test/Base_Tests/src/Semantic/R_Interop_Spec.enso
index 314e0b888239..be49cf17ae32 100644
--- a/test/Base_Tests/src/Semantic/R_Interop_Spec.enso
+++ b/test/Base_Tests/src/Semantic/R_Interop_Spec.enso
@@ -178,8 +178,8 @@ add_specs suite_builder =
             error = Error.throw 42
             my_method error 0 . should_fail_with Integer
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/Semantic/Runtime_Spec.enso b/test/Base_Tests/src/Semantic/Runtime_Spec.enso
index 52a772680709..5c4ec3955915 100644
--- a/test/Base_Tests/src/Semantic/Runtime_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Runtime_Spec.enso
@@ -1,6 +1,7 @@
 import Standard.Base.Runtime
 import Standard.Base.Data.Numbers.Integer
 import Standard.Base.Any.Any
+import Standard.Base.Nothing.Nothing
 import Standard.Base.Panic.Panic
 
 from Standard.Base.Runtime.Context import Input, Output
@@ -28,7 +29,7 @@ add_specs suite_builder =
             res . should_equal 2
         group_builder.specify "should prevent execution with explicitly disabled context" <|
             res = Panic.catch Any (Runtime.with_disabled_context Input environment=Runtime.current_execution_environment (in_fn 1)) p-> p.payload.to_text
-            res . should_equal "(Forbidden_Operation.Error 'Input')"
+            res . should_equal "(Forbidden_Operation.Error 'The Input context is disabled.')"
         group_builder.specify "should be configurable" <|
             r1 = Runtime.with_enabled_context Input environment=Runtime.current_execution_environment <|
                 Runtime.with_enabled_context Output environment=Runtime.current_execution_environment <|
@@ -36,10 +37,9 @@ add_specs suite_builder =
             r1.should_equal 22
 
             r2 = Panic.catch Any (Runtime.with_disabled_context Input environment=Runtime.current_execution_environment  <| in_fn (out_fn 10)) p-> p.payload.to_text
-            r2 . should_equal "(Forbidden_Operation.Error 'Input')"
+            r2 . should_equal "(Forbidden_Operation.Error 'The Input context is disabled.')"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
-
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/Semantic/Warnings_Spec.enso b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
index 33bbc7748374..06fbd7cc4e93 100644
--- a/test/Base_Tests/src/Semantic/Warnings_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
@@ -468,7 +468,7 @@ add_specs suite_builder = suite_builder.group "Dataflow Warnings" group_builder-
         res2 . should_equal True
         Warning.get_all res2 . map .value . should_equal ["WARNING2"]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/System/Environment_Spec.enso b/test/Base_Tests/src/System/Environment_Spec.enso
index c5367c68377f..7553e163e295 100644
--- a/test/Base_Tests/src/System/Environment_Spec.enso
+++ b/test/Base_Tests/src/System/Environment_Spec.enso
@@ -33,8 +33,8 @@ add_specs suite_builder = suite_builder.group "Environment" group_builder->
             x
         result_3 . should_equal ["2", "3", "4"]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/File_Read_Spec.enso b/test/Base_Tests/src/System/File_Read_Spec.enso
index 246bd9c5baa2..7df572eba0f0 100644
--- a/test/Base_Tests/src/System/File_Read_Spec.enso
+++ b/test/Base_Tests/src/System/File_Read_Spec.enso
@@ -79,8 +79,8 @@ add_specs suite_builder =
             r1.should_fail_with File_Error
             r1.catch.should_be_a File_Error.Corrupted_Format
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/File_Spec.enso b/test/Base_Tests/src/System/File_Spec.enso
index 08798815d843..e31002e226e6 100644
--- a/test/Base_Tests/src/System/File_Spec.enso
+++ b/test/Base_Tests/src/System/File_Spec.enso
@@ -841,7 +841,7 @@ add_specs suite_builder =
             filtered4 = root.list name_filter="nested/*.txt" recursive=True . map .to_text
             filtered4.sort.should_equal (resolve ["subdirectory/nested/b.txt"])
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Base_Tests/src/System/Process_Spec.enso b/test/Base_Tests/src/System/Process_Spec.enso
index 590c1e3134a2..da05ea4500da 100644
--- a/test/Base_Tests/src/System/Process_Spec.enso
+++ b/test/Base_Tests/src/System/Process_Spec.enso
@@ -107,8 +107,8 @@ add_specs suite_builder =
                     run_result.stdout . should_equal 'sample'
                     run_result.stderr . should_equal ""
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/Reporting_Stream_Decoder_Spec.enso b/test/Base_Tests/src/System/Reporting_Stream_Decoder_Spec.enso
index 651ec3277276..c264a7c72fab 100644
--- a/test/Base_Tests/src/System/Reporting_Stream_Decoder_Spec.enso
+++ b/test/Base_Tests/src/System/Reporting_Stream_Decoder_Spec.enso
@@ -134,8 +134,8 @@ read_characters decoder n =
         transfer_codepoints Nothing
         v.to_vector
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/Reporting_Stream_Encoder_Spec.enso b/test/Base_Tests/src/System/Reporting_Stream_Encoder_Spec.enso
index f7ea0def4848..a57c2263033c 100644
--- a/test/Base_Tests/src/System/Reporting_Stream_Encoder_Spec.enso
+++ b/test/Base_Tests/src/System/Reporting_Stream_Encoder_Spec.enso
@@ -129,8 +129,8 @@ add_specs suite_builder =
             f.read_text encoding . should_equal "BAZ23"
             f.delete_if_exists
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/System_Spec.enso b/test/Base_Tests/src/System/System_Spec.enso
index 4ec7036b8b13..b85a21205672 100644
--- a/test/Base_Tests/src/System/System_Spec.enso
+++ b/test/Base_Tests/src/System/System_Spec.enso
@@ -13,8 +13,8 @@ add_specs suite_builder = suite_builder.group "System" group_builder->
             result = System.create_process "echo" ["foo", "bar"] "" False False False
             result.exit_code . should_equal 0
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Base_Tests/src/System/Temporary_File_Spec.enso b/test/Base_Tests/src/System/Temporary_File_Spec.enso
index 315ecf7d83ea..84939bbf4ef0 100644
--- a/test/Base_Tests/src/System/Temporary_File_Spec.enso
+++ b/test/Base_Tests/src/System/Temporary_File_Spec.enso
@@ -13,10 +13,10 @@ polyglot java import java.io.ByteArrayInputStream
 polyglot java import java.io.FileInputStream
 polyglot java import java.io.InputStream
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Examples_Tests/src/Examples_Spec.enso b/test/Examples_Tests/src/Examples_Spec.enso
index cdc0ff7f67ea..60221572dc53 100644
--- a/test/Examples_Tests/src/Examples_Spec.enso
+++ b/test/Examples_Tests/src/Examples_Spec.enso
@@ -119,8 +119,8 @@ add_specs suite_builder = suite_builder.group "Examples" group_builder->
         match.groups.length . should_equal 5
         match.named_groups.size . should_equal 2
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Examples_Tests/src/Main.enso b/test/Examples_Tests/src/Main.enso
index 07b09feb2000..a52a4c20f0af 100644
--- a/test/Examples_Tests/src/Main.enso
+++ b/test/Examples_Tests/src/Main.enso
@@ -5,9 +5,9 @@ from Standard.Test import all
 import project.Examples_Spec
 import project.Python_Examples_Spec
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         Examples_Spec.add_specs suite_builder
         Python_Examples_Spec.add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Examples_Tests/src/Python_Examples_Spec.enso b/test/Examples_Tests/src/Python_Examples_Spec.enso
index c1b7a584e7ae..d9ac28b89828 100644
--- a/test/Examples_Tests/src/Python_Examples_Spec.enso
+++ b/test/Examples_Tests/src/Python_Examples_Spec.enso
@@ -107,8 +107,8 @@ add_specs suite_builder = suite_builder.group "Python Examples" group_builder->
         res.stdout.should_contain "array(["
         res.stdout.should_contain "])"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/LongNullHandling.java b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/LongNullHandling.java
index 32a6287d0341..8c820c1bcb6b 100644
--- a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/LongNullHandling.java
+++ b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/LongNullHandling.java
@@ -23,15 +23,15 @@ public LongStorage run(
         LongStorage storage, LongStorage arg, MapOperationProblemAggregator problemAggregator) {
       int n = storage.size();
       long[] newVals = new long[n];
-      BitSet missing = new BitSet();
+      BitSet isNothing = new BitSet();
       for (int i = 0; i < n; i++) {
-        if (storage.isNa(i) || arg.isNa(i)) {
-          missing.set(i);
+        if (storage.isNothing(i) || arg.isNothing(i)) {
+          isNothing.set(i);
         } else {
           newVals[i] = doLong(storage.getItem(i), arg.getItem(i), i, problemAggregator);
         }
       }
-      return new LongStorage(newVals, n, missing, IntegerType.INT_64);
+      return new LongStorage(newVals, n, isNothing, IntegerType.INT_64);
     }
   }
 
@@ -45,20 +45,20 @@ public LongStorage run(
         LongStorage storage, LongStorage arg, MapOperationProblemAggregator problemAggregator) {
       int n = storage.size();
       long[] newVals = new long[n];
-      BitSet missing = new BitSet();
+      BitSet isNothing = new BitSet();
       for (int i = 0; i < n; i++) {
-        if (storage.isNa(i) || arg.isNa(i)) {
-          missing.set(i);
+        if (storage.isNothing(i) || arg.isNothing(i)) {
+          isNothing.set(i);
         } else {
           Long x = doLong(storage.getItem(i), arg.getItem(i), i, problemAggregator);
           if (x == null) {
-            missing.set(i);
+            isNothing.set(i);
           } else {
             newVals[i] = x;
           }
         }
       }
-      return new LongStorage(newVals, n, missing, IntegerType.INT_64);
+      return new LongStorage(newVals, n, isNothing, IntegerType.INT_64);
     }
   }
 
@@ -83,23 +83,23 @@ public LongStorage run(
         LongStorage storage, LongStorage arg, MapOperationProblemAggregator problemAggregator) {
       int n = storage.size();
       long[] newVals = new long[n];
-      BitSet missing = new BitSet();
+      BitSet isNothing = new BitSet();
       NullityReporter nullityReporter = new NullityReporter();
       for (int i = 0; i < n; i++) {
-        if (storage.isNa(i) || arg.isNa(i)) {
-          missing.set(i);
+        if (storage.isNothing(i) || arg.isNothing(i)) {
+          isNothing.set(i);
         } else {
           long x =
               doLong(storage.getItem(i), arg.getItem(i), i, problemAggregator, nullityReporter);
           if (nullityReporter.wasLastNull) {
-            missing.set(i);
+            isNothing.set(i);
             nullityReporter.wasLastNull = false;
           } else {
             newVals[i] = x;
           }
         }
       }
-      return new LongStorage(newVals, n, missing, IntegerType.INT_64);
+      return new LongStorage(newVals, n, isNothing, IntegerType.INT_64);
     }
   }
 
diff --git a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/MapHelpers.java b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/MapHelpers.java
index 21c0397b3b32..1566a9be19e9 100644
--- a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/MapHelpers.java
+++ b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/MapHelpers.java
@@ -24,7 +24,7 @@ public static StringStorage stringConcatBimap(StringStorage storage1, StringStor
     int n = storage1.size();
     String[] result = new String[n];
     for (int i = 0; i < n; i++) {
-      if (!storage1.isNa(i) && !storage2.isNa(i)) {
+      if (!storage1.isNothing(i) && !storage2.isNothing(i)) {
         result[i] = storage1.getItem(i) + storage2.getItem(i);
       } else {
         result[i] = null;
@@ -40,59 +40,59 @@ public static LongStorage longAddBimap(LongStorage storage1, LongStorage storage
 
     int n = storage1.size();
     long[] result = new long[n];
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (!storage1.isNa(i) && !storage2.isNa(i)) {
+      if (!storage1.isNothing(i) && !storage2.isNothing(i)) {
         result[i] = storage1.getItem(i) + storage2.getItem(i);
       } else {
-        missing.set(i);
+        isNothing.set(i);
       }
     }
-    return new LongStorage(result, n, missing, IntegerType.INT_64);
+    return new LongStorage(result, n, isNothing, IntegerType.INT_64);
   }
 
   public static BoolStorage textEndsWith(StringStorage storage, String suffix) {
     int n = storage.size();
     BitSet result = new BitSet();
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (storage.isNa(i)) {
-        missing.set(i);
+      if (storage.isNothing(i)) {
+        isNothing.set(i);
       } else {
         if (Text_Utils.ends_with(storage.getItem(i), suffix)) {
           result.set(i);
         }
       }
     }
-    return new BoolStorage(result, missing, n, false);
+    return new BoolStorage(result, isNothing, n, false);
   }
 
   public static LongStorage longAdd(LongStorage storage, long shift) {
     int n = storage.size();
     long[] result = new long[n];
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         result[i] = storage.getItem(i) + shift;
       } else {
-        missing.set(i);
+        isNothing.set(i);
       }
     }
-    return new LongStorage(result, n, missing, IntegerType.INT_64);
+    return new LongStorage(result, n, isNothing, IntegerType.INT_64);
   }
 
   public static LongStorage getYear(DateStorage storage) {
     int n = storage.size();
     long[] result = new long[n];
-    BitSet missing = new BitSet();
+    BitSet isNothing = new BitSet();
     for (int i = 0; i < n; i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         result[i] = storage.getItem(i).getYear();
       } else {
-        missing.set(i);
+        isNothing.set(i);
       }
     }
-    return new LongStorage(result, n, missing, IntegerType.INT_64);
+    return new LongStorage(result, n, isNothing, IntegerType.INT_64);
   }
 
   public static Storage<?> mapCallback(
@@ -106,7 +106,7 @@ public static Storage<?> mapCallback(
             ? new InferredBuilder(n, problemAggregator)
             : Builder.getForType(expectedType, n, problemAggregator);
     for (int i = 0; i < n; i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         builder.append(fn.apply(storage.getItemBoxed(i)));
       } else {
         builder.appendNulls(1);
diff --git a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/SimpleStorageAggregateHelpers.java b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/SimpleStorageAggregateHelpers.java
index 8c2f2172edbc..ac070cf0a43c 100644
--- a/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/SimpleStorageAggregateHelpers.java
+++ b/test/Exploratory_Benchmarks/polyglot-sources/exploratory-benchmark-java-helpers/src/main/java/org/enso/exploratory_benchmark_helpers/SimpleStorageAggregateHelpers.java
@@ -10,7 +10,7 @@ public class SimpleStorageAggregateHelpers {
   public static long sumLongStorage(LongStorage storage) {
     long sum = 0;
     for (int i = 0; i < storage.size(); i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         sum += storage.getItem(i);
       }
     }
@@ -32,7 +32,7 @@ public static String longestText(StringStorage storage) {
     String longestText = null;
     int n = storage.size();
     for (int i = 0; i < n; i++) {
-      if (!storage.isNa(i)) {
+      if (!storage.isNothing(i)) {
         String text = storage.getItem(i);
         long length = Text_Utils.grapheme_length(text);
         if (length > longest) {
diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso b/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso
index bb4d24584411..559353f87d2b 100644
--- a/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso
+++ b/test/Exploratory_Benchmarks/src/Table/Column_Aggregate.enso
@@ -62,7 +62,7 @@ type Primitive_Total_Aggregate
         n = self.int_column.length
         storage = self.int_column.java_column.getStorage
         (0.up_to n).fold 0 acc-> ix->
-            if storage.isNa ix then acc else
+            if storage.isNothing ix then acc else
                 acc + storage.getItem ix
 
     verify_correctness self =
diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso b/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso
index 923c27f3dd96..f49b553c53bc 100644
--- a/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso
+++ b/test/Exploratory_Benchmarks/src/Table/Column_Bi_Map.enso
@@ -68,7 +68,7 @@ type Primitive_Bi_Map_Test
             storage_1 = self.int_column_1.java_column.getStorage
             storage_2 = self.int_column_2.java_column.getStorage
             0.up_to n . each i->
-                if storage_1.isNa i || storage_2.isNa i then builder.appendNulls 1 else
+                if storage_1.isNothing i || storage_2.isNothing i then builder.appendNulls 1 else
                     item_1 = storage_1.getItem i
                     item_2 = storage_2.getItem i
                     res = item_1 + item_2
diff --git a/test/Exploratory_Benchmarks/src/Table/Column_Map.enso b/test/Exploratory_Benchmarks/src/Table/Column_Map.enso
index 9a88ae2c8fe8..61ab49f1bb9d 100644
--- a/test/Exploratory_Benchmarks/src/Table/Column_Map.enso
+++ b/test/Exploratory_Benchmarks/src/Table/Column_Map.enso
@@ -72,7 +72,7 @@ type Primitive_Map_Test
         builder = NumericBuilder.createLongBuilder n
         storage = self.int_column.java_column.getStorage
         0.up_to n . each i->
-            case storage.isNa i of
+            case storage.isNothing i of
                 True ->
                     builder.appendNulls 1
                 False ->
diff --git a/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso b/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso
index e7ac99a7458a..f14501810d1b 100644
--- a/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso
+++ b/test/Exploratory_Benchmarks/src/Table/Enso_Callback.enso
@@ -90,7 +90,7 @@ type Primitive_Enso_Callback_Test
         builder = NumericBuilder.createLongBuilder n
         storage = self.int_column.java_column.getStorage
         0.up_to n . each i->
-            case storage.isNa i of
+            case storage.isNothing i of
                 True ->
                     builder.appendNulls 1
                 False ->
diff --git a/test/Geo_Tests/src/Main.enso b/test/Geo_Tests/src/Main.enso
index fb328ef43682..97d1734b1022 100644
--- a/test/Geo_Tests/src/Main.enso
+++ b/test/Geo_Tests/src/Main.enso
@@ -4,8 +4,8 @@ from Standard.Test import all
 
 import project.Geo_Spec
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         Geo_Spec.add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Google_Api_Test/src/Main.enso b/test/Google_Api_Test/src/Main.enso
index ac1ae7f6929b..9a98f493644a 100644
--- a/test/Google_Api_Test/src/Main.enso
+++ b/test/Google_Api_Test/src/Main.enso
@@ -5,10 +5,10 @@ from Standard.Test import all
 
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Image_Tests/src/Data/Image_Spec.enso b/test/Image_Tests/src/Data/Image_Spec.enso
index 84a18fbb8f73..a6028d47d18f 100644
--- a/test/Image_Tests/src/Data/Image_Spec.enso
+++ b/test/Image_Tests/src/Data/Image_Spec.enso
@@ -398,8 +398,8 @@ add_specs suite_builder =
             o = Matrix.ones 2 3
             zeros/o . should_fail_with Matrix_Error.Dimensions_Not_Equal
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Image_Tests/src/Data/Matrix_Spec.enso b/test/Image_Tests/src/Data/Matrix_Spec.enso
index 9e8838ddb2d3..63b6f6ba4c40 100644
--- a/test/Image_Tests/src/Data/Matrix_Spec.enso
+++ b/test/Image_Tests/src/Data/Matrix_Spec.enso
@@ -423,8 +423,8 @@ add_specs suite_builder =
             o = Matrix.ones 2 3
             zeros/o . should_fail_with Matrix_Error.Dimensions_Not_Equal
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Image_Tests/src/Image_Read_Write_Spec.enso b/test/Image_Tests/src/Image_Read_Write_Spec.enso
index c9f80578a25e..658f5bd07059 100644
--- a/test/Image_Tests/src/Image_Read_Write_Spec.enso
+++ b/test/Image_Tests/src/Image_Read_Write_Spec.enso
@@ -104,8 +104,8 @@ add_specs suite_builder =
 
             out.delete_if_exists
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Image_Tests/src/Main.enso b/test/Image_Tests/src/Main.enso
index df0c3e89390f..e76d11e462b8 100644
--- a/test/Image_Tests/src/Main.enso
+++ b/test/Image_Tests/src/Main.enso
@@ -6,10 +6,10 @@ import project.Image_Read_Write_Spec
 import project.Data.Image_Spec
 import project.Data.Matrix_Spec
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         Image_Read_Write_Spec.add_specs suite_builder
         Matrix_Spec.add_specs suite_builder
         Image_Spec.add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso
index 1316a357caa8..f3e5583f3dff 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Add_Row_Number_Spec.enso
@@ -15,7 +15,7 @@ from project.Common_Table_Operations.Util import run_default_backend
 
 polyglot java import java.lang.Long as Java_Long
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso
index dad884773ae2..877573fec62d 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Aggregate_Spec.enso
@@ -1,6 +1,6 @@
 from Standard.Base import all hiding First, Last
 
-from Standard.Table import Table, Sort_Column
+from Standard.Table import Table, Sort_Column, expr
 from Standard.Table.Data.Aggregate_Column.Aggregate_Column import all
 import Standard.Table.Data.Expression.Expression_Error
 from Standard.Table.Errors import all
@@ -17,8 +17,8 @@ polyglot java import java.lang.Double
 type Test_Selection
     Config problem_handling=True advanced_stats=True text_concat=True text_shortest_longest=True first_last=True first_last_row_order=True std_dev=True multi_distinct=True aggregation_problems=True nan=True date_support=True
 
-main =
-    run_default_backend add_specs
+main filter=Nothing =
+    run_default_backend add_specs filter
 
 type Data
     Value ~data
@@ -1405,7 +1405,7 @@ add_specs suite_builder setup =
            to verify that  all of them correctly support expressions.
         group_builder.specify "should allow expressions in aggregates" <|
             table = table_builder [["Index", [1, 1, 2, 2]], ["Value", [1, 2, 3, 4]]]
-            t1 = table.aggregate ["Index"] [Sum "Value", Sum "[Value]*[Value]"]
+            t1 = table.aggregate ["Index"] [Sum "Value", Sum (expr "[Value]*[Value]")]
             t1.column_count . should_equal 3
             r1 =  t1 |> materialize |> _.order_by "Index"
             r1.at "Index" . to_vector . should_equal [1, 2]
@@ -1415,19 +1415,19 @@ add_specs suite_builder setup =
             r1.at -1 . to_vector . should_equal [5, 25]
 
         group_builder.specify "should warn when encountering invalid expressions, but try to perform the aggregations that are still valid" <|
-            action1 = data.table.aggregate ["Index"] [Sum "Value", Sum "[MISSING]*[MISSING]"] on_problems=_
+            action1 = data.table.aggregate ["Index"] [Sum "Value", Sum (expr "[MISSING]*[MISSING]")] on_problems=_
             tester1 = expect_column_names ["Index", "Sum Value"]
             problems1 = [Invalid_Aggregate_Column.Error "[MISSING]*[MISSING]" (No_Such_Column.Error "MISSING")]
             Problems.test_problem_handling action1 problems1 tester1
 
-            t2 = data.table.aggregate ["Index"] [Sum "Value", Sum "[[["] on_problems=Problem_Behavior.Ignore
+            t2 = data.table.aggregate ["Index"] [Sum "Value", Sum (expr "[[[")] on_problems=Problem_Behavior.Ignore
             expect_column_names ["Index", "Sum Value"] t2
-            err3 = data.table.aggregate ["Index"] [Sum "Value", Sum "[[["] on_problems=Problem_Behavior.Report_Error
+            err3 = data.table.aggregate ["Index"] [Sum "Value", Sum (expr "[[[")] on_problems=Problem_Behavior.Report_Error
             err3.should_fail_with Invalid_Aggregate_Column
             err3.catch.name . should_equal "[[["
             err3.catch.expression_error . should_be_a Expression_Error.Syntax_Error
 
-            t4 = data.table.aggregate columns=[Sum "[MISSING]*[MISSING]"]
+            t4 = data.table.aggregate columns=[Sum (expr "[MISSING]*[MISSING]")]
             t4 . should_fail_with Invalid_Aggregate_Column
             err4 = t4.catch
             err4.name.should_equal "[MISSING]*[MISSING]"
@@ -1512,7 +1512,7 @@ add_specs suite_builder setup =
             Problems.test_problem_handling action problems tester
 
         group_builder.specify "should raise a warning when duplicate column names" <|
-            action = table.aggregate columns=[Sum "Value" new_name="AGG1", Count new_name="AGG1"] on_problems=_
+            action = table.aggregate columns=[Sum "Value" as="AGG1", Count as="AGG1"] on_problems=_
             problems = [Duplicate_Output_Column_Names.Error ["AGG1"]]
             tester = expect_column_names ["AGG1", "AGG1 1"]
             Problems.test_problem_handling action problems tester
diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Name_Edge_Cases_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Name_Edge_Cases_Spec.enso
index 9c69bf4de3ef..cb374f215293 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Column_Name_Edge_Cases_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Column_Name_Edge_Cases_Spec.enso
@@ -38,7 +38,7 @@ add_specs suite_builder setup =
         group_builder.specify "case insensitive name collisions - set" <|
             t1 = table_builder [["X", [1]]]
             Problems.assume_no_problems (t1.at "X" . rename "x")
-            t2 = t1.set "[X] + 100" "x"
+            t2 = t1.set (expr "[X] + 100") "x"
             case is_case_sensitive of
                 False ->
                     t2.should_fail_with Clashing_Column_Name
@@ -136,7 +136,7 @@ add_specs suite_builder setup =
 
         group_builder.specify "case insensitive name collisions - cross_tab" <|
             t0 = table_builder [["X", ["a", "A", "b"]], ["Y", [4, 5, 6]]]
-            t1 = t0.cross_tab group_by=[] name_column="X" values=[Aggregate_Column.First "Y"] . sort_columns
+            t1 = t0.cross_tab group_by=[] names="X" values=[Aggregate_Column.First "Y"] . sort_columns
             case setup.is_database of
                 # TODO remove this check once implemented
                 True -> t1.should_fail_with Unsupported_Database_Operation
diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
index ffbf334a4de2..4155f38d4a8b 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
@@ -12,7 +12,7 @@ from Standard.Table.Data.Type.Value_Type import Bits
 from Standard.Table.Errors import all
 
 from Standard.Database.Errors import all
-import Standard.Database.Data.Table.Table as Database_Table
+import Standard.Database.Data.DB_Table.DB_Table
 
 from Standard.Test import all
 
@@ -21,7 +21,7 @@ import enso_dev.Base_Tests.Data.Round_Spec
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
@@ -73,28 +73,28 @@ type Min_Max_Data
 
 type Literal_Data
     Value ~data
-    
+
     connection self = self.data.at 0
     col0 self = self.data.at 1
     col1 self = self.data.at 2
-    
+
     setup create_connection_fn table_builder = Literal_Data.Value <|
         connection = create_connection_fn Nothing
         col0 = table_builder [["x", ['hello Hello', 'hello hello', 'HELLO HELLO']]] . at "x"
         col1 = table_builder [["x", ['a[bcd] A[bCd] a[bcd]', 'abac ad Ab aCAd']]] . at "x"
         [connection, col0, col1]
-    
+
     teardown self =
         self.connection.close
 
 type Replace_Data
     Value ~data
-    
+
     connection self = self.data.at 0
     col self = self.data.at 1
     patterns self = self.data.at 2
     replacements self = self.data.at 3
-    
+
     setup create_connection_fn table_builder = Replace_Data.Value <|
         connection = create_connection_fn Nothing
         table = table_builder [["x", ['hello Hello', 'hello hello', 'HELLO HELLO', 'a[bcd] A[bCd] a[bcd]', 'abac ad Ab aCAd']], ["patterns", ['hello', 'hello', 'hello', 'a[bcd]', 'a[bcd]']], ["replacements", ['bye', 'bye', 'bye', 'hey', 'hey']]]
@@ -102,7 +102,7 @@ type Replace_Data
         patterns = table.at "patterns"
         replacements = table.at "replacements"
         [connection, col, patterns, replacements]
-    
+
     teardown self =
         self.connection.close
 
@@ -505,7 +505,7 @@ add_specs suite_builder setup =
             actual = t.fill_nothing ["col0", "col1"] default
             actual.at "col0" . to_vector . should_equal [0, 1000, 4, 5, 1000, 1000]
             actual.at "col1" . to_vector . should_equal [1000, 200, 1000, 400, 500, 1000]
-        
+
         group_builder.specify "should allow to fill_nothing from larger string and expands type to fit" <|
             t = table_builder [["col0", ["0", Nothing, "4", "5", Nothing, Nothing]]] . cast "col0" (Value_Type.Char size=1 variable_length=False)
             actual = t.fill_nothing ["col0"] "ABCDE"
@@ -523,11 +523,11 @@ add_specs suite_builder setup =
         group_builder.specify "should allow to fill_nothing a fixed width from an empty string" <|
             t = table_builder [["col0", [Nothing, "200", Nothing, "400", "500", Nothing]]] . cast "col0" (Value_Type.Char size=3 variable_length=False)
             actual = t.fill_nothing ["col0"] ""
-            actual.at "col0" . to_vector . should_equal ["", "200", "", "400", "500", ""]  
+            actual.at "col0" . to_vector . should_equal ["", "200", "", "400", "500", ""]
             case setup.test_selection.length_restricted_text_columns of
                 True -> actual.at "col0" . value_type . should_equal (Value_Type.Char size=3 variable_length=True)
                 False -> actual.at "col0" . value_type . should_equal (Value_Type.Char variable_length=True)
-        
+
         group_builder.specify "should allow to fill_nothing a fixed width of width 1 correctly expanding ouptut types" <|
             t = table_builder [["col0", ["a", Nothing, " "]]] . cast "col0" (Value_Type.Char size=1 variable_length=False)
             fillBlank = t.fill_nothing ["col0"] ""
@@ -540,21 +540,21 @@ add_specs suite_builder setup =
                 False -> fillBlank.at "col0" . value_type . should_equal (Value_Type.Char variable_length=True)
                     fillOneSpace.at "col0" . value_type . should_equal (Value_Type.Char variable_length=True)
                     fillTwoSpaces.at "col0" . value_type . should_equal (Value_Type.Char variable_length=True)
-            
+
             case setup.test_selection.removes_trailing_whitespace_casting_from_char_to_varchar of
                 True -> fillBlank.at "col0" . to_vector . should_equal ["a", "", ""]
                 False -> fillBlank.at "col0" . to_vector . should_equal ["a", "", " "]
 
             fillOneSpace.at "col0" . to_vector . should_equal ["a", " ", " "]
-                   
+
             case setup.test_selection.removes_trailing_whitespace_casting_from_char_to_varchar of
                 True -> fillTwoSpaces.at "col0" . to_vector . should_equal ["a", "", ""]
                 False -> fillTwoSpaces.at "col0" . to_vector . should_equal ["a", "  ", " "]
-                
+
         group_builder.specify "should allow to fill_nothing a fixed width with a string of correct length without changing the type" <|
             t = table_builder [["col0", [Nothing, "200", Nothing, "400", "500", Nothing]]] . cast "col0" (Value_Type.Char size=3 variable_length=False)
             actual = t.fill_nothing ["col0"] "   "
-            actual.at "col0" . to_vector . should_equal ["   ", "200", "   ", "400", "500", "   "]  
+            actual.at "col0" . to_vector . should_equal ["   ", "200", "   ", "400", "500", "   "]
             case setup.test_selection.fixed_length_text_columns of
                 True -> actual.at "col0" . value_type . should_equal (Value_Type.Char size=3 variable_length=False)
                 False -> actual.at "col0" . value_type . should_equal (Value_Type.Char variable_length=True)
@@ -1163,7 +1163,7 @@ add_specs suite_builder setup =
             t = table_builder [["numbers", [1, 2, 3]]]
             col = t.at "numbers"
             col.text_length . should_fail_with Invalid_Value_Type
-        
+
         group_builder.specify "should handle operation text_left and text_right with length 1" <|
             with_mixed_columns_if_supported [["strings", ["a", "foobar", "", Nothing, "café", "It was the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of light, it was the season of darkness, it was the spring of hope, it was the winter of despair."]]] t->
                 col = t.at "strings" . cast (Value_Type.Char size=286 variable_length=True)
@@ -1171,7 +1171,7 @@ add_specs suite_builder setup =
                 resLeft.name . should_equal "text_left([strings], 1)"
                 resRight = col.text_right 1
                 resRight.name . should_equal "text_right([strings], 1)"
-                resLeft . to_vector . should_equal ["a", "f", "", Nothing, "c", "I"] 
+                resLeft . to_vector . should_equal ["a", "f", "", Nothing, "c", "I"]
                 resRight . to_vector . should_equal ["a", "r", "", Nothing, "é", "."]
                 case setup.is_database of
                     False -> resLeft . value_type . should_equal (Value_Type.Char size=286 variable_length=True)
@@ -1179,7 +1179,7 @@ add_specs suite_builder setup =
                 case setup.is_database of
                     False -> resRight . value_type . should_equal (Value_Type.Char size=286 variable_length=True)
                     True -> resRight . value_type . should_equal (Value_Type.Char variable_length=True)
-        
+
         group_builder.specify "should handle operation text_left and text_right of grapheme and non-grapheme" <|
             with_mixed_columns_if_supported [["strings", ["a", "foobar", "", Nothing, "👩‍🔬👩‍🔬V👩‍🔬👩‍🔬", "café", "It was the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of light, it was the season of darkness, it was the spring of hope, it was the winter of despair."]]] t->
                 col = t.at "strings"
@@ -1194,7 +1194,7 @@ add_specs suite_builder setup =
                 case setup.is_database of
                     False -> resRight . to_vector . should_equal ["a", "bar", "", Nothing, "V👩‍🔬👩‍🔬", "afé", "ir."] # Grapheme Length
                     True -> resRight . to_vector . should_equal ["a", "bar", "", Nothing, "👩‍🔬", "afé", "ir."]  # Storage Length
-        
+
         group_builder.specify "text_left and text_right should error on non-string columns" <|
             t = table_builder [["numbers", [1, 2, 3]]]
             col = t.at "numbers"
@@ -1782,6 +1782,6 @@ all_combinations variables =
 
 drop_table connection table =
     case table of
-        _ : Database_Table ->
+        _ : DB_Table ->
             connection.drop_table table.name
         _ -> Nothing
diff --git a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso
index e366d5bc4cd5..d61625105db1 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Conversion_Spec.enso
@@ -13,7 +13,7 @@ from project.Common_Table_Operations.Util import run_default_backend
 
 polyglot java import java.lang.Long as Java_Long
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type My_Type
     Value x
diff --git a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso
index 7c79f09ed2d7..2a9a457aaf1e 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Core_Spec.enso
@@ -14,7 +14,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~data
@@ -172,7 +172,7 @@ add_specs suite_builder setup =
             t3.column_names . should_equal ["foo", "bar", "Baz", "foo 1", "foo 2", "ab.+123", "abcd123", "bar2", "bar3"]
 
         group_builder.specify "should not allow illegal column names" <|
-            data.table.set (data.table.get "bar") new_name='a\0b' . should_fail_with Invalid_Column_Names
+            data.table.set (data.table.get "bar") as='a\0b' . should_fail_with Invalid_Column_Names
 
         group_builder.specify "should allow replacing a column" <|
             foo = data.table.get "bar" . rename "foo"
@@ -192,9 +192,9 @@ add_specs suite_builder setup =
 
         group_builder.specify "should not affect existing columns that depended on the old column being replaced" <|
             t1 = table_builder [["X", [1,2,3]]]
-            t2 = t1.set (t1.at "X" * 100) new_name="Y"
-            t3 = t2.set "[X] + 10" new_name="Z"
-            t4 = t3.set "[X] + 1000" new_name="X"
+            t2 = t1.set (t1.at "X" * 100) as="Y"
+            t3 = t2.set (expr "[X] + 10") as="Z"
+            t4 = t3.set (Simple_Expression.From (Column_Ref.Name "X") (Simple_Calculation.Add 1000)) as="X"
 
             t4.at "X" . to_vector . should_equal [1001, 1002, 1003]
             t4.at "Y" . to_vector . should_equal [100, 200, 300]
@@ -202,27 +202,27 @@ add_specs suite_builder setup =
 
         group_builder.specify "should gracefully handle expression failures" <|
             t1 = table_builder [["X", [1,2,3]]]
-            t1.set "[unknown] + 10" new_name="Z" . should_fail_with No_Such_Column
-            t1.set "[[[[" . should_fail_with Expression_Error
-            t1.set "[[[[" . catch . should_be_a Expression_Error.Syntax_Error
+            t1.set (expr "[unknown] + 10") as="Z" . should_fail_with No_Such_Column
+            t1.set (expr "[[[[") . should_fail_with Expression_Error
+            t1.set (expr "[[[[") . catch . should_be_a Expression_Error.Syntax_Error
 
         group_builder.specify "should forward expression problems" <|
             t1 = table_builder [["X", [1.5, 2.0, 0.0]]]
 
-            r1 = t1.set "([X] == 2) || ([X] + 0.5 == 2)" on_problems=Problem_Behavior.Ignore
+            r1 = t1.set (expr "([X] == 2) || ([X] + 0.5 == 2)") on_problems=Problem_Behavior.Ignore
             Problems.assume_no_problems r1
             r1.at -1 . to_vector . should_equal [True, True, False]
 
-            r2 = t1.set "([X] == 2) || ([X] + 0.5 == 2)" on_problems=Problem_Behavior.Report_Warning
+            r2 = t1.set (expr "([X] == 2) || ([X] + 0.5 == 2)") on_problems=Problem_Behavior.Report_Warning
             Problems.expect_warning Floating_Point_Equality r2
             r2.at -1 . to_vector . should_equal [True, True, False]
 
-            err3 = t1.set "([X] == 2) || ([X] + 0.5 == 2)" on_problems=Problem_Behavior.Report_Error
+            err3 = t1.set (expr "([X] == 2) || ([X] + 0.5 == 2)") on_problems=Problem_Behavior.Report_Error
             err3.should_fail_with Floating_Point_Equality
 
             # These errors currently only work in in-memory.
             if setup.is_database.not then
-                action2 = t1.set "3 / [X]" new_name="Z" on_problems=_
+                action2 = t1.set (expr "3 / [X]") as="Z" on_problems=_
                 tester2 table =
                     table.at "Z" . to_vector . should_equal [2.0, 1.5, Number.positive_infinity]
                 problems2 = [Arithmetic_Error.Error "Division by zero (at rows [2])."]
diff --git a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso
index fd29f05ba285..a0722422e79f 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Cross_Tab_Spec.enso
@@ -1,7 +1,7 @@
 from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
-from Standard.Table import Aggregate_Column
+from Standard.Table import Aggregate_Column, expr
 import Standard.Table.Data.Expression.Expression_Error
 from Standard.Table.Errors import all
 
@@ -12,7 +12,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~data
@@ -61,7 +61,7 @@ add_specs suite_builder setup =
             t1.at "z" . to_vector . should_equal [17]
 
         group_builder.specify "should allow a custom expression for the aggregate" <|
-            t1 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum "[Value]*[Value]"]
+            t1 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum (expr "[Value]*[Value]")]
             t1.column_names . should_equal ["x", "y", "z"]
             t1.row_count . should_equal 1
             t1.at "x" . to_vector . should_equal [30]
@@ -165,12 +165,12 @@ add_specs suite_builder setup =
             err2.catch.criteria . should_equal [42]
 
         group_builder.specify "should fail if aggregate values contain invalid expressions" <|
-            err1 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum "[MISSING]*10"]
+            err1 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum (expr "[MISSING]*10")]
             err1.should_fail_with Invalid_Aggregate_Column
             err1.catch.name . should_equal "[MISSING]*10"
             err1.catch.expression_error . should_equal (No_Such_Column.Error "MISSING")
 
-            err2 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum "[[["]
+            err2 = data.table.cross_tab [] "Key" values=[Aggregate_Column.Sum (expr "[[[")]
             err2.should_fail_with Invalid_Aggregate_Column
             err2.catch.name . should_equal "[[["
             err2.catch.expression_error . should_be_a Expression_Error.Syntax_Error
@@ -180,7 +180,7 @@ add_specs suite_builder setup =
             err1.should_fail_with Illegal_Argument
 
         group_builder.specify "should gracefully handle duplicate aggregate names" <|
-            action = data.table.cross_tab [] "Key" values=[Aggregate_Column.Count new_name="Agg1", Aggregate_Column.Sum "Value" new_name="Agg1"] on_problems=_
+            action = data.table.cross_tab [] "Key" values=[Aggregate_Column.Count as="Agg1", Aggregate_Column.Sum "Value" as="Agg1"] on_problems=_
             tester table =
                 table.column_names . should_equal ["x Agg1", "x Agg1 1", "y Agg1", "y Agg1 1", "z Agg1", "z Agg1 1"]
             problems = [Duplicate_Output_Column_Names.Error ["x Agg1", "y Agg1", "z Agg1"]]
@@ -263,7 +263,7 @@ add_specs suite_builder setup =
             r1.should_fail_with Invalid_Column_Names
             r1.catch.to_display_text . should_contain "cannot contain the NUL character"
 
-            r2 = data.table2.cross_tab [] "Key" values=[Aggregate_Column.Average "Value" new_name='x\0']
+            r2 = data.table2.cross_tab [] "Key" values=[Aggregate_Column.Average "Value" as='x\0']
             r2.print
             r2.should_fail_with Invalid_Column_Names
             r2.catch.to_display_text . should_contain "cannot contain the NUL character"
diff --git a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
index 8e90eb354c92..8c18dc8597c1 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Date_Time_Spec.enso
@@ -10,7 +10,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import all
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~data
diff --git a/test/Table_Tests/src/Common_Table_Operations/Derived_Columns_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Derived_Columns_Spec.enso
index 501d98064863..d676eba1fc1d 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Derived_Columns_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Derived_Columns_Spec.enso
@@ -11,7 +11,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import all
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
@@ -27,7 +27,7 @@ add_specs suite_builder setup =
     prefix = setup.prefix
     create_connection_fn = setup.create_connection_func
     pending_datetime = if setup.test_selection.date_time.not then "Date/Time operations are not supported by this backend."
-    suite_builder.group prefix+"Table.set with Column_Operation" group_builder->
+    suite_builder.group prefix+"Table.set with Simple_Expression" group_builder->
         data = Data.setup create_connection_fn
 
         group_builder.teardown <|
@@ -38,181 +38,181 @@ add_specs suite_builder setup =
 
         group_builder.specify "arithmetics" <|
             t = table_builder [["A", [1, 2]], ["B", [10, 40]]]
-            t.set (Column_Operation.Add (Column_Ref.Name "A") (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [11, 42]
-            t.set (Column_Operation.Add 100 (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [110, 140]
-            t.set (Column_Operation.Add (Column_Ref.Name "A") 100) "C" . at "C" . to_vector . should_equal [101, 102]
-            t.set (Column_Operation.Add 23 100) "C" . at "C" . to_vector . should_equal [123, 123]
-
-            t.set (Column_Operation.Subtract (Column_Ref.Name "A") (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [-9, -38]
-            t.set (Column_Operation.Subtract 100 (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [90, 60]
-            t.set (Column_Operation.Subtract (Column_Ref.Name "A") 100) "C" . at "C" . to_vector . should_equal [-99, -98]
-            t.set (Column_Operation.Subtract 23 100) "C" . at "C" . to_vector . should_equal [-77, -77]
-
-            t.set (Column_Operation.Multiply (Column_Ref.Name "A") (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [10, 80]
-            t.set (Column_Operation.Multiply 100 (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [1000, 4000]
-            t.set (Column_Operation.Multiply (Column_Ref.Name "A") 100) "C" . at "C" . to_vector . should_equal [100, 200]
-            t.set (Column_Operation.Multiply 23 100) "C" . at "C" . to_vector . should_equal [2300, 2300]
-
-            t.set (Column_Operation.Divide (Column_Ref.Name "B") (Column_Ref.Name "A")) "C" . at "C" . to_vector . should_equal [10, 20]
-            t.set (Column_Operation.Divide (Column_Ref.Name "A") (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [0.1, 0.05]
-            t.set (Column_Operation.Divide 1 (Column_Ref.Name "A")) "C" . at "C" . to_vector . should_equal [1, 0.5]
-            t.set (Column_Operation.Divide 1 2) "C" . at "C" . to_vector . should_equal [0.5, 0.5]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Add (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [11, 42]
+            t.set (Simple_Expression.From 100 (Simple_Calculation.Add (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [110, 140]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Add 100)) "C" . at "C" . to_vector . should_equal [101, 102]
+            t.set (Simple_Expression.From 23 (Simple_Calculation.Add 100)) "C" . at "C" . to_vector . should_equal [123, 123]
+
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Subtract (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [-9, -38]
+            t.set (Simple_Expression.From 100 (Simple_Calculation.Subtract (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [90, 60]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Subtract 100)) "C" . at "C" . to_vector . should_equal [-99, -98]
+            t.set (Simple_Expression.From 23 (Simple_Calculation.Subtract 100)) "C" . at "C" . to_vector . should_equal [-77, -77]
+
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Multiply (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [10, 80]
+            t.set (Simple_Expression.From 100 (Simple_Calculation.Multiply (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [1000, 4000]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Multiply 100)) "C" . at "C" . to_vector . should_equal [100, 200]
+            t.set (Simple_Expression.From 23 (Simple_Calculation.Multiply 100)) "C" . at "C" . to_vector . should_equal [2300, 2300]
+
+            t.set (Simple_Expression.From (Column_Ref.Name "B") (Simple_Calculation.Divide (Column_Ref.Name "A"))) "C" . at "C" . to_vector . should_equal [10, 20]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Divide (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [0.1, 0.05]
+            t.set (Simple_Expression.From 1 (Simple_Calculation.Divide (Column_Ref.Name "A"))) "C" . at "C" . to_vector . should_equal [1, 0.5]
+            t.set (Simple_Expression.From 1 (Simple_Calculation.Divide 2)) "C" . at "C" . to_vector . should_equal [0.5, 0.5]
 
             t2 = table_builder [["A", [23, 42]], ["B", [10, 3]]]
-            t2.set (Column_Operation.Mod (Column_Ref.Name "A") (Column_Ref.Name "B")) "C" . at "C" . to_vector . should_equal [3, 0]
-            t2.set (Column_Operation.Mod (Column_Ref.Name "A") 10) "C" . at "C" . to_vector . should_equal [3, 2]
-            t2.set (Column_Operation.Mod 7 5) "C" . at "C" . to_vector . should_equal [2, 2]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Mod (Column_Ref.Name "B"))) "C" . at "C" . to_vector . should_equal [3, 0]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Mod 10)) "C" . at "C" . to_vector . should_equal [3, 2]
+            t2.set (Simple_Expression.From 7 (Simple_Calculation.Mod 5)) "C" . at "C" . to_vector . should_equal [2, 2]
 
-            t.set (Column_Operation.Power (Column_Ref.Name "B") (Column_Ref.Name "A")) "C" . at "C" . to_vector . should_equal [10, 1600]
-            t.set (Column_Operation.Power (Column_Ref.Name "A") 3) "C" . at "C" . to_vector . should_equal [1, 8]
-            t.set (Column_Operation.Power 2 (Column_Ref.Name "A")) "C" . at "C" . to_vector . should_equal [2, 4]
-            t.set (Column_Operation.Power 3 4) "C" . at "C" . to_vector . should_equal [81, 81]
+            t.set (Simple_Expression.From (Column_Ref.Name "B") (Simple_Calculation.Power (Column_Ref.Name "A"))) "C" . at "C" . to_vector . should_equal [10, 1600]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Power 3)) "C" . at "C" . to_vector . should_equal [1, 8]
+            t.set (Simple_Expression.From 2 (Simple_Calculation.Power (Column_Ref.Name "A"))) "C" . at "C" . to_vector . should_equal [2, 4]
+            t.set (Simple_Expression.From 3 (Simple_Calculation.Power 4)) "C" . at "C" . to_vector . should_equal [81, 81]
 
-            Test.expect_panic Type_Error <| t.set (Column_Operation.Subtract "x" "y")
-            t.set (Column_Operation.Add 42 "y") . should_fail_with Illegal_Argument
+            Test.expect_panic Type_Error <| t.set (Simple_Expression.From "x" (Simple_Calculation.Subtract "y"))
+            t.set (Simple_Expression.From 42 (Simple_Calculation.Add "y")) . should_fail_with Illegal_Argument
 
         group_builder.specify "rounding" <|
             t = table_builder [["A", [1.13333, 122.74463, 32.52424, -12.7]]]
-            t.set (Column_Operation.Round (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [1, 123, 33, -13]
-            t.set (Column_Operation.Round (Column_Ref.Name "A") precision=1) "Z" . at "Z" . to_vector . should_equal [1.1, 122.7, 32.5, -12.7]
-            t.set (Column_Operation.Round (Column_Ref.Name "A") precision=-1) "Z" . at "Z" . to_vector . should_equal [0, 120, 30, -10]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Round) "Z" . at "Z" . to_vector . should_equal [1, 123, 33, -13]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Round precision=1)) "Z" . at "Z" . to_vector . should_equal [1.1, 122.7, 32.5, -12.7]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Round precision=-1)) "Z" . at "Z" . to_vector . should_equal [0, 120, 30, -10]
 
-            t.set (Column_Operation.Ceil (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [2, 123, 33, -12]
-            t.set (Column_Operation.Floor (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [1, 122, 32, -13]
-            t.set (Column_Operation.Truncate (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [1, 122, 32, -12]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Ceil) "Z" . at "Z" . to_vector . should_equal [2, 123, 33, -12]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Floor) "Z" . at "Z" . to_vector . should_equal [1, 122, 32, -13]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Truncate) "Z" . at "Z" . to_vector . should_equal [1, 122, 32, -12]
 
-            Test.expect_panic Type_Error <| t.set (Column_Operation.Round "1.23")
-            Test.expect_panic Type_Error <| t.set (Column_Operation.Truncate "1.23")
+            t.set (Simple_Expression.From "1.23" Simple_Calculation.Round) . should_fail_with Invalid_Value_Type
+            t.set (Simple_Expression.From "1.23" Simple_Calculation.Truncate) . should_fail_with Invalid_Value_Type
 
         group_builder.specify "date/time" pending=pending_datetime <|
             t = table_builder [["A", [Date_Time.new 2023 1 12 12 45, Date_Time.new 2020 5 12 1 45]], ["B", [Date_Time.new 2023 1 15 18 45, Date_Time.new 2020 6 12 22 20]], ["x", [1, 3]]]
 
             # TODO ticket for truncate for DB
             if setup.is_database.not then
-                t.set (Column_Operation.Truncate (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [Date.new 2023 1 12, Date.new 2020 5 12]
-                t.set (Column_Operation.Truncate (Date_Time.new 1999 12 10 14 55 11)) "Z" . at "Z" . to_vector . should_equal [Date.new 1999 12 10, Date.new 1999 12 10]
+                t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Truncate) "Z" . at "Z" . to_vector . should_equal [Date.new 2023 1 12, Date.new 2020 5 12]
+                t.set (Simple_Expression.From (Date_Time.new 1999 12 10 14 55 11) Simple_Calculation.Truncate) "Z" . at "Z" . to_vector . should_equal [Date.new 1999 12 10, Date.new 1999 12 10]
 
-            t.set (Column_Operation.Date_Add (Column_Ref.Name "A") (Column_Ref.Name "x")) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2023 1 13 12 45, Date_Time.new 2020 5 15 1 45]
-            t.set (Column_Operation.Date_Add (Column_Ref.Name "A") 10 Date_Period.Year) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2033 1 12 12 45, Date_Time.new 2030 5 12 1 45]
-            t.set (Column_Operation.Date_Add (Date_Time.new 2001 12 15 11 00) 10 Time_Period.Minute) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2001 12 15 11 10, Date_Time.new 2001 12 15 11 10]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Date_Add (Column_Ref.Name "x"))) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2023 1 13 12 45, Date_Time.new 2020 5 15 1 45]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Date_Add 10 Date_Period.Year)) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2033 1 12 12 45, Date_Time.new 2030 5 12 1 45]
+            t.set (Simple_Expression.From (Date_Time.new 2001 12 15 11 00) (Simple_Calculation.Date_Add 10 Time_Period.Minute)) "Z" . at "Z" . to_vector . should_equal_tz_agnostic [Date_Time.new 2001 12 15 11 10, Date_Time.new 2001 12 15 11 10]
 
-            t.set (Column_Operation.Date_Diff (Column_Ref.Name "A") (Column_Ref.Name "B") Date_Period.Day) "Z" . at "Z" . to_vector . should_equal [3, 31]
-            t.set (Column_Operation.Date_Part (Column_Ref.Name "A") Date_Period.Year) "Z" . at "Z" . to_vector . should_equal [2023, 2020]
-            t.set (Column_Operation.Date_Part (Column_Ref.Name "A") Time_Period.Minute) "Z" . at "Z" . to_vector . should_equal [45, 45]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Date_Diff (Column_Ref.Name "B") Date_Period.Day)) "Z" . at "Z" . to_vector . should_equal [3, 31]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Date_Part Date_Period.Year)) "Z" . at "Z" . to_vector . should_equal [2023, 2020]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Date_Part Time_Period.Minute)) "Z" . at "Z" . to_vector . should_equal [45, 45]
 
             t2 = table_builder [["C", [Date.new 2002 12 10, Date.new 2005 01 01]], ["D", [Time_Of_Day.new 12 45, Time_Of_Day.new 01 01]]]
-            t2.set (Column_Operation.Date_Add (Column_Ref.Name "C") 5 Date_Period.Month) "Z" . at "Z" . to_vector . should_equal [Date.new 2003 5 10, Date.new 2005 6 01]
-            t2.set (Column_Operation.Date_Add (Column_Ref.Name "D") 15 Time_Period.Hour) "Z" . at "Z" . to_vector . should_equal [Time_Of_Day.new 03 45, Time_Of_Day.new 16 01]
+            t2.set (Simple_Expression.From (Column_Ref.Name "C") (Simple_Calculation.Date_Add 5 Date_Period.Month)) "Z" . at "Z" . to_vector . should_equal [Date.new 2003 5 10, Date.new 2005 6 01]
+            t2.set (Simple_Expression.From (Column_Ref.Name "D") (Simple_Calculation.Date_Add 15 Time_Period.Hour)) "Z" . at "Z" . to_vector . should_equal [Time_Of_Day.new 03 45, Time_Of_Day.new 16 01]
 
-            t2.set (Column_Operation.Date_Diff (Column_Ref.Name "C") (Date.new 2003) Date_Period.Year) "Z" . at "Z" . to_vector . should_equal [0, -2]
-            t2.set (Column_Operation.Date_Diff (Column_Ref.Name "D") (Time_Of_Day.new 13) Time_Period.Minute) "Z" . at "Z" . to_vector . should_equal [15, 59+(60*11)]
+            t2.set (Simple_Expression.From (Column_Ref.Name "C") (Simple_Calculation.Date_Diff (Date.new 2003) Date_Period.Year)) "Z" . at "Z" . to_vector . should_equal [0, -2]
+            t2.set (Simple_Expression.From (Column_Ref.Name "D") (Simple_Calculation.Date_Diff (Time_Of_Day.new 13) Time_Period.Minute)) "Z" . at "Z" . to_vector . should_equal [15, 59+(60*11)]
 
-            t2.set (Column_Operation.Date_Part (Column_Ref.Name "C") Date_Period.Year) "Z" . at "Z" . to_vector . should_equal [2002, 2005]
-            t2.set (Column_Operation.Date_Part (Column_Ref.Name "D") Time_Period.Minute) "Z" . at "Z" . to_vector . should_equal [45, 1]
+            t2.set (Simple_Expression.From (Column_Ref.Name "C") (Simple_Calculation.Date_Part Date_Period.Year)) "Z" . at "Z" . to_vector . should_equal [2002, 2005]
+            t2.set (Simple_Expression.From (Column_Ref.Name "D") (Simple_Calculation.Date_Part Time_Period.Minute)) "Z" . at "Z" . to_vector . should_equal [45, 1]
 
             # error handling
-            t2.set (Column_Operation.Date_Part (Column_Ref.Name "C") Time_Period.Second) . should_fail_with Illegal_Argument
-            t2.set (Column_Operation.Date_Add (Column_Ref.Name "D") 5 Date_Period.Year) . should_fail_with Illegal_Argument
-            t.set (Column_Operation.Date_Part (Column_Ref.Name "x") Date_Period.Year) . should_fail_with Invalid_Value_Type
-            Test.expect_panic Type_Error <| t2.set (Column_Operation.Date_Diff 42 "x" Date_Period.Year)
+            t2.set (Simple_Expression.From (Column_Ref.Name "C") (Simple_Calculation.Date_Part Time_Period.Second)) . should_fail_with Illegal_Argument
+            t2.set (Simple_Expression.From (Column_Ref.Name "D") (Simple_Calculation.Date_Add 5 Date_Period.Year)) . should_fail_with Illegal_Argument
+            t.set (Simple_Expression.From (Column_Ref.Name "x") (Simple_Calculation.Date_Part Date_Period.Year)) . should_fail_with Invalid_Value_Type
+            Test.expect_panic Type_Error <| t2.set (Simple_Expression.From 42 (Simple_Calculation.Date_Diff "x" Date_Period.Year))
 
         group_builder.specify "boolean" <|
             t = table_builder [["A", [True, False]], ["T", [True, True]]]
 
-            t.set (Column_Operation.And (Column_Ref.Name "A") (Column_Ref.Name "T")) "Z" . at "Z" . to_vector . should_equal [True, False]
-            t.set (Column_Operation.And (Column_Ref.Name "A") False) "Z" . at "Z" . to_vector . should_equal [False, False]
-            t.set (Column_Operation.And True True) "Z" . at "Z" . to_vector . should_equal [True, True]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.And (Column_Ref.Name "T"))) "Z" . at "Z" . to_vector . should_equal [True, False]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.And False)) "Z" . at "Z" . to_vector . should_equal [False, False]
+            t.set (Simple_Expression.From True (Simple_Calculation.And True)) "Z" . at "Z" . to_vector . should_equal [True, True]
 
-            t.set (Column_Operation.Or (Column_Ref.Name "A") (Column_Ref.Name "T")) "Z" . at "Z" . to_vector . should_equal [True, True]
-            t.set (Column_Operation.Or False (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [True, False]
-            t.set (Column_Operation.Or False False) "Z" . at "Z" . to_vector . should_equal [False, False]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Or (Column_Ref.Name "T"))) "Z" . at "Z" . to_vector . should_equal [True, True]
+            t.set (Simple_Expression.From False (Simple_Calculation.Or (Column_Ref.Name "A"))) "Z" . at "Z" . to_vector . should_equal [True, False]
+            t.set (Simple_Expression.From False (Simple_Calculation.Or False)) "Z" . at "Z" . to_vector . should_equal [False, False]
 
-            t.set (Column_Operation.Not (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal [False, True]
-            t.set (Column_Operation.Not False) "Z" . at "Z" . to_vector . should_equal [True, True]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Not) "Z" . at "Z" . to_vector . should_equal [False, True]
+            t.set (Simple_Expression.From False Simple_Calculation.Not) "Z" . at "Z" . to_vector . should_equal [True, True]
 
-            Test.expect_panic_with (t.set (Column_Operation.And 42 True)) Type_Error
-            Test.expect_panic_with (t.set (Column_Operation.Or (Column_Ref.Name "A") "x")) Type_Error
+            t.set (Simple_Expression.From 42 (Simple_Calculation.And True)) . should_fail_with Invalid_Value_Type
+            Test.expect_panic Type_Error <| t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Or "x"))
 
         group_builder.specify "if" <|
             t = table_builder [["A", [1, 100]], ["B", [10, 40]], ["C", [23, 55]]]
-            t.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than=(Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal [False, True]
-            t.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than=(Column_Ref.Name "B") Filter_Action.Remove)) "Z" . at "Z" . to_vector . should_equal [True, False]
-            t.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than=20) "T" "F") "Z" . at "Z" . to_vector . should_equal ["F", "T"]
-            t.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Less than=20) (Column_Ref.Name "B") (Column_Ref.Name "C")) "Z" . at "Z" . to_vector . should_equal [10, 55]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than=(Column_Ref.Name "B")))) "Z" . at "Z" . to_vector . should_equal [False, True]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than=(Column_Ref.Name "B") Filter_Action.Remove))) "Z" . at "Z" . to_vector . should_equal [True, False]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than=20) "T" "F")) "Z" . at "Z" . to_vector . should_equal ["F", "T"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Less than=20) (Column_Ref.Name "B") (Column_Ref.Name "C"))) "Z" . at "Z" . to_vector . should_equal [10, 55]
 
-            t.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than="X") "T" "F") . should_fail_with Invalid_Value_Type
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than="X") "T" "F")) . should_fail_with Invalid_Value_Type
 
             t2 = table_builder [["A", ["a", "c"]], ["B", ["c", "b"]], ["C", [23, 55]]]
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than=(Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal [False, True]
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Greater than=(Column_Ref.Name "B")) (Column_Ref.Name "C") 0) "Z" . at "Z" . to_vector . should_equal [0, 55]
-            t2.set (Column_Operation.If "A" (Filter_Condition.Greater than="B") (Column_Ref.Name "C") 0) "Z" . at "Z" . to_vector . should_equal [0, 0]
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Equal_Ignore_Case "C") "==" "!=") "Z" . at "Z" . to_vector . should_equal ["!=", "=="]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than=(Column_Ref.Name "B")))) "Z" . at "Z" . to_vector . should_equal [False, True]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Greater than=(Column_Ref.Name "B")) (Column_Ref.Name "C") 0)) "Z" . at "Z" . to_vector . should_equal [0, 55]
+            t2.set (Simple_Expression.From "A" (Simple_Calculation.If (Filter_Condition.Greater than="B") (Column_Ref.Name "C") 0)) "Z" . at "Z" . to_vector . should_equal [0, 0]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Equal_Ignore_Case "C") "==" "!=")) "Z" . at "Z" . to_vector . should_equal ["!=", "=="]
 
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Is_In ["x", "a", "dd"]) "TT" "FF") "Z" . at "Z" . to_vector . should_equal ["TT", "FF"]
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Is_In []) "TT" "FF") "Z" . at "Z" . to_vector . should_equal ["FF", "FF"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Is_In ["x", "a", "dd"]) "TT" "FF")) "Z" . at "Z" . to_vector . should_equal ["TT", "FF"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Is_In []) "TT" "FF")) "Z" . at "Z" . to_vector . should_equal ["FF", "FF"]
 
             # Passing a column does not work row-by-row, but looks at whole column contents.
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Is_In (t2.at "B")) "TT" "FF") "Z" . at "Z" . to_vector . should_equal ["FF", "TT"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Is_In (t2.at "B")) "TT" "FF")) "Z" . at "Z" . to_vector . should_equal ["FF", "TT"]
             t3 = table_builder [["x", ["e", "e", "a"]]]
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Is_In (t3.at "x")) "TT" "FF") "Z" . at "Z" . to_vector . should_equal ["TT", "FF"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Is_In (t3.at "x")) "TT" "FF")) "Z" . at "Z" . to_vector . should_equal ["TT", "FF"]
 
             # Thus, passing a Column_Ref into Is_In is not allowed as it would be confusing.
-            t2.set (Column_Operation.If (Column_Ref.Name "A") (Filter_Condition.Is_In (Column_Ref.Name "B")) "TT" "FF") . should_fail_with Illegal_Argument
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.If (Filter_Condition.Is_In (Column_Ref.Name "B")) "TT" "FF")) . should_fail_with Illegal_Argument
 
         group_builder.specify "text" <|
             t = table_builder [["A", ["  a ", "b"]], ["B", ["c", " d    "]]]
 
-            t.set (Column_Operation.Trim (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal ["a", "b"]
-            t.set (Column_Operation.Trim (Column_Ref.Name "A") Location.End) "Z" . at "Z" . to_vector . should_equal ["  a", "b"]
-            t.set (Column_Operation.Trim (Column_Ref.Name "A") Location.Start) "Z" . at "Z" . to_vector . should_equal ["a ", "b"]
-            t.set (Column_Operation.Trim (Column_Ref.Name "A") Location.Both "abc") "Z" . at "Z" . to_vector . should_equal ["  a ", ""]
-            t.set (Column_Operation.Trim "bb aaaa" Location.Both (Column_Ref.Name "A")) "Z" . at "Z" . to_vector . should_equal ["bb", " aaaa"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Trim) "Z" . at "Z" . to_vector . should_equal ["a", "b"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Trim Location.End)) "Z" . at "Z" . to_vector . should_equal ["  a", "b"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Trim Location.Start)) "Z" . at "Z" . to_vector . should_equal ["a ", "b"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Trim Location.Both "abc")) "Z" . at "Z" . to_vector . should_equal ["  a ", ""]
+            t.set (Simple_Expression.From "bb aaaa" (Simple_Calculation.Trim Location.Both (Column_Ref.Name "A"))) "Z" . at "Z" . to_vector . should_equal ["bb", " aaaa"]
 
-            t.set (Column_Operation.Add (Column_Ref.Name "A") (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal ["  a c", "b d    "]
-            t.set (Column_Operation.Add "prefix_" (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal ["prefix_c", "prefix_ d    "]
-            t.set (Column_Operation.Add (Column_Ref.Name "A") "!") "Z" . at "Z" . to_vector . should_equal ["  a !", "b!"]
-            t.set (Column_Operation.Add "O" "!") "Z" . at "Z" . to_vector . should_equal ["O!", "O!"]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Add (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal ["  a c", "b d    "]
+            t.set (Simple_Expression.From "prefix_" (Simple_Calculation.Add (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal ["prefix_c", "prefix_ d    "]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Add "!")) "Z" . at "Z" . to_vector . should_equal ["  a !", "b!"]
+            t.set (Simple_Expression.From "O" (Simple_Calculation.Add "!")) "Z" . at "Z" . to_vector . should_equal ["O!", "O!"]
 
             t2 = table_builder [["A", [42]]]
-            t2.set (Column_Operation.Trim (Column_Ref.Name "A")) . should_fail_with Invalid_Value_Type
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") Simple_Calculation.Not) . should_fail_with Invalid_Value_Type
 
         group_builder.specify "min/max" <|
             t = table_builder [["A", [1, 20]], ["B", [10, 2]]]
 
-            t.set (Column_Operation.Min (Column_Ref.Name "A") (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal [1, 2]
-            t.set (Column_Operation.Min (Column_Ref.Name "A") 5) "Z" . at "Z" . to_vector . should_equal [1, 5]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal [1, 2]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min 5)) "Z" . at "Z" . to_vector . should_equal [1, 5]
 
-            t.set (Column_Operation.Max (Column_Ref.Name "A") (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal [10, 20]
-            t.set (Column_Operation.Max (Column_Ref.Name "A") 5) "Z" . at "Z" . to_vector . should_equal [5, 20]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Max (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal [10, 20]
+            t.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Max 5)) "Z" . at "Z" . to_vector . should_equal [5, 20]
 
-            t.set (Column_Operation.Max 2 5) "Z" . at "Z" . to_vector . should_equal [5, 5]
-            t.set (Column_Operation.Min 2 5) "Z" . at "Z" . to_vector . should_equal [2, 2]
+            t.set (Simple_Expression.From 2 (Simple_Calculation.Max 5)) "Z" . at "Z" . to_vector . should_equal [5, 5]
+            t.set (Simple_Expression.From 2 (Simple_Calculation.Min 5)) "Z" . at "Z" . to_vector . should_equal [2, 2]
 
             t2 = table_builder [["A", ["aardvark", "zebra"]], ["B", ["cat", "dog"]], ["x", [1, 20]]]
-            t2.set (Column_Operation.Min (Column_Ref.Name "A") (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal ["aardvark", "dog"]
-            t2.set (Column_Operation.Max (Column_Ref.Name "A") (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal ["cat", "zebra"]
-            t2.set (Column_Operation.Min (Column_Ref.Name "A") "animal") "Z" . at "Z" . to_vector . should_equal ["aardvark", "animal"]
-            t2.set (Column_Operation.Max "coyote" (Column_Ref.Name "B")) "Z" . at "Z" . to_vector . should_equal ["coyote", "dog"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal ["aardvark", "dog"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Max (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal ["cat", "zebra"]
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min "animal")) "Z" . at "Z" . to_vector . should_equal ["aardvark", "animal"]
+            t2.set (Simple_Expression.From "coyote" (Simple_Calculation.Max (Column_Ref.Name "B"))) "Z" . at "Z" . to_vector . should_equal ["coyote", "dog"]
 
             # mixed types result in an error
-            t2.set (Column_Operation.Min (Column_Ref.Name "A") 42) . should_fail_with Invalid_Value_Type
-            t2.set (Column_Operation.Min (Column_Ref.Name "x") "x") . should_fail_with Invalid_Value_Type
-            t2.set (Column_Operation.Min (Column_Ref.Name "x") (Column_Ref.Name "A")) . should_fail_with Invalid_Value_Type
+            t2.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min 42)) . should_fail_with Invalid_Value_Type
+            t2.set (Simple_Expression.From (Column_Ref.Name "x") (Simple_Calculation.Min "x")) . should_fail_with Invalid_Value_Type
+            t2.set (Simple_Expression.From (Column_Ref.Name "x") (Simple_Calculation.Min (Column_Ref.Name "A"))) . should_fail_with Invalid_Value_Type
 
             if pending_datetime.is_nothing then
                 t3 = table_builder [["A", [Date.new 2002 12 10, Date.new 2005 01 01]]]
-                t3.set (Column_Operation.Min (Column_Ref.Name "A") (Date.new 2003)) "Z" . at "Z" . to_vector . should_equal [Date.new 2002 12 10, Date.new 2003 01 01]
-                t3.set (Column_Operation.Max (Column_Ref.Name "A") (Date.new 2003)) "Z" . at "Z" . to_vector . should_equal [Date.new 2003 01 01, Date.new 2005 01 01]
+                t3.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Min (Date.new 2003))) "Z" . at "Z" . to_vector . should_equal [Date.new 2002 12 10, Date.new 2003 01 01]
+                t3.set (Simple_Expression.From (Column_Ref.Name "A") (Simple_Calculation.Max (Date.new 2003))) "Z" . at "Z" . to_vector . should_equal [Date.new 2003 01 01, Date.new 2005 01 01]
 
         group_builder.specify "allows also indexing columns numerically" <|
             t = table_builder [["X", [1, 2]], ["Y", [3, 4]]]
-            t.set (Column_Operation.Add (Column_Ref.Index 0) (Column_Ref.Index 1)) "Z" . at "Z" . to_vector . should_equal [4, 6]
+            t.set (Simple_Expression.From (Column_Ref.Index 0) (Simple_Calculation.Add (Column_Ref.Index 1))) "Z" . at "Z" . to_vector . should_equal [4, 6]
 
         group_builder.specify "will forward column resolution errors" <|
             t = table_builder [["X", [1, 2]], ["Y", [3, 4]]]
-            t.set (Column_Operation.Add (Column_Ref.Name "X") (Column_Ref.Name "Z")) . should_fail_with No_Such_Column
-            t.set (Column_Operation.Not (Column_Ref.Name "zzz")) . should_fail_with No_Such_Column
-            t.set (Column_Operation.Not (Column_Ref.Index 42)) . should_fail_with Index_Out_Of_Bounds
+            t.set (Simple_Expression.From (Column_Ref.Name "X") (Simple_Calculation.Add (Column_Ref.Name "Z"))) . should_fail_with No_Such_Column
+            t.set (Simple_Expression.From (Column_Ref.Name "zzz") Simple_Calculation.Not) . should_fail_with No_Such_Column
+            t.set (Simple_Expression.From (Column_Ref.Index 42) Simple_Calculation.Not) . should_fail_with Index_Out_Of_Bounds
 
     suite_builder.group prefix+"Unique derived column names" group_builder->
         data = Data.setup create_connection_fn
@@ -225,7 +225,7 @@ add_specs suite_builder setup =
 
         group_builder.specify "Should not disambiguate two derived columns that would otherwise have had the same name, with Set_Mode.Add_Or_Update" <|
             t = table_builder [["X", [1, 2, 3]]]
-            column_op = Column_Operation.Power 2 (Column_Ref.Name "X")
+            column_op = Simple_Expression.From 2 (Simple_Calculation.Power (Column_Ref.Name "X"))
             t2 = t.set column_op . set column_op
             t2.column_names . should_equal ["X", "[2] ^ [X]"]
             t2.at "X" . to_vector . should_equal [1, 2, 3]
@@ -233,7 +233,7 @@ add_specs suite_builder setup =
 
         group_builder.specify "Should disambiguate two derived columns that would otherwise have had the same name, with Set_Mode.Add" <|
             t = table_builder [["X", [1, 2, 3]]]
-            column_op = Column_Operation.Power 2 (Column_Ref.Name "X")
+            column_op = Simple_Expression.From 2 (Simple_Calculation.Power (Column_Ref.Name "X"))
             t2 = t.set column_op set_mode=Set_Mode.Add . set column_op set_mode=Set_Mode.Add
             t2.column_names . should_equal ["X", "[2] ^ [X]", "[2] ^ [X] 1"]
             t2.at "X" . to_vector . should_equal [1, 2, 3]
@@ -243,7 +243,7 @@ add_specs suite_builder setup =
         group_builder.specify "Should disambiguate two derived columns that would otherwise have had the same name, within the same expression" <|
             t = table_builder [["X", [1, 2, 3]]]
             expression = "2 + (2 * 2) + (2 ^ [X])"
-            t2 = t.set expression
+            t2 = t.set (expr expression)
             t2.column_names . should_equal ["X", expression]
             t2.at "X" . to_vector . should_equal [1, 2, 3]
             t2.at expression . to_vector . should_equal [8, 10, 14]
@@ -251,15 +251,15 @@ add_specs suite_builder setup =
         group_builder.specify "Should use .pretty to distinguish string constants from regular column names" <|
             t = table_builder [["X", ["a", "b", "c"]]]
             expression = '"foo" + [X] + "bar"'
-            t2 = t.set expression
+            t2 = t.set (expr expression)
             t2.column_names . should_equal ["X", expression]
             t2.at "X" . to_vector . should_equal ["a", "b", "c"]
             t2.at expression . to_vector . should_equal ["fooabar", "foobbar", "foocbar"]
 
         group_builder.specify "Should disambiguate between a column reference and a literal string" <|
             t = table_builder [["X", ["a", "b", "c"]]]
-            t2 = t.set (Column_Operation.Add "prefix" (Column_Ref.Name "X"))
-            t3 = t2.set (Column_Operation.Add "prefix" "X")
+            t2 = t.set (Simple_Expression.From "prefix" (Simple_Calculation.Add (Column_Ref.Name "X")))
+            t3 = t2.set (Simple_Expression.From "prefix" (Simple_Calculation.Add "X"))
 
             t3.column_names . should_equal ['X', "['prefix'] + [X]", "['prefix'] + 'X'"]
             t3.at "['prefix'] + [X]" . to_vector . should_equal ["prefixa", "prefixb", "prefixc"]
@@ -267,20 +267,20 @@ add_specs suite_builder setup =
 
         group_builder.specify "Should not disambiguate if set_mode is Update" <|
             t = table_builder [["X", [1, 2, 3]]]
-            t2 = t.set (Column_Operation.Add (Column_Ref.Name "X") 1) set_mode=Set_Mode.Update
+            t2 = t.set (Simple_Expression.From (Column_Ref.Name "X") (Simple_Calculation.Add 1)) set_mode=Set_Mode.Update
             t2.column_names . should_equal ["X"]
             t2.at "X" . to_vector . should_equal [2, 3, 4]
 
         group_builder.specify "Should not disambiguate if set_mode is Add_Or_Update" <|
             t = table_builder [["X", [1, 2, 3]], ["[X] + 1", [10, 20, 30]]]
             # set_mode=Set_Mode.Add_Or_Update is the default
-            t2 = t.set (Column_Operation.Add (Column_Ref.Name "X") 1)
+            t2 = t.set (Simple_Expression.From (Column_Ref.Name "X") (Simple_Calculation.Add 1))
             t2.column_names . should_equal ["X", "[X] + 1"]
             t2.at "X" . to_vector . should_equal [1, 2, 3]
             t2.at "[X] + 1" . to_vector . should_equal [2, 3, 4]
 
         group_builder.specify "Should not disambiguate if the new name is explicitly set" <|
             t = table_builder [["X", [1, 2, 3]]]
-            t2 = t.set (Column_Operation.Add (Column_Ref.Name "X") 1) new_name="X"
+            t2 = t.set (Simple_Expression.From (Column_Ref.Name "X") (Simple_Calculation.Add 1)) as="X"
             t2.column_names . should_equal ["X"]
             t2.at "X" . to_vector . should_equal [2, 3, 4]
diff --git a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso
index 396c3904248c..6c8750cce5e7 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Distinct_Spec.enso
@@ -8,7 +8,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso
index 883aba7be753..eb2f05cdac59 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Expression_Spec.enso
@@ -3,7 +3,7 @@ import Standard.Base.Errors.Common.Arithmetic_Error
 import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 
-from Standard.Table import Table, Column, Sort_Column, Aggregate_Column, Value_Type
+from Standard.Table import Table, Column, Sort_Column, Aggregate_Column, Value_Type, expr
 from Standard.Table.Errors import all
 import Standard.Table.Data.Expression.Expression_Error
 
@@ -15,7 +15,7 @@ from Standard.Test import all
 from project.Util import all
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend (add_specs detailed=True)
+main filter=Nothing = run_default_backend (add_specs detailed=True) filter
 
 add_specs suite_builder detailed setup =
     prefix = setup.prefix
@@ -349,8 +349,8 @@ add_specs suite_builder detailed setup =
 
     suite_builder.group prefix+"Expression Errors should be handled" group_builder->
         error_tester expression fail_ctor =
-            test_table.set expression new_name="NEW_COL" . should_fail_with Expression_Error
-            test_table.set expression new_name="NEW_COL" . catch . should_be_a fail_ctor
+            test_table.set (expr expression) as="NEW_COL" . should_fail_with Expression_Error
+            test_table.set (expr expression) as="NEW_COL" . catch . should_be_a fail_ctor
 
         specify_test "should fail with Syntax_Error if badly formed" group_builder expression_test=error_tester expression_test->
             expression_test "IIF [A] THEN 1 ELSE 2" Expression_Error.Syntax_Error
@@ -401,7 +401,7 @@ add_specs suite_builder detailed setup =
             c1 = t1.evaluate_expression "3 / [X]" on_problems=Problem_Behavior.Report_Warning
             Problems.expect_warning Arithmetic_Error c1
 
-            t2 = t1.set c1 new_name="Y"
+            t2 = t1.set c1 as="Y"
             Problems.expect_warning Arithmetic_Error t2
             Problems.expect_warning Arithmetic_Error (t2.at "Y")
 
@@ -412,10 +412,10 @@ add_specs suite_builder detailed setup =
             c3 = t2.evaluate_expression "[Y] == 42.0" on_problems=Problem_Behavior.Report_Error
             c3.should_fail_with Floating_Point_Equality
 
-            t3 = t2.set 'if [Y] == 42.0 then "A" else "B"' new_name="Z" on_problems=Problem_Behavior.Report_Error
+            t3 = t2.set (expr 'if [Y] == 42.0 then "A" else "B"') as="Z" on_problems=Problem_Behavior.Report_Error
             t3.should_fail_with Floating_Point_Equality
 
-            t4 = t2.set 'if [Y] >= 42.0 then "A" else "B"' new_name="Z" on_problems=Problem_Behavior.Report_Error
+            t4 = t2.set (expr 'if [Y] >= 42.0 then "A" else "B"') as="Z" on_problems=Problem_Behavior.Report_Error
             t4.at "Z" . to_vector . should_equal ["B", "B", "A"]
             # Should still keep the inherited warning from "Y".
             Problems.expect_warning Arithmetic_Error t4
@@ -425,7 +425,7 @@ add_specs suite_builder detailed setup =
             c1 = Warning.attach (Illegal_State.Error "FOO") (t1.evaluate_expression "[X] + 3.0")
             Problems.expect_warning Illegal_State c1
 
-            t2 = t1.set c1 new_name="Y"
+            t2 = t1.set c1 as="Y"
             Problems.expect_warning Illegal_State t2
             Problems.expect_warning Illegal_State (t2.at "Y")
 
@@ -442,10 +442,10 @@ add_specs suite_builder detailed setup =
             # Should still keep the inherited warning from "Y".
             Problems.expect_warning Illegal_State c4
 
-            t3 = t2.set 'if [Y] == 42.0 then "A" else "B"' new_name="Z" on_problems=Problem_Behavior.Report_Error
+            t3 = t2.set (expr 'if [Y] == 42.0 then "A" else "B"') as="Z" on_problems=Problem_Behavior.Report_Error
             t3.should_fail_with Floating_Point_Equality
 
-            t4 = t2.set 'if [Y] >= 3.5 then "A" else "B"' new_name="Z" on_problems=Problem_Behavior.Report_Error
+            t4 = t2.set (expr 'if [Y] >= 3.5 then "A" else "B"') as="Z" on_problems=Problem_Behavior.Report_Error
             t4.at "Z" . to_vector . should_equal ["A", "A", "B"]
             # Should still keep the inherited warning from "Y".
             Problems.expect_warning Illegal_State t4
diff --git a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso
index 4a949f612947..c03e6d8b448f 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Filter_Spec.enso
@@ -17,7 +17,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
@@ -94,7 +94,7 @@ add_specs suite_builder setup =
             t.filter "Y" (Filter_Condition.Between (t.at "ix") 100 action=Filter_Action.Remove) . at "Y" . to_vector . should_equal [2, Nothing]
 
             t.filter "X" (Filter_Condition.Equal to=(Column_Ref.Name "Y")) . at "X" . to_vector . should_equal [100]
-            t.filter "X" (Filter_Condition.Equal to=(Column_Ref.Expression "[Y]-1")) . at "X" . to_vector . should_equal [3]
+            t.filter "X" (Filter_Condition.Equal to=(expr "[Y]-1")) . at "X" . to_vector . should_equal [3]
             t.filter "X" (Filter_Condition.Less than=(Column_Ref.Name "Y")) . at "X" . to_vector . should_equal [3]
             t.filter "X" (Filter_Condition.Equal_Or_Less than=(Column_Ref.Name "Y")) . at "X" . to_vector . should_equal [100, 3]
             t.filter "X" (Filter_Condition.Equal_Or_Greater than=(Column_Ref.Name "Y")) . at "X" . to_vector . should_equal [100, 12]
@@ -127,7 +127,7 @@ add_specs suite_builder setup =
             t3 . at "ix" . to_vector . should_equal [2, 4, 5]
             t.filter "X" (Filter_Condition.Not_Equal to=(t.at "Y")) . at "X" . to_vector . should_equal [3, 12]
             t.filter "X" (Filter_Condition.Not_Equal to=(Column_Ref.Name "Y")) . at "X" . to_vector . should_equal [3, 12]
-            t.filter "X" (Filter_Condition.Not_Equal to=(Column_Ref.Expression "[Y]")) . at "X" . to_vector . should_equal [3, 12]
+            t.filter "X" (Filter_Condition.Not_Equal to=(expr "[Y]")) . at "X" . to_vector . should_equal [3, 12]
 
         group_builder.specify "by text comparisons" <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["X", ["abb", "baca", "b", Nothing, "c"]], ["Y", ["a", "b", "b", "c", "c"]]]
@@ -413,7 +413,7 @@ add_specs suite_builder setup =
             c1 = Warning.attach (Illegal_State.Error "FOO") (t1.evaluate_expression "3.0 + [X]")
             Problems.expect_warning Illegal_State c1
 
-            t2 = t1.set c1 new_name="Y"
+            t2 = t1.set c1 as="Y"
             Problems.expect_warning Illegal_State t2
 
             r1 = t2.filter "Y" (Filter_Condition.Equal 5)
@@ -463,7 +463,7 @@ add_specs suite_builder setup =
             Problems.assume_no_problems (t.filter "x" (Filter_Condition.Equal [Nothing, Nothing]))
             Problems.assume_no_problems (t.filter "x" (Filter_Condition.Is_In [[Nothing, Nothing]]))
 
-    suite_builder.group prefix+"Table.filter_by_expression" group_builder->
+    suite_builder.group prefix+"Table.filter by an expression" group_builder->
         data = Data.setup create_connection_fn
 
         group_builder.teardown <|
@@ -474,22 +474,22 @@ add_specs suite_builder setup =
 
         group_builder.specify "by a boolean column" <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["b", [True, False, Nothing, True, True]]]
-            t.filter_by_expression "[b]" . at "ix" . to_vector . should_equal [1, 4, 5]
-            t.filter_by_expression "![b]" . at "ix" . to_vector . should_equal [2]
+            t.filter (expr "[b]") . at "ix" . to_vector . should_equal [1, 4, 5]
+            t.filter (expr "![b]") . at "ix" . to_vector . should_equal [2]
 
         group_builder.specify "by an integer comparison" <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["b", [True, False, Nothing, True, True]]]
-            t.filter_by_expression "[ix]==3" . at "ix" . to_vector . should_equal [3]
-            t.filter_by_expression "[ix]>2" . at "ix" . to_vector . should_equal [3, 4, 5]
+            t.filter (expr "[ix]==3") . at "ix" . to_vector . should_equal [3]
+            t.filter (expr "[ix]>2") . at "ix" . to_vector . should_equal [3, 4, 5]
 
         group_builder.specify "fail gracefully" <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["b", [True, False, Nothing, True, True]]]
-            t.filter_by_expression "[ix" . should_fail_with Expression_Error
-            t.filter_by_expression "[ix" . catch . should_be_a Expression_Error.Syntax_Error
-            t.filter_by_expression "Starts_With([b])" . should_fail_with Expression_Error
-            t.filter_by_expression "Starts_With([b])" . catch . should_be_a Expression_Error.Argument_Mismatch
-            t.filter_by_expression "[missing]" . should_fail_with No_Such_Column
-            t.filter_by_expression "[ix]" . should_fail_with Invalid_Value_Type
+            t.filter (expr "[ix") . should_fail_with Expression_Error
+            t.filter (expr "[ix") . catch . should_be_a Expression_Error.Syntax_Error
+            t.filter (expr "Starts_With([b])") . should_fail_with Expression_Error
+            t.filter (expr "Starts_With([b])") . catch . should_be_a Expression_Error.Argument_Mismatch
+            t.filter (expr "[missing]") . should_fail_with No_Such_Column
+            t.filter (expr "[ix]") Filter_Condition.Is_True . should_fail_with Invalid_Value_Type
 
             ## This used to raise Expression_Error.Argument_Mismatch, but now we
                cannot detect that.
@@ -500,33 +500,33 @@ add_specs suite_builder setup =
                But it first runs the code of the function with as many arguments
                as it needed, thus if the function fails, its error overrides the
                arity error.
-            t.filter_by_expression "is_empty([b],False)" . should_fail_with Invalid_Value_Type
+            t.filter (expr "is_empty([b],False)") . should_fail_with Invalid_Value_Type
             # If we provide good type for the first argument, then the error will be again as expected.
-            t.filter_by_expression "is_empty('', 42)" . should_fail_with Expression_Error
-            t.filter_by_expression "is_empty('', 42)" . catch . should_be_a Expression_Error.Argument_Mismatch
+            t.filter (expr "is_empty('', 42)") . should_fail_with Expression_Error
+            t.filter (expr "is_empty('', 42)") . catch . should_be_a Expression_Error.Argument_Mismatch
 
         group_builder.specify "should report issues: floating point equality" <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["X", [10.0, 2.0001, 2.0, 4.5, -2.0]]]
-            r1 = t.filter_by_expression "[X] * [X] == 4.0" on_problems=Problem_Behavior.Ignore
+            r1 = t.filter (expr "[X] * [X] == 4.0") on_problems=Problem_Behavior.Ignore
             Problems.assume_no_problems r1
             r1.at "ix" . to_vector . should_equal [3, 5]
 
-            r2 = t.filter_by_expression "[X] * [X] == 4.0" on_problems=Problem_Behavior.Report_Warning
+            r2 = t.filter (expr "[X] * [X] == 4.0") on_problems=Problem_Behavior.Report_Warning
 
             r2.at "ix" . to_vector . should_equal [3, 5]
             Problems.expect_warning Floating_Point_Equality r2
 
-            r3 = t.filter_by_expression "[X] * [X] == 4.0" on_problems=Problem_Behavior.Report_Error
+            r3 = t.filter (expr "[X] * [X] == 4.0") on_problems=Problem_Behavior.Report_Error
             r3.should_fail_with Floating_Point_Equality
 
-            r4 = t.filter_by_expression "[X] * [X] != 4.0"
+            r4 = t.filter (expr "[X] * [X] != 4.0")
             r4.at "ix" . to_vector . should_equal [1, 2, 4]
             Problems.expect_warning Floating_Point_Equality r4
 
         db_pending = if setup.is_database then "Arithmetic error handling is currently not implemented for the Database backend."
         group_builder.specify "should report issues: arithmetic error" pending=db_pending <|
             t = table_builder [["ix", [1, 2, 3, 4, 5]], ["X", [2.0, 2.0, 0.0, 1.0, 2.0]]]
-            action = t.filter_by_expression "8.0 / [X] <= 4.0" on_problems=_
+            action = t.filter (expr "8.0 / [X] <= 4.0") on_problems=_
             tester table =
                 table . at "ix" . to_vector . should_equal [1, 2, 5]
             problems = [Arithmetic_Error.Error "Division by zero (at rows [2])."]
diff --git a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso
index bd7ed44ce7ac..86fc37627121 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Integration_Tests.enso
@@ -10,7 +10,7 @@ from Standard.Test import all
 from project.Common_Table_Operations.Util import run_default_backend
 from project.Common_Table_Operations.Core_Spec import weird_names
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
@@ -50,7 +50,7 @@ add_specs suite_builder setup =
                 result.at name . to_vector . should_equal [200+ix]
 
         group_builder.specify "aggregates and joins" <|
-            t1 = table_builder [["Count", [1, 2, 3]], ["Class", ["X", "Y", "Z"]]] 
+            t1 = table_builder [["Count", [1, 2, 3]], ["Class", ["X", "Y", "Z"]]]
             t2 = table_builder [["Letter", ["A", "B", "A", "A", "C", "A", "C", "D", "D", "B", "B"]]]
 
             t3 = t2.aggregate ["Letter"] [Aggregate_Column.Count]
diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso
index a851c1d237b6..448f1fafac28 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Join/Join_Spec.enso
@@ -12,7 +12,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type My_Type
     Value x y
@@ -769,8 +769,8 @@ add_specs suite_builder setup =
         group_builder.specify "should work correctly when the join is performed on a transformed table" <|
             t1 = table_builder [["X", [1, 2, 3]]]
 
-            t1_2 = t1.set "10*[X]+1" new_name="A"
-            t1_3 = t1.set "[X]+20" new_name="B"
+            t1_2 = t1.set (expr "10*[X]+1") as="A"
+            t1_3 = t1.set (expr "[X]+20") as="B"
 
             t2 = t1_2.join t1_3 join_kind=Join_Kind.Inner on=(Join_Condition.Equals "A" "B")
             t2.at "A" . to_vector . should_equal [21]
@@ -781,7 +781,7 @@ add_specs suite_builder setup =
             t4 = table_builder [["X", [1, 2, 3]], ["Y", [10, 20, 30]]]
             t5 = table_builder [["X", [5, 7, 1]], ["Z", [100, 200, 300]]]
 
-            t4_2 = t4.set "2*[X]+1" new_name="C"
+            t4_2 = t4.set (expr "2*[X]+1") as="C"
             t6 = t4_2.join t5 on=(Join_Condition.Equals "C" "X") join_kind=Join_Kind.Inner
             expect_column_names ["X", "Y", "C", "Right X", "Z"] t6
             r2 = materialize t6 . order_by ["Y"] . rows . map .to_vector
@@ -805,7 +805,7 @@ add_specs suite_builder setup =
             t4 = table_builder [["X", [1, 2, 3]], ["Y", [10, 20, 30]]]
             t5 = table_builder [["X", [5, 7, 1]], ["Z", [100, 200, 300]]]
 
-            t4_2 = t4.set "2*[X]+1" new_name="C"
+            t4_2 = t4.set (expr "2*[X]+1") as="C"
             t6 = t4_2.join t5 on=(Join_Condition.Equals "C" "X") join_kind=Join_Kind.Full
             expect_column_names ["X", "Y", "C", "Right X", "Z"] t6
             r2 = materialize t6 . order_by ["Y"] . rows . map .to_vector
@@ -816,7 +816,7 @@ add_specs suite_builder setup =
             r2.at 3 . should_equal [3, 30, 7, 7, 200]
 
             t4_3 = table_builder [["X", [Nothing, 2, 3]], ["Y", [10, 20, 30]]]
-            t4_4 = t4_3.set (t4_3.at "X" . fill_nothing 7) new_name="C"
+            t4_4 = t4_3.set (t4_3.at "X" . fill_nothing 7) as="C"
             t7 = t4_4.join t5 on=(Join_Condition.Equals "C" "X") join_kind=Join_Kind.Full
             within_table t7 <|
                 expect_column_names ["X", "Y", "C", "Right X", "Z"] t7
diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Lookup_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Lookup_Spec.enso
index 2e7494841c74..baebb9c620fa 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Join/Lookup_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Join/Lookup_Spec.enso
@@ -12,7 +12,7 @@ from Standard.Test import all
 from project.Common_Table_Operations.Util import run_default_backend, within_table
 import project.Util
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Replace_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Replace_Spec.enso
index 532216b85506..efc0005bb6b4 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Join/Replace_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Join/Replace_Spec.enso
@@ -11,7 +11,7 @@ from Standard.Test import all
 from project.Common_Table_Operations.Util import run_default_backend
 import project.Util
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso
index f2f69ccfa560..a5c536de6ddd 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Join/Union_Spec.enso
@@ -13,7 +13,7 @@ from Standard.Test import all
 from project.Common_Table_Operations.Util import expect_column_names, run_default_backend, within_table
 import project.Util
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type My_Type
     Value x y
diff --git a/test/Table_Tests/src/Common_Table_Operations/Main.enso b/test/Table_Tests/src/Common_Table_Operations/Main.enso
index 4d176ff9f5f2..3db6e6059ade 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Main.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Main.enso
@@ -100,7 +100,7 @@ type Test_Selection
        - date_time: Specifies if the backend supports date/time operations.
        - fixed_length_text_columns: Specifies if the backend supports fixed
          length text columns.
-       - length_restricted_text_columns: Specifies if the backend supports 
+       - length_restricted_text_columns: Specifies if the backend supports
          length restrictions for text columns.
        - removes_trailing_whitespace_casting_from_char_to_varchar: if
          SELECT concat('X', CAST(CAST('   ' AS CHAR(3)) AS VARCHAR(3)), 'X')
@@ -149,4 +149,4 @@ add_specs suite_builder setup =
     Temp_Column_Spec.add_specs suite_builder setup
     Nothing_Spec.add_specs suite_builder setup
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
diff --git a/test/Table_Tests/src/Common_Table_Operations/Map_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Map_Spec.enso
index 784be29c3fec..294c2a49fa9b 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Map_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Map_Spec.enso
@@ -12,7 +12,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso
index 41b1b7ebf41c..8b71194aebe6 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Missing_Values_Spec.enso
@@ -10,7 +10,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~data
diff --git a/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
index 827bacd211ae..ff2ccce96cd9 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Nothing_Spec.enso
@@ -9,7 +9,7 @@ import Standard.Test.Extensions
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type My_Type
     Value x:Text
@@ -32,11 +32,13 @@ add_specs suite_builder setup =
 
     zone = Time_Zone.parse "Z"
 
-    mixed_values = if setup.is_database then [] else [[My_Type.Value "1", My_Type.Value "2", Value_Type.Mixed]]
-        + [[[1], [2], Value_Type.Mixed]]
-    date_time_values = if setup.test_selection.date_time.not then [] else [[Date.new 2024 1 3, Date.new 2024 1 4, Value_Type.Date]]
-        + [[Date_Time.new 2024 1 3 2 30 10 zone=zone, Date_Time.new 2024 1 3 2 30 11 zone=zone, Value_Type.Date_Time]]
-        + [[Time_Of_Day.new 2 30 10, Time_Of_Day.new 2 30 11, Value_Type.Time]]
+    mixed_values = if setup.is_database then [] else
+        [[My_Type.Value "1", My_Type.Value "2", Value_Type.Mixed]]
+            + [[[1], [2], Value_Type.Mixed]]
+    date_time_values = if setup.test_selection.date_time.not then [] else
+        [[Date.new 2024 1 3, Date.new 2024 1 4, Value_Type.Date]]
+            + [[Date_Time.new 2024 1 3 2 30 10 zone=zone, Date_Time.new 2024 1 3 2 30 11 zone=zone, Value_Type.Date_Time]]
+            + [[Time_Of_Day.new 2 30 10, Time_Of_Day.new 2 30 11, Value_Type.Time]]
     values_without_nothing = [[False, True, Value_Type.Boolean]]
             + [["abcd", "efgh", Value_Type.Char]]
             + [[12, 13, Value_Type.Integer]]
@@ -255,7 +257,7 @@ add_specs suite_builder setup =
             cases.map cs->
                 input = cs.at 0
                 output = cs.at 4
-                containing_values = make_containing_values (cs.at 1) (cs.at 2) (cs.at 3) 
+                containing_values = make_containing_values (cs.at 1) (cs.at 2) (cs.at 3)
 
                 group_builder.specify "Boolean is_in: (Vector), "+negation_desc+" "+cs.to_text <|
                     input_column = transform_input [input]
diff --git a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso
index a516a2bccbbc..ee7d3d00af5b 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Order_By_Spec.enso
@@ -10,14 +10,14 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~data
 
     connection self = self.data.at 0
     table self = self.data.at 1
-    
+
     setup create_connection_fn table_builder = Data.Value <|
         connection = create_connection_fn Nothing
         mk_table =
diff --git a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso
index 907cab5a13f0..39e114071c6e 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Select_Columns_Spec.enso
@@ -8,14 +8,14 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import expect_column_names, run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Select_Columns_Data
     Value ~data
 
     connection self = self.data.at 0
     table self = self.data.at 1
-    
+
     setup create_connection_fn table_builder = Select_Columns_Data.Value <|
         connection = create_connection_fn Nothing
         table =
diff --git a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso
index 160091872fae..f2cb3c359abe 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Take_Drop_Spec.enso
@@ -12,15 +12,15 @@ from Standard.Test import all
 from project.Util import all
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Table_Take_Drop_Data
     Value ~data
-    
+
     connection self = self.data.at 0
     table self = self.data.at 1
     empty self = self.data.at 2
-    
+
     setup create_connection_fn table_builder = Table_Take_Drop_Data.Value <|
         connection = create_connection_fn Nothing
         table =
@@ -36,14 +36,14 @@ type Table_Take_Drop_Data
 
 type Column_Take_Drop_Data
     Value ~data
-    
+
     connection self = self.data.at 0
     table self = self.data.at 1
     alpha self = self.data.at 2
     beta self = self.data.at 3
     empty_alpha self = self.data.at 4
     empty_beta self = self.data.at 5
-    
+
     setup create_connection_fn table_builder = Column_Take_Drop_Data.Value <|
         connection = create_connection_fn Nothing
         table =
@@ -56,7 +56,7 @@ type Column_Take_Drop_Data
         empty_table = table.remove_all_rows
         empty_alpha = empty_table.at "alpha"
         empty_beta = empty_table.at "beta"
-        
+
         [connection, table, alpha, beta, empty_alpha, empty_beta]
 
     teardown self =
diff --git a/test/Table_Tests/src/Common_Table_Operations/Temp_Column_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Temp_Column_Spec.enso
index b2ae34f12708..b80232cac56b 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Temp_Column_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Temp_Column_Spec.enso
@@ -5,7 +5,7 @@ from Standard.Test import all
 
 from project.Common_Table_Operations.Util import run_default_backend
 
-main = run_default_backend add_specs
+main filter=Nothing = run_default_backend add_specs filter
 
 type Data
     Value ~connection
diff --git a/test/Table_Tests/src/Common_Table_Operations/Util.enso b/test/Table_Tests/src/Common_Table_Operations/Util.enso
index dc9f10580dc8..411c543f6b75 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Util.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Util.enso
@@ -27,7 +27,9 @@ type Dummy_Connection
    Arguments:
    - add_specs: A function that takes two parameters: a suite builder and Test_Setup.
      And adds test specs to the suite builder.
-run_default_backend add_specs =
+   - filter: An optional Text filter for filtering out test specs and groups. See the
+     docs of `Test.Suite.run_with_filter`.
+run_default_backend add_specs filter=Nothing =
     selection = Test_Selection.Config supports_case_sensitive_columns=True order_by=True natural_ordering=True case_insensitive_ordering=True order_by_unicode_normalization_by_default=True supports_unicode_normalization=True supports_time_duration=True supports_nanoseconds_in_time=True supports_mixed_columns=True fixed_length_text_columns=True supports_8bit_integer=True
     aggregate_selection = Aggregate_Spec.Test_Selection.Config
 
@@ -49,7 +51,7 @@ run_default_backend add_specs =
     setup = Test_Setup.Config "[In-Memory] " table_fn empty_table_fn table_builder materialize is_database=False test_selection=selection aggregate_test_selection=aggregate_selection create_connection_func
     suite = Test.build suite_builder->
         add_specs suite_builder setup
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 ## Adds a clue which will display the provided table next to the failed test
diff --git a/test/Table_Tests/src/Database/Codegen_Spec.enso b/test/Table_Tests/src/Database/Codegen_Spec.enso
index 38b06fd3de45..7480ac806333 100644
--- a/test/Table_Tests/src/Database/Codegen_Spec.enso
+++ b/test/Table_Tests/src/Database/Codegen_Spec.enso
@@ -72,7 +72,7 @@ add_specs suite_builder =
             foo = data.t1.at "A" . rename "FOO"
             foo.to_sql.prepare . should_equal ['SELECT "T1"."A" AS "FOO" FROM "T1" AS "T1"', []]
 
-            t3 = t2.set foo new_name="bar"
+            t3 = t2.set foo as="bar"
             t3.to_sql.prepare . should_equal ['SELECT "T1"."C" AS "C", "T1"."B" AS "B", "T1"."A" AS "bar" FROM "T1" AS "T1"', []]
 
         group_builder.specify "should fail if at is called for a non-existent column" <|
@@ -164,8 +164,8 @@ add_specs suite_builder =
             code = data.t1.aggregate ["C", "B"] [Aggregate_Column.Sum "A" "sum_a"] . to_sql . prepare
             code . should_equal ['SELECT "T1"."C" AS "C", "T1"."B" AS "B", "T1"."sum_a" AS "sum_a" FROM (SELECT "T1"."C" AS "C", "T1"."B" AS "B", SUM("T1"."A") AS "sum_a" FROM "T1" AS "T1" GROUP BY "T1"."C", "T1"."B") AS "T1"', []]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Database/Common/Default_Ordering_Spec.enso b/test/Table_Tests/src/Database/Common/Default_Ordering_Spec.enso
index 7b312f999025..dc6cb62d4902 100644
--- a/test/Table_Tests/src/Database/Common/Default_Ordering_Spec.enso
+++ b/test/Table_Tests/src/Database/Common/Default_Ordering_Spec.enso
@@ -2,7 +2,7 @@ from Standard.Base import all
 import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
 from Standard.Base.Runtime import assert
 
-from Standard.Table import Table, Sort_Column, Aggregate_Column
+from Standard.Table import Table, Sort_Column, Aggregate_Column, expr
 from Standard.Table.Errors import all
 
 from Standard.Database import all
@@ -14,10 +14,10 @@ import Standard.Test.Suite.Suite_Builder
 import project.Util
 import project.Database.Helpers.Name_Generator
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder "[SQLite]" (_-> Database.connect (SQLite In_Memory))
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 type Data
@@ -61,7 +61,7 @@ add_specs (suite_builder : Suite_Builder) (prefix : Text) (create_connection_fn
             v1.first.expression.name . should_equal "X"
             v1.first.direction . should_equal Sort_Direction.Ascending
 
-            t2 = data.db_table_with_key.set "10 - [X]" "X"
+            t2 = data.db_table_with_key.set (expr "10 - [X]") "X"
             v2 = t2.default_ordering
             v2.length . should_equal 1
             v2.first.expression.name . should_equal "X"
diff --git a/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso b/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
index 63375e968b9c..9cb9d94420b4 100644
--- a/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
+++ b/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
@@ -1,6 +1,6 @@
 from Standard.Base import all
 
-from Standard.Table import Table, Join_Kind, Aggregate_Column, Value_Type
+from Standard.Table import Table, Join_Kind, Aggregate_Column, Value_Type, expr
 from Standard.Table.Errors import No_Such_Column, Name_Too_Long, Truncated_Column_Names, Duplicate_Output_Column_Names
 
 from Standard.Database import all
@@ -14,7 +14,7 @@ import project.Database.Helpers.Name_Generator
 
 type Data
     Value ~connection
-    
+
     setup create_connection_func =
         Data.Value (create_connection_func Nothing)
 
@@ -273,8 +273,8 @@ add_specs suite_builder prefix create_connection_func =
                 name_b = "x" * (max_column_name_length + 1) + "B"
                 db_table.rename_columns [["X", name_a], ["Y", name_b]] . should_fail_with Name_Too_Long
 
-                Problems.assume_no_problems <| db_table.set "[X] + [Y] * 10" "Z"
-                db_table.set "[X] + [Y] * 10" long_name . should_fail_with Name_Too_Long
+                Problems.assume_no_problems <| db_table.set (expr "[X] + [Y] * 10") "Z"
+                db_table.set (expr "[X] + [Y] * 10") long_name . should_fail_with Name_Too_Long
 
             group_builder.specify "should prevent upload if column names are too long" <|
                 name_a = "a" * (max_column_name_length + 1)
@@ -372,7 +372,7 @@ add_specs suite_builder prefix create_connection_func =
                 src = Table.new [["X", [1, 2, 3]]]
                 db_table = src.select_into_database_table data.connection (Name_Generator.random_name "long-column-names") temporary=True
                 long_name = "a" * (max_column_name_length + 1)
-                r = db_table.aggregate columns=[Aggregate_Column.Maximum "X" new_name=long_name]
+                r = db_table.aggregate columns=[Aggregate_Column.Maximum "X" as=long_name]
                 r.should_fail_with Name_Too_Long
                 r.catch.entity_kind . should_equal "column"
                 r.catch.name . should_equal long_name
@@ -470,14 +470,14 @@ add_specs suite_builder prefix create_connection_func =
                 db_table = src.select_into_database_table data.connection (Name_Generator.random_name "cross-tab") temporary=True primary_key=[]
 
                 Test.with_clue "cross_tab test will have to be amended once it is implemented: " <|
-                    db_table.cross_tab group_by=[] name_column="X" . should_fail_with Unsupported_Database_Operation
+                    db_table.cross_tab group_by=[] names="X" . should_fail_with Unsupported_Database_Operation
 
                 Test.with_clue "transpose test will have to be amended once it is implemented: " <|
                     db_table.transpose attribute_column_name=name_a . should_fail_with Unsupported_Database_Operation
                     db_table.transpose value_column_name=name_a . should_fail_with Unsupported_Database_Operation
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder "[SQLite]" (_-> Database.connect (SQLite In_Memory))
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Database/Main.enso b/test/Table_Tests/src/Database/Main.enso
index ffc0f92c288e..fc8f6f56fb3f 100644
--- a/test/Table_Tests/src/Database/Main.enso
+++ b/test/Table_Tests/src/Database/Main.enso
@@ -13,7 +13,7 @@ add_specs suite_builder =
     Postgres_Spec.add_specs suite_builder
     Redshift_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso
index a4ac969c2339..c7c92f480644 100644
--- a/test/Table_Tests/src/Database/Postgres_Spec.enso
+++ b/test/Table_Tests/src/Database/Postgres_Spec.enso
@@ -4,7 +4,7 @@ import Standard.Base.Errors.Illegal_State.Illegal_State
 import Standard.Base.Runtime.Ref.Ref
 
 import Standard.Table.Data.Type.Value_Type.Bits
-from Standard.Table import Table, Value_Type, Aggregate_Column
+from Standard.Table import Table, Value_Type, Aggregate_Column, expr
 from Standard.Table.Errors import Invalid_Column_Names, Inexact_Type_Coercion, Duplicate_Output_Column_Names
 
 import Standard.Database.Data.DB_Column.DB_Column
@@ -393,7 +393,7 @@ postgres_specific_spec suite_builder create_connection_fn db_name setup =
             v1x.should_equal [10, x]
             v1x.each e-> Test.with_clue "("+e.to_text+"): " <| e.should_be_a Integer
 
-            t2 = t1.set "[X] + 10" "Y"
+            t2 = t1.set (expr "[X] + 10") "Y"
             t2.at "X" . value_type . should_be_a (Value_Type.Decimal ...)
             t2.at "Y" . value_type . should_be_a (Value_Type.Decimal ...)
             # Unfortunately, performing operations on a Decimal column in postgres can lose information about it being an integer column.
@@ -862,8 +862,8 @@ add_specs suite_builder =
     add_pgpass_specs suite_builder
     add_connection_setup_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Database/Redshift_Spec.enso b/test/Table_Tests/src/Database/Redshift_Spec.enso
index 8f43971816b1..5ed099ac3d68 100644
--- a/test/Table_Tests/src/Database/Redshift_Spec.enso
+++ b/test/Table_Tests/src/Database/Redshift_Spec.enso
@@ -139,7 +139,7 @@ add_specs suite_builder =
                 Database.connect connection_details
             add_database_specs suite_builder create_connection_fn
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso
index 7589333c2709..8bcedb1bbac0 100644
--- a/test/Table_Tests/src/Database/SQLite_Spec.enso
+++ b/test/Table_Tests/src/Database/SQLite_Spec.enso
@@ -453,7 +453,7 @@ add_specs suite_builder =
             t2 = t1.cast "X" (Value_Type.Char size=1)
             Warning.get_all t2 . length . should_equal 1
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
index f0add68bff02..7527f9216910 100644
--- a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
+++ b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
@@ -194,11 +194,11 @@ add_specs suite_builder create_connection_fn =
             beef = [-66, -17]
             materialized_table.at "B" . to_vector . should_equal [ffff, caffee, beef]
 
-main =
+main filter=Nothing =
     create_connection_fn = _-> create_connection_builder Nothing
     suite = Test.build suite_builder->
         add_specs suite_builder create_connection_fn
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 max_int4 = 2147483647
 default_text = Value_Type.Char size=Nothing variable_length=True
diff --git a/test/Table_Tests/src/Database/Upload_Spec.enso b/test/Table_Tests/src/Database/Upload_Spec.enso
index 0a2771813ed1..3a3ce3fcb6b7 100644
--- a/test/Table_Tests/src/Database/Upload_Spec.enso
+++ b/test/Table_Tests/src/Database/Upload_Spec.enso
@@ -27,11 +27,11 @@ polyglot java import org.enso.table_test_helpers.ExplodingStorage
 polyglot java import org.enso.table_test_helpers.ExplodingStoragePayload
 polyglot java import java.lang.Thread
 
-main =
+main filter=Nothing =
     create_connection_func _ = (Database.connect (SQLite In_Memory))
     suite = Test.build suite_builder->
         add_specs suite_builder  create_connection_func "SQLite In-Memory" persistent_connector=False
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 type Data
     Value ~data
@@ -488,8 +488,8 @@ add_specs suite_builder make_new_connection prefix persistent_connector=True =
 
             db_table_1 = t1.select_into_database_table data.connection (Name_Generator.random_name "source-table-1") temporary=True primary_key=Nothing
 
-            db_table_2 = db_table_1.set "[Y] + 100 * [X]" "C1" . set '"constant_text"' "C2"
-            db_table_3 = db_table_1.aggregate ["X"] [Aggregate_Column.Sum "[Y]*[Y]" "C3"] . set "[X] + 1" "X"
+            db_table_2 = db_table_1.set (expr "[Y] + 100 * [X]") "C1" . set "constant_text" "C2"
+            db_table_3 = db_table_1.aggregate ["X"] [Aggregate_Column.Sum (expr "[Y]*[Y]") "C3"] . set (expr "[X] + 1") "X"
 
             db_table_4 = db_table_2.join db_table_3 join_kind=Join_Kind.Left_Outer
             db_table_4.is_trivial_query . should_fail_with Table_Not_Found
@@ -514,7 +514,7 @@ add_specs suite_builder make_new_connection prefix persistent_connector=True =
             tmp_connection = make_new_connection Nothing
             t = Table.new [["X", [1, 2, 3]], ["Y", [4, 5, 6]]]
             db_table = t.select_into_database_table tmp_connection (Name_Generator.random_name "source-table") temporary=True
-            db_table_2 = db_table.set "[X] + 100 * [Y]" "computed"
+            db_table_2 = db_table.set (expr "[X] + 100 * [Y]") "computed"
 
             copied_table = db_table_2.select_into_database_table tmp_connection (Name_Generator.random_name "copied-table") temporary=True
             name = copied_table.name
@@ -921,7 +921,7 @@ test_table_append group_builder (data : Data) source_table_builder target_table_
         dest = target_table_builder [["X", [1, 2, 3]], ["Y", ['a', 'b', 'c']]] primary_key=["X"] connection=data.connection
         t1 = source_table_builder [["Z", [10, 20]], ["Y", ['D', 'E']]] connection=data.connection
         t2 = source_table_builder [["Z", [20, 10]], ["X", [-99, 10]]] connection=data.connection
-        src = t1.join t2 on=["Z"] join_kind=Join_Kind.Inner . remove_columns "Z" . set "[X] + 100" "X"
+        src = t1.join t2 on=["Z"] join_kind=Join_Kind.Inner . remove_columns "Z" . set (expr "[X] + 100") "X"
         src.at "X" . to_vector . should_contain_the_same_elements_as [1, 110]
 
         r1 = dest.update_rows src key_columns=["X"]
diff --git a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso
index b9f373238726..897370d3d30c 100644
--- a/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso
+++ b/test/Table_Tests/src/Formatting/Data_Formatter_Spec.enso
@@ -356,8 +356,8 @@ add_specs suite_builder =
             formatter_3.true_values . should_equal []
             formatter_3.false_values . should_equal []
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Formatting/Main.enso b/test/Table_Tests/src/Formatting/Main.enso
index c7a7f80fc367..5cdf3fa6432a 100644
--- a/test/Table_Tests/src/Formatting/Main.enso
+++ b/test/Table_Tests/src/Formatting/Main.enso
@@ -9,7 +9,7 @@ add_specs suite_builder =
     Data_Formatter_Spec.add_specs suite_builder
     Parse_Values_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso
index e22042a1bb4e..a0a2bc211679 100644
--- a/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso
+++ b/test/Table_Tests/src/Formatting/Parse_Values_Spec.enso
@@ -630,6 +630,13 @@ add_specs suite_builder =
             c1 = Column.from_vector "A" ["1", "2", "3"]
             c1.parse type=Nothing . should_fail_with Illegal_Argument
 
+        group_builder.specify "should return unchanged if all are Nothing or no rows" <|
+            c1 = Column.from_vector "A" [Nothing, Nothing, Nothing] Value_Type.Char
+            c1.parse.value_type . should_equal Value_Type.Char
+
+            c2 = Column.from_vector "A" [] Value_Type.Char
+            c2.parse.value_type . should_equal Value_Type.Char
+
         group_builder.specify "should error if the input column is not text" <|
             c1 = Column.from_vector "A" [1, 2, 3]
             r1 = c1.parse
@@ -638,8 +645,8 @@ add_specs suite_builder =
             r1.catch.expected . should_equal "Char"
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Helpers/Main.enso b/test/Table_Tests/src/Helpers/Main.enso
index 9b903661207b..fc7a13f00f2d 100644
--- a/test/Table_Tests/src/Helpers/Main.enso
+++ b/test/Table_Tests/src/Helpers/Main.enso
@@ -11,7 +11,7 @@ add_specs suite_builder =
     Sorted_List_Index_Spec.add_specs suite_builder
     Value_Type_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Helpers/Sorted_List_Index_Spec.enso b/test/Table_Tests/src/Helpers/Sorted_List_Index_Spec.enso
index c83f11eca5dc..c27d72c78fce 100644
--- a/test/Table_Tests/src/Helpers/Sorted_List_Index_Spec.enso
+++ b/test/Table_Tests/src/Helpers/Sorted_List_Index_Spec.enso
@@ -9,21 +9,21 @@ polyglot java import java.util.Comparator
 polyglot java import org.enso.table.data.table.join.between.SortedListIndex
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 make_index vec = SortedListIndex.build vec Comparator.naturalOrder
 
 type Data
     Value ~index1
-    
+
     setup =
         v1 = [0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 10, 10, 10, 10, 11, 14, 17, 19]
         v1_shuffled = v1.take (Index_Sub_Range.Sample v1.length)
         Data.Value (make_index v1_shuffled)
-        
+
 
 ## White-box tests for the SortedListIndex, ensuring correctness of the
    implementation - these are additional tests apart from
@@ -31,7 +31,7 @@ type Data
    or other bugs are present in the implementation.
 add_specs suite_builder = suite_builder.group "SortedListIndex (used for SortJoin)" group_builder->
     data = Data.setup
-    
+
     group_builder.specify "should correctly handle empty matches" <|
         Vector.from_polyglot_array (data.index1.findSubRange 9 9) . should_equal []
         Vector.from_polyglot_array (data.index1.findSubRange -10 -2) . should_equal []
diff --git a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso
index f782fc98768c..46fe81a764c3 100644
--- a/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso
+++ b/test/Table_Tests/src/Helpers/Unique_Naming_Strategy_Spec.enso
@@ -235,7 +235,7 @@ add_specs suite_builder =
             r3 = Unique_Name_Strategy.new no_limit . combine_with_prefix first third "P_"
             r3 . should_equal ["P_B 3", "P_A", "P_B", "X", "P_B 1", "P_B 2"]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso
index fa8f97f64343..2f1895617b62 100644
--- a/test/Table_Tests/src/Helpers/Value_Type_Spec.enso
+++ b/test/Table_Tests/src/Helpers/Value_Type_Spec.enso
@@ -62,7 +62,7 @@ add_specs suite_builder =
             Value_Type_Helpers.reconcile_types (Value_Type.Float Bits.Bits_32) Value_Type.Boolean . should_equal Value_Type.Mixed
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/IO/Csv_Spec.enso b/test/Table_Tests/src/IO/Csv_Spec.enso
index 8e90bae3bed7..e66684a10ab0 100644
--- a/test/Table_Tests/src/IO/Csv_Spec.enso
+++ b/test/Table_Tests/src/IO/Csv_Spec.enso
@@ -145,8 +145,8 @@ add_specs suite_builder =
 
             out2.delete_if_exists
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso
index 383e380a16ba..3dd063ac7e34 100644
--- a/test/Table_Tests/src/IO/Delimited_Read_Spec.enso
+++ b/test/Table_Tests/src/IO/Delimited_Read_Spec.enso
@@ -473,8 +473,8 @@ add_specs suite_builder =
             Delimited ',' comment_character='#' . without_comments . should_equal (Delimited ',' comment_character=Nothing)
             Delimited ',' . with_line_endings Line_Ending_Style.Unix . should_equal (Delimited ',' line_endings=Line_Ending_Style.Unix)
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso
index 6c1af6d8ed0c..0d9e7fd0579d 100644
--- a/test/Table_Tests/src/IO/Delimited_Write_Spec.enso
+++ b/test/Table_Tests/src/IO/Delimited_Write_Spec.enso
@@ -601,8 +601,8 @@ add_specs suite_builder =
             f.read Plain_Text . should_equal "Initial Content"
             f.delete
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Excel_Spec.enso b/test/Table_Tests/src/IO/Excel_Spec.enso
index 97cde9b48c08..339a884aea40 100644
--- a/test/Table_Tests/src/IO/Excel_Spec.enso
+++ b/test/Table_Tests/src/IO/Excel_Spec.enso
@@ -1027,8 +1027,8 @@ add_specs suite_builder =
     spec_write suite_builder "xlsx" 'TestSheet.xlsx'
     spec_write suite_builder "xls" 'TestSheetOld.xls'
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter spec_filter="should write a table to non-existent file as a new sheet with headers; and return the file object on success"
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Fetch_Spec.enso b/test/Table_Tests/src/IO/Fetch_Spec.enso
index cee8187a0ca8..587f2266de94 100644
--- a/test/Table_Tests/src/IO/Fetch_Spec.enso
+++ b/test/Table_Tests/src/IO/Fetch_Spec.enso
@@ -11,10 +11,10 @@ from Standard.Test import all
 
 import project.Util
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Table_Tests/src/IO/Formats_Spec.enso b/test/Table_Tests/src/IO/Formats_Spec.enso
index afe5d73bd7ca..a0f2364c9325 100644
--- a/test/Table_Tests/src/IO/Formats_Spec.enso
+++ b/test/Table_Tests/src/IO/Formats_Spec.enso
@@ -161,8 +161,8 @@ add_specs suite_builder =
     write_tests "csv"
     write_tests "json"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Json_Spec.enso b/test/Table_Tests/src/IO/Json_Spec.enso
index 10384a7b1ec4..96ff9a1e6328 100644
--- a/test/Table_Tests/src/IO/Json_Spec.enso
+++ b/test/Table_Tests/src/IO/Json_Spec.enso
@@ -31,8 +31,8 @@ add_specs suite_builder =
             t.at 'bar' . to_vector . should_equal ['baz', 'xyz', Nothing]
             t.at 'baz' . to_vector . should_equal [False, True, False]
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/IO/Main.enso b/test/Table_Tests/src/IO/Main.enso
index 221681c0ec45..b57fc0bca66e 100644
--- a/test/Table_Tests/src/IO/Main.enso
+++ b/test/Table_Tests/src/IO/Main.enso
@@ -19,7 +19,7 @@ add_specs suite_builder =
     Fetch_Spec.add_specs suite_builder
     Json_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso
index 49c665e1201e..ada02a0b25bb 100644
--- a/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Aggregate_Column_Spec.enso
@@ -12,7 +12,7 @@ from Standard.Test import all
 
 type Data
     Value ~data
-    
+
     simple_table self = self.data.at 0
     empty_table self = self.data.at 1
 
@@ -29,7 +29,7 @@ add_specs suite_builder = suite_builder.group "Aggregate Columns" group_builder-
     test_aggregator table col expected_name expected_result epsilon=False =
         problem_builder = Problem_Builder.new
         resolved = Aggregate_Column_Helper.resolve_aggregate table problem_builder col
-        name = if resolved.new_name != "" then resolved.new_name else
+        name = if resolved.as != "" then resolved.as else
             Aggregate_Column_Helper.default_aggregate_column_name resolved
         name . should_equal expected_name
 
@@ -196,8 +196,8 @@ add_specs suite_builder = suite_builder.group "Aggregate Columns" group_builder-
         test_aggregator percentile_table (Percentile 0.66 0) "66%-ile tests" 70.78
         test_aggregator data.empty_table (Mode 0 test_name) test_name Nothing
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Builders_Spec.enso b/test/Table_Tests/src/In_Memory/Builders_Spec.enso
index a71a1b80593a..af4f98931a01 100644
--- a/test/Table_Tests/src/In_Memory/Builders_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Builders_Spec.enso
@@ -9,10 +9,10 @@ from Standard.Test import all
 type My
     Data x y
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 add_specs suite_builder = suite_builder.group "[In-Memory] Storage Builders" group_builder->
     group_builder.specify "should correctly incrementally build a table in presence of lots of null values" <|
diff --git a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso
index a1b5bf589d11..7307e992de64 100644
--- a/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Column_Format_Spec.enso
@@ -338,8 +338,8 @@ spec_with_numeric_type suite_builder name numeric_type =
             formats = Column.from_vector "formats" ["#,##0.00", "#.##0,00", "0"]
             input.format formats . should_fail_with Illegal_Argument
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Column_Spec.enso b/test/Table_Tests/src/In_Memory/Column_Spec.enso
index a8f84e6cb5da..b2c0006e1475 100644
--- a/test/Table_Tests/src/In_Memory/Column_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Column_Spec.enso
@@ -14,10 +14,10 @@ from Standard.Table.Errors import Invalid_Value_Type, Invalid_Column_Names
 
 from Standard.Test import all
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Table_Tests/src/In_Memory/Common_Spec.enso b/test/Table_Tests/src/In_Memory/Common_Spec.enso
index b3b8e1265d5a..9360f0c80c12 100644
--- a/test/Table_Tests/src/In_Memory/Common_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Common_Spec.enso
@@ -33,7 +33,7 @@ add_specs suite_builder =
     Common_Table_Operations.Main.add_specs suite_builder setup
 
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/In_Memory/Fan_Out_Spec.enso b/test/Table_Tests/src/In_Memory/Fan_Out_Spec.enso
index c2ae02e588d7..80a942b8bfce 100644
--- a/test/Table_Tests/src/In_Memory/Fan_Out_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Fan_Out_Spec.enso
@@ -25,8 +25,8 @@ add_specs suite_builder =
             t2 = Fan_Out.fan_out_to_rows t "bar" (_.split "b")
             t2.should_equal expected
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Integer_Overflow_Spec.enso b/test/Table_Tests/src/In_Memory/Integer_Overflow_Spec.enso
index fc0714e9375a..424fe643667e 100644
--- a/test/Table_Tests/src/In_Memory/Integer_Overflow_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Integer_Overflow_Spec.enso
@@ -15,10 +15,10 @@ polyglot java import java.lang.Long as Java_Long
 
 polyglot java import org.enso.table_test_helpers.PolyglotHelpers
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Table_Tests/src/In_Memory/Lossy_Conversions_Spec.enso b/test/Table_Tests/src/In_Memory/Lossy_Conversions_Spec.enso
index ea94bf0011de..e609ae76ec07 100644
--- a/test/Table_Tests/src/In_Memory/Lossy_Conversions_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Lossy_Conversions_Spec.enso
@@ -7,10 +7,10 @@ from Standard.Test import all
 
 from project.Util import all
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 add_specs suite_builder =
diff --git a/test/Table_Tests/src/In_Memory/Main.enso b/test/Table_Tests/src/In_Memory/Main.enso
index 5a413be84337..4ce5aec9e042 100644
--- a/test/Table_Tests/src/In_Memory/Main.enso
+++ b/test/Table_Tests/src/In_Memory/Main.enso
@@ -35,7 +35,7 @@ add_specs suite_builder =
     Split_Tokenize_Spec.add_specs suite_builder
     Parse_To_Table_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
diff --git a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso
index 48ac574ab387..a0c6bdf822ed 100644
--- a/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Parse_To_Table_Spec.enso
@@ -78,8 +78,8 @@ add_specs suite_builder =
         group_builder.specify "bad arg" <|
             Test.expect_panic_with (actual = "a 7 ab12 bt100 c12d20q 12".parse_to_table 12) Type_Error
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso
index eb1ab710db83..b63708c56f3e 100644
--- a/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Split_Tokenize_Spec.enso
@@ -24,7 +24,7 @@ add_specs suite_builder =
             expected = Table.from_rows ["foo", "bar 1", "bar 2", "bar 3"] expected_rows
             t2 = t.split_to_columns 1 "|"
             t2.should_equal expected
-            
+
         group_builder.specify "can do split_to_columns where split character, first, last and only character" <|
             cols = [["foo", [0, 1, 2]], ["bar", ["|cb", "ab|", "|"]]]
             t = Table.new cols
@@ -390,8 +390,8 @@ add_specs suite_builder =
             actual = t.parse_to_columns "bar" "(?<quux>)(\d)(?<foo>\d)(\d)"
             actual.should_equal expected
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Conversion_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Conversion_Spec.enso
index 10374810dedb..93b62a6459b5 100644
--- a/test/Table_Tests/src/In_Memory/Table_Conversion_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Conversion_Spec.enso
@@ -422,8 +422,8 @@ add_specs suite_builder =
             t.column_names . should_not_contain "Children"
             t.column_names . should_not_contain "Value"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso
index f06487c5c83c..2f434d2a0c87 100644
--- a/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Date_Spec.enso
@@ -68,8 +68,8 @@ add_specs suite_builder =
             delimited = Text.from test_table format=(Delimited "," value_formatter=data_formatter line_endings=Line_Ending_Style.Unix)
             delimited.should_equal expected_text
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso
index 2dc15bd8a77a..74fdd8782f08 100644
--- a/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Date_Time_Spec.enso
@@ -61,8 +61,8 @@ add_specs suite_builder =
             delimited = Text.from test_table format=(Delimited "," value_formatter=data_formatter line_endings=Line_Ending_Style.Unix)
             delimited.should_equal expected_text
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Format_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Format_Spec.enso
index 88f59edd58d9..67401a25446b 100644
--- a/test/Table_Tests/src/In_Memory/Table_Format_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Format_Spec.enso
@@ -12,7 +12,7 @@ from project.Util import all
 
 type Data
     Value ~table
-    
+
     setup =
         column0 = Column.from_vector "dates" [Date.new 2020 12 21, Date.new 2023 4 25]
         column1 = Column.from_vector "datetimes" [Date_Time.new 2020 01 10 3 4 5 zone=Time_Zone.utc, Date_Time.new 2020 08 08 5 6 7 zone=Time_Zone.utc]
@@ -253,8 +253,8 @@ add_specs suite_builder =
         group_builder.specify "No columns selected" <|
             data.table.format [] . should_fail_with No_Input_Columns_Selected
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter group_filter="Errors"
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Spec.enso
index 2045730856ef..ec996448cad3 100644
--- a/test/Table_Tests/src/In_Memory/Table_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Spec.enso
@@ -877,7 +877,7 @@ add_specs suite_builder =
                             Test.with_clue "("+column_vector.to_text+" Is_In "+in_vector.to_text+"): " <|
                                 t.filter "X" (Filter_Condition.Is_In in_vector) . at "X" . to_vector . should_equal expected_vector
                                 t.filter "X" (Filter_Condition.Is_In in_column) . at "X" . to_vector . should_equal expected_vector
-                                t2 = t.set (t.at "X" . not) new_name="Y"
+                                t2 = t.set (t.at "X" . not) as="Y"
                                 t2.filter "Y" (Filter_Condition.Is_In in_vector) . at "Y" . to_vector . should_equal expected_neg_vector
                                 t2.filter "Y" (Filter_Condition.Is_In in_column) . at "Y" . to_vector . should_equal expected_neg_vector
 
@@ -922,10 +922,10 @@ add_specs suite_builder =
             t.set (100.up_to 102) . should_fail_with Row_Count_Mismatch
             t.set ((Date.new 2020 1 1).up_to (Date.new 2020 1 3)) . should_fail_with Row_Count_Mismatch
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
 
 ## JS indexes months form 0, so we need to subtract 1.
diff --git a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso
index 79e86cafa5d1..da561223ca7c 100644
--- a/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Time_Of_Day_Spec.enso
@@ -28,7 +28,7 @@ type Data
 
 add_specs suite_builder =
     data = Data.setup
-    
+
     suite_builder.group "File.read (Delimited) should work with Time_Of_Days" group_builder->
         group_builder.specify "should be able to read in a data.table with dates" <|
             data.table.column_count.should_equal 3
@@ -62,8 +62,8 @@ add_specs suite_builder =
             delimited = Text.from test_table format=(Delimited "," value_formatter=data_formatter line_endings=Line_Ending_Style.Unix)
             delimited.should_equal expected_text
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/In_Memory/Table_Xml_Spec.enso b/test/Table_Tests/src/In_Memory/Table_Xml_Spec.enso
index 502c3f58a901..8462abf67e5c 100644
--- a/test/Table_Tests/src/In_Memory/Table_Xml_Spec.enso
+++ b/test/Table_Tests/src/In_Memory/Table_Xml_Spec.enso
@@ -4,9 +4,9 @@ from Standard.Test import all
 from Standard.Table.Errors import all
 import Standard.Base.Errors.Common.Type_Error
 
-# pretty printed xml actually makes the tests less pretty 
+# pretty printed xml actually makes the tests less pretty
 # so all but one tests depretty the xml before comparing
-depretty xmlText = 
+depretty xmlText =
     xmlText.replace (Regex.compile "\n\s*") ""
 
 type Data
@@ -25,16 +25,16 @@ type Data
             price = ["Price", [9.99, 5.99, 6.99, 7.99]]
             year = ["Year", [1859, 1925, 1951, 1939]]
             last_borrowed = ["Last Borrowed", [Date_Time.new 1999 1 2 3 40 (zone = Time_Zone.utc), Date_Time.new 2000 2 3 4 50 (zone = Time_Zone.utc), Date_Time.new 2001 3 4 5 25 (zone = Time_Zone.utc), Date_Time.new 2002 4 5 6 15 (zone = Time_Zone.utc)]]
-           
+
             Table.new [title, author, price, year, last_borrowed]
         Data.Value make_table
 
 add_specs suite_builder =
     suite_builder.group "to_xml" group_builder->
-        data = Data.setup  
+        data = Data.setup
         group_builder.specify "table with no rows should become empty Table element" <|
             t = data.table . take 0
-            r = t.to_xml 
+            r = t.to_xml
             e = "<Table/>"
             (depretty r).should_equal (depretty e)
         group_builder.specify "if no columns are specified all fields become child elements" <|
@@ -200,7 +200,7 @@ add_specs suite_builder =
             r.should_fail_with (Unexpected_Extra_Columns.Warning ["Last Borrowed"])
         group_builder.specify "Will error if configured with a element column that is not in the table" <|
             t = data.table
-            r = t.to_xml ["Author", "Price", "Not In Table"] ["Year"] "Title" 
+            r = t.to_xml ["Author", "Price", "Not In Table"] ["Year"] "Title"
             r.should_fail_with (Missing_Input_Columns.Error ["Not In Table"])
         group_builder.specify "Will error if configured with a attribute column that is not in the table" <|
             t = data.table
@@ -211,7 +211,7 @@ add_specs suite_builder =
             r = t.to_xml ["Author", "Price"] ["Year"] "Not In Table"
             r.should_fail_with (No_Such_Column.Error "Not In Table")
         group_builder.specify "XML should be pretty printed" <|
-            # pretty printed xml actually makes the tests less pretty 
+            # pretty printed xml actually makes the tests less pretty
             # so all the other tests depretty the xml before comparing
             # this one makes sure it actually is pretty printed for users
             t = data.table . take 2
@@ -226,7 +226,7 @@ add_specs suite_builder =
                 + '        <Year>1925</Year>\n'
                 + '    </Row>\n'
                 + '</Table>\n'
-            r . should_equal e 
+            r . should_equal e
         group_builder.specify "Illegal xml names are cleaned up in root_name and row_name" <|
             t = data.table . take 1
             r = t.to_xml ["Year"] ["Author", "Price"] "Title" "the library" "22book"
@@ -294,7 +294,7 @@ add_specs suite_builder =
         group_builder.specify "Panic if wrong types passed in element_columns" <|
             t = data.table
             r = Panic.recover Any (t.to_xml 1.23)
-            r.to_text.should_equal "(Error: (Type_Error.Error Vector | Text | Integer | Regex 1.23 '`element_columns`'))"   
+            r.to_text.should_equal "(Error: (Type_Error.Error Vector | Text | Integer | Regex 1.23 '`element_columns`'))"
         group_builder.specify "Panic if wrong types passed in element_columns vector" pending='Not working' <|
             t = data.table
             r = Panic.recover Any (t.to_xml [1.23])
@@ -302,7 +302,7 @@ add_specs suite_builder =
         group_builder.specify "Panic if wrong types passed in attribute_columns" <|
             t = data.table
             r = Panic.recover Any (t.to_xml [] 1.23)
-            r.to_text.should_equal "(Error: (Type_Error.Error Vector | Text | Integer | Regex 1.23 '`attribute_columns`'))"   
+            r.to_text.should_equal "(Error: (Type_Error.Error Vector | Text | Integer | Regex 1.23 '`attribute_columns`'))"
         group_builder.specify "Panic if wrong types passed in attribute_columns vector" pending='Not working' <|
             t = data.table
             r = Panic.recover Any (t.to_xml [] [1.23])
@@ -310,7 +310,7 @@ add_specs suite_builder =
         group_builder.specify "Panic if wrong types passed in value_column" <|
             t = data.table
             r = Panic.recover Any (t.to_xml [] [] 1.23)
-            r.to_text.should_equal "(Error: (Type_Error.Error Text | Integer | Nothing 1.23 '`value_column`'))"   
+            r.to_text.should_equal "(Error: (Type_Error.Error Text | Integer | Nothing 1.23 '`value_column`'))"
         group_builder.specify "Panic if wrong types passed in root_name" <|
             t = data.table
             r = Panic.recover Any (t.to_xml [] [] "Year" 1.23)
@@ -371,10 +371,10 @@ add_specs suite_builder =
                     <special>'</special>
                   </Row>
                 </Table>
-            (depretty r).should_equal (depretty e)       
-   
-main =
+            (depretty r).should_equal (depretty e)
+
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Table_Tests/src/Util.enso b/test/Table_Tests/src/Util.enso
index 18a66a688c7c..e0f9ce82e63d 100644
--- a/test/Table_Tests/src/Util.enso
+++ b/test/Table_Tests/src/Util.enso
@@ -1,19 +1,19 @@
 from Standard.Base import all
 
-import Standard.Database.Data.Table.Table as Database_Table
+import Standard.Database.Data.DB_Table.DB_Table
 import Standard.Database.Data.DB_Column.DB_Column
-import Standard.Table.Data.Table.Table as In_Memory_Table
+import Standard.Table.Data.Table.Table
 import Standard.Table.Data.Column.Column
 
 from Standard.Test import all
 
 polyglot java import org.enso.base_test_helpers.FileSystemHelper
 
-In_Memory_Table.should_equal : Any -> Integer -> Any
-In_Memory_Table.should_equal self expected frames_to_skip=0 =
+Table.should_equal : Any -> Integer -> Any
+Table.should_equal self expected frames_to_skip=0 =
     loc = Meta.get_source_location 1+frames_to_skip
     case expected of
-        _ : In_Memory_Table ->
+        _ : Table ->
             tables_equal t0 t1 =
                 same_headers = (t0.columns.map .name) == (t1.columns.map .name)
                 same_columns = (t0.columns.map .to_vector) == (t1.columns.map .to_vector)
@@ -36,8 +36,8 @@ Column.should_equal self expected frames_to_skip=0 =
             self.to_vector.should_equal expected.to_vector 2+frames_to_skip
         _ -> Test.fail "Got a Column, but expected a "+expected.to_display_text+' (at '+loc+').'
 
-Database_Table.should_equal : Database_Table -> Integer -> Any
-Database_Table.should_equal self expected frames_to_skip=0 =
+DB_Table.should_equal : DB_Table -> Integer -> Any
+DB_Table.should_equal self expected frames_to_skip=0 =
     t0 = self.read
     t1 = expected.read
     t0 . should_equal t1 frames_to_skip
diff --git a/test/Visualization_Tests/src/Helpers_Spec.enso b/test/Visualization_Tests/src/Helpers_Spec.enso
index 7ef00092f8e2..69a2ed80dfdd 100644
--- a/test/Visualization_Tests/src/Helpers_Spec.enso
+++ b/test/Visualization_Tests/src/Helpers_Spec.enso
@@ -91,8 +91,8 @@ add_specs suite_builder =
                     ]
                 Json.parse expected_json
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Id_Spec.enso b/test/Visualization_Tests/src/Id_Spec.enso
index ad80f02e2161..697f2497c8ce 100644
--- a/test/Visualization_Tests/src/Id_Spec.enso
+++ b/test/Visualization_Tests/src/Id_Spec.enso
@@ -59,8 +59,8 @@ add_specs suite_builder = suite_builder.group "Serializable Visualization Identi
         t_3 = Table.new [c_3_1, c_3_2, c_3_3]
         t_3.default_visualization.should_equal Visualization.Id.table
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Main.enso b/test/Visualization_Tests/src/Main.enso
index 7607462e808c..33e09fed1dba 100644
--- a/test/Visualization_Tests/src/Main.enso
+++ b/test/Visualization_Tests/src/Main.enso
@@ -15,7 +15,7 @@ import project.Visualization_Spec
 import project.Widgets_Spec
 import project.Lazy_Table_Spec
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         Default_Visualizations_Spec.add_specs suite_builder
         Geo_Map_Spec.add_specs suite_builder
@@ -29,5 +29,5 @@ main =
         Table_Spec.add_specs suite_builder
         Visualization_Spec.add_specs suite_builder
         Widgets_Spec.add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso
index a17b87d11b99..d304db56a09d 100644
--- a/test/Visualization_Tests/src/Scatter_Plot_Spec.enso
+++ b/test/Visualization_Tests/src/Scatter_Plot_Spec.enso
@@ -123,8 +123,8 @@ add_specs suite_builder =
             value = 2.up_to 5
             expect value no_labels '[{"x":0,"y":2},{"x":1,"y":3},{"x":2,"y":4}]'
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Table_Spec.enso b/test/Visualization_Tests/src/Table_Spec.enso
index b453d75e2047..7fec2b2a7454 100644
--- a/test/Visualization_Tests/src/Table_Spec.enso
+++ b/test/Visualization_Tests/src/Table_Spec.enso
@@ -3,7 +3,7 @@ from Standard.Base import all
 from Standard.Table import Table, Aggregate_Column, Value_Type
 
 from Standard.Database import all
-import Standard.Database.Data.Table.Table as Database_Table
+import Standard.Database.Data.DB_Table.DB_Table
 
 import Standard.Visualization.Table.Visualization
 
@@ -52,7 +52,7 @@ add_specs suite_builder =
 
         group_builder.specify "should forward internal errors" <|
             bad_table_test =
-                bad_table = Database_Table.Value Nothing Nothing Nothing Nothing
+                bad_table = DB_Table.Value Nothing Nothing Nothing Nothing
                 result = Panic.catch Any (Visualization.prepare_visualization bad_table 2) caught_panic->
                     caught_panic.payload
                 message = "Method `set_limit` of type Nothing could not be found."
@@ -115,8 +115,8 @@ add_specs suite_builder =
             Visualization.prepare_visualization Value_Type.Char . should_equal (make_json Value_Type.Char)
             Visualization.prepare_visualization Value_Type.Unsupported_Data_Type . should_equal (make_json Value_Type.Unsupported_Data_Type)
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
index d472ed41f2fd..af6dfed39fbf 100644
--- a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
+++ b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
@@ -42,7 +42,7 @@ add_specs suite_builder =
             Widgets.get_widget_json mock_table .at ["selector"] . should_equal expect
 
         group_builder.specify "works for `filter`" <|
-            choices = mock_table.column_names . map n-> Choice.Option n n.pretty
+            choices = [Choice.Option "<Expression>" "(expr '[A]')"] + mock_table.column_names . map n-> Choice.Option n n.pretty
             expect = [["column", Widget.Single_Choice choices Nothing Display.Always]] . to_json
             Widgets.get_widget_json mock_table .filter ["column"] . should_equal expect
 
@@ -53,8 +53,8 @@ add_specs suite_builder =
             result.should_contain "Postgres"
             result.should_contain "Redshift"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso
index 1e1e8bc91d9e..5978862f1910 100644
--- a/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso
+++ b/test/Visualization_Tests/src/Widgets/Table_Widgets_Spec.enso
@@ -22,12 +22,12 @@ add_specs suite_builder =
             Widgets.get_widget_json mock_table .at ["selector"] . should_equal expect
 
         group_builder.specify "works for `filter`" <|
-            choices = mock_table.column_names . map n-> Choice.Option n n.pretty
+            choices = [Choice.Option "<Expression>" "(expr '[A]')"] + mock_table.column_names . map n-> Choice.Option n n.pretty
             expect = [["column", Widget.Single_Choice choices Nothing Display.Always]] . to_json
             Widgets.get_widget_json mock_table .filter ["column"] . should_equal expect
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso
index f550bf060a9d..6b55927243c9 100644
--- a/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso
+++ b/test/Visualization_Tests/src/Widgets/Text_Widgets_Spec.enso
@@ -32,8 +32,8 @@ add_specs suite_builder =
             labels.should_contain "After"
             labels.should_contain "Before_Last"
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/Visualization_Tests/src/Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets_Spec.enso
index 8a789b7cfc09..b1189e6ced8b 100644
--- a/test/Visualization_Tests/src/Widgets_Spec.enso
+++ b/test/Visualization_Tests/src/Widgets_Spec.enso
@@ -11,8 +11,8 @@ add_specs suite_builder =
     Database_Widgets_Spec.add_specs suite_builder
     Text_Widgets_Spec.add_specs suite_builder
 
-main =
+main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder
-    suite.run_with_filter
+    suite.run_with_filter filter
 
diff --git a/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso b/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
index 9ba09260e433..0dabf3ab4b0b 100644
--- a/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
+++ b/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Errors/Common.enso
@@ -73,6 +73,6 @@ type Arity_Error
 
 @Builtin_Type
 type Forbidden_Operation
-    Error operation
+    Error message
 
-    to_display_text self = "Forbidden operation: "+self.operation+"."
+    to_display_text self = "Forbidden operation: "+self.message
diff --git a/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso b/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
index d8d5508736cc..9a7ba02992fe 100644
--- a/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
+++ b/test/micro-distribution/lib/Standard/Base/0.0.0-dev/src/Runtime.enso
@@ -1,10 +1,12 @@
 import project.Any.Any
 import project.Data.Text.Text
 import project.Data.Boolean.Boolean
+import project.Error.Error
 import project.Errors.Common.Forbidden_Operation
 import project.Function.Function
 import project.Panic.Panic
 
+from project.Data.Boolean import True
 from project.Runtime.Context import Input, Output
 
 @Builtin_Type
@@ -18,9 +20,11 @@ type Context
             Input  -> "Input"
             Output -> "Output"
 
-    if_enabled : Function -> Text -> Any
-    if_enabled self ~action environment="design" =
-        if self.is_enabled environment then action else Panic.throw (Forbidden_Operation.Error self.name)
+    if_enabled : Any -> Text -> Text -> Boolean -> Any ! Forbidden_Operation
+    if_enabled self ~action environment="design" disabled_message="The "+self.name+" context is disabled." panic=True =
+        if self.is_enabled environment then action else
+            error = Forbidden_Operation.Error disabled_message
+            if panic then Panic.throw error else Error.throw error
 
     is_enabled : Text -> Boolean
     is_enabled self environment="design" =
diff --git a/tools/http-test-helper/src/main/java/org/enso/shttp/HTTPTestHelperServer.java b/tools/http-test-helper/src/main/java/org/enso/shttp/HTTPTestHelperServer.java
index b3c8dfbc2566..05f63d9801ca 100644
--- a/tools/http-test-helper/src/main/java/org/enso/shttp/HTTPTestHelperServer.java
+++ b/tools/http-test-helper/src/main/java/org/enso/shttp/HTTPTestHelperServer.java
@@ -6,6 +6,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Semaphore;
 import java.util.stream.Stream;
 import org.enso.shttp.auth.BasicAuthTestHandler;
 import org.enso.shttp.auth.TokenAuthTestHandler;
@@ -20,16 +22,12 @@ public static void main(String[] args) {
       System.err.println("Usage: http-test-helper <host> <port>");
       System.exit(1);
     }
-
     String host = args[0];
+    int port = Integer.parseInt(args[1]);
+    Semaphore stopNotification = new Semaphore(0, false);
     HybridHTTPServer server = null;
     try {
-      Path projectRoot = findProjectRoot();
-      Path keyStorePath = projectRoot.resolve("tools/http-test-helper/target/keystore.jks");
-      int port = Integer.parseInt(args[1]);
-      server = new HybridHTTPServer(host, port, port + 1, keyStorePath);
-      setupEndpoints(server, projectRoot);
-
+      server = createServer(host, port, null, true);
       final HybridHTTPServer server1 = server;
       SignalHandler stopServerHandler =
           (Signal sig) -> {
@@ -40,17 +38,39 @@ public static void main(String[] args) {
         Signal.handle(new Signal(signalName), stopServerHandler);
       }
       server.start();
-    } catch (IOException | URISyntaxException e) {
+      // Make sure the execution is blocked until the process is interrupted.
+      stopNotification.acquire();
+    } catch (URISyntaxException | IOException e) {
       e.printStackTrace();
+    } catch (InterruptedException e) {
+      System.out.println("Server interrupted");
     } finally {
+      stopNotification.release();
       if (server != null) {
         server.stop();
       }
     }
   }
 
-  private static void setupEndpoints(HybridHTTPServer server, Path projectRoot)
-      throws URISyntaxException {
+  /**
+   * Creates the server.
+   *
+   * @param executor An {@link Executor} for both HTTP and HTTPS servers. If {@code null}, the
+   *     default executor is set, which runs the server on the thread that created the server.
+   * @param withSSLServer Whether HTTPS server should be also be started along with HTTP server.
+   * @return The created server
+   */
+  public static HybridHTTPServer createServer(
+      String host, int port, Executor executor, boolean withSSLServer)
+      throws URISyntaxException, IOException {
+    Path projectRoot = findProjectRoot();
+    Path keyStorePath = projectRoot.resolve("tools/http-test-helper/target/keystore.jks");
+    var server = new HybridHTTPServer(host, port, port + 1, keyStorePath, executor, withSSLServer);
+    setupEndpoints(server, projectRoot);
+    return server;
+  }
+
+  private static void setupEndpoints(HybridHTTPServer server, Path projectRoot) {
     for (HttpMethod method : HttpMethod.values()) {
       String path = "/" + method.toString().toLowerCase();
       server.addHandler(path, new TestHandler(method));
diff --git a/tools/http-test-helper/src/main/java/org/enso/shttp/HybridHTTPServer.java b/tools/http-test-helper/src/main/java/org/enso/shttp/HybridHTTPServer.java
index de31e35f97fc..6763b7209146 100644
--- a/tools/http-test-helper/src/main/java/org/enso/shttp/HybridHTTPServer.java
+++ b/tools/http-test-helper/src/main/java/org/enso/shttp/HybridHTTPServer.java
@@ -6,7 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.KeyStore;
-import java.util.concurrent.Semaphore;
+import java.util.concurrent.Executor;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -18,18 +18,27 @@ public class HybridHTTPServer {
   private final HttpsServer sslServer;
   private final Path keyStorePath;
   private volatile boolean isStarted = false;
-  private final Semaphore stopNotification = new Semaphore(0, false);
 
-  public HybridHTTPServer(String hostname, int port, int sslPort, Path keyStorePath)
+  HybridHTTPServer(
+      String hostname,
+      int port,
+      int sslPort,
+      Path keyStorePath,
+      Executor executor,
+      boolean withSSLServer)
       throws IOException {
     this.keyStorePath = keyStorePath;
     InetSocketAddress address = new InetSocketAddress(hostname, port);
     server = HttpServer.create(address, 0);
-    server.setExecutor(null);
-
-    InetSocketAddress sslAddress = new InetSocketAddress(hostname, sslPort);
-    sslServer = HttpsServer.create(sslAddress, 0);
-    sslServer.setExecutor(null);
+    server.setExecutor(executor);
+
+    if (withSSLServer) {
+      InetSocketAddress sslAddress = new InetSocketAddress(hostname, sslPort);
+      sslServer = HttpsServer.create(sslAddress, 0);
+      sslServer.setExecutor(executor);
+    } else {
+      sslServer = null;
+    }
   }
 
   private static class SimpleHttpsConfigurator extends HttpsConfigurator {
@@ -109,37 +118,37 @@ public void start() {
 
     isStarted = true;
 
-    try {
-      setupSSL();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
+    if (sslServer != null) {
+      try {
+        setupSSL();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
     }
     server.start();
-    sslServer.start();
+    if (sslServer != null) {
+      sslServer.start();
+    }
 
     System.out.println("HTTP server started at " + server.getAddress());
-    System.out.println("HTTPS server started at " + sslServer.getAddress());
-
-    try {
-      stopNotification.acquire();
-    } catch (InterruptedException e) {
-      System.out.println("Server interrupted.");
-      e.printStackTrace();
-    } finally {
-      System.out.println("Finalizing HTTP server...");
-      server.stop(1);
-      System.out.println("Finalizing HTTPS server...");
-      sslServer.stop(1);
-      System.out.println("Server stopped.");
+    if (sslServer != null) {
+      System.out.println("HTTPS server started at " + sslServer.getAddress());
     }
   }
 
   public void stop() {
-    stopNotification.release();
+    System.out.println("Finalizing HTTP server...");
+    server.stop(1);
+    if (sslServer != null) {
+      System.out.println("Finalizing HTTPS server...");
+      sslServer.stop(1);
+    }
   }
 
   public void addHandler(String path, HttpHandler handler) {
     server.createContext(path, handler);
-    sslServer.createContext(path, handler);
+    if (sslServer != null) {
+      sslServer.createContext(path, handler);
+    }
   }
 }
diff --git a/tools/http-test-helper/src/main/java/org/enso/shttp/auth/HandlerWithTokenAuth.java b/tools/http-test-helper/src/main/java/org/enso/shttp/auth/HandlerWithTokenAuth.java
index 0bfcbb9e30f9..9bfe3a16cd6f 100644
--- a/tools/http-test-helper/src/main/java/org/enso/shttp/auth/HandlerWithTokenAuth.java
+++ b/tools/http-test-helper/src/main/java/org/enso/shttp/auth/HandlerWithTokenAuth.java
@@ -31,7 +31,7 @@ protected void doHandle(HttpExchange exchange) throws IOException {
     String providedToken = authHeader.substring(prefix.length());
     boolean authorized = providedToken.equals(getSecretToken());
     if (!authorized) {
-      sendResponse(403, "Invalid token.", exchange);
+      sendResponse(401, "Invalid token.", exchange);
       return;
     }
 
diff --git a/tools/legal-review/AWS/com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.12.6/files-ignore b/tools/legal-review/AWS/com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.12.6/files-ignore
new file mode 100644
index 000000000000..8058ba1fb0e7
--- /dev/null
+++ b/tools/legal-review/AWS/com.fasterxml.jackson.dataformat.jackson-dataformat-cbor-2.12.6/files-ignore
@@ -0,0 +1 @@
+/FasterXML/jackson-dataformats-binary/blob/2.17/LICENSE
diff --git a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
similarity index 85%
rename from tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
index 05ae6d6ba74c..a4a12c07600c 100644
--- a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore
+++ b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
@@ -1,19 +1,19 @@
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-The above copyright notice and either this complete permission notice or at a
-copyright rights in the Software, and any and all patent rights owned or
+Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
new file mode 100644
index 000000000000..51d52565aa7e
--- /dev/null
+++ b/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
@@ -0,0 +1,3 @@
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+The above copyright notice and either this complete permission notice or at a
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-ignore
similarity index 67%
rename from tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-ignore
index 3cf75175a37f..773ca565e03b 100644
--- a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-ignore
+++ b/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-ignore
@@ -1,9 +1,8 @@
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-The above copyright notice and either this complete permission notice or at a
-copyright rights in the Software, and any and all patent rights owned or
+Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-keep
new file mode 100644
index 000000000000..f42b45fe69fb
--- /dev/null
+++ b/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.2/copyright-keep
@@ -0,0 +1,4 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+The above copyright notice and either this complete permission notice or at a
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
similarity index 92%
rename from tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
index 40098cef90df..9ed34bb03b2f 100644
--- a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore
+++ b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
@@ -1,37 +1,35 @@
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-The above copyright notice and either this complete permission notice or at a
-copyright rights in the Software, and any and all patent rights owned or
+Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
new file mode 100644
index 000000000000..c9dcc9380fbe
--- /dev/null
+++ b/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
@@ -0,0 +1,4 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+The above copyright notice and either this complete permission notice or at a
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-ignore b/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-ignore
similarity index 64%
rename from tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-ignore
rename to tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-ignore
index 176d7dcc5498..c5849e5b8f7d 100644
--- a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-ignore
+++ b/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-ignore
@@ -1,8 +1,6 @@
-The above copyright notice and either this complete permission notice or at a
-copyright rights in the Software, and any and all patent rights owned or
+Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
 Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-keep b/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-keep
new file mode 100644
index 000000000000..d3c8b9427343
--- /dev/null
+++ b/tools/legal-review/Base/org.graalvm.sdk.word-23.1.2/copyright-keep
@@ -0,0 +1,4 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+The above copyright notice and either this complete permission notice or at a
+copyright rights in the Software, and any and all patent rights owned or
diff --git a/tools/legal-review/Base/report-state b/tools/legal-review/Base/report-state
index d11ec3de2bcd..96be37964c55 100644
--- a/tools/legal-review/Base/report-state
+++ b/tools/legal-review/Base/report-state
@@ -1,3 +1,3 @@
-44A2EB4467C91025C305D370F3E8C9430A69FCD957630A539385AB785B0A1C6D
-5F5974B8673A2E82B0148235CCE1FC0DD9FB8D3ED9C9552A4D86A4EE14723DE5
+DB9DA9C510DFA8BEC90E4783DC4B38250348A933AC619F8B23F524468A717D66
+4D34F128EF38C7A04EAF5F44292BD67D157A107CF70DDB04080515EEF6541AF1
 0
diff --git a/tools/legal-review/engine/commons-codec.commons-codec-1.9/copyright-keep b/tools/legal-review/engine/commons-codec.commons-codec-1.9/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/engine/commons-codec.commons-codec-1.9/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/engine/commons-codec.commons-codec-1.9/custom-license b/tools/legal-review/engine/commons-codec.commons-codec-1.9/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/engine/commons-codec.commons-codec-1.9/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/engine/commons-codec.commons-codec-1.9/files-keep b/tools/legal-review/engine/commons-codec.commons-codec-1.9/files-keep
new file mode 100644
index 000000000000..e5a53c1b1767
--- /dev/null
+++ b/tools/legal-review/engine/commons-codec.commons-codec-1.9/files-keep
@@ -0,0 +1,2 @@
+META-INF/LICENSE.txt
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/engine/commons-logging.commons-logging-1.2/copyright-keep b/tools/legal-review/engine/commons-logging.commons-logging-1.2/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/engine/commons-logging.commons-logging-1.2/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/engine/commons-logging.commons-logging-1.2/custom-license b/tools/legal-review/engine/commons-logging.commons-logging-1.2/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/engine/commons-logging.commons-logging-1.2/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/engine/commons-logging.commons-logging-1.2/files-keep b/tools/legal-review/engine/commons-logging.commons-logging-1.2/files-keep
new file mode 100644
index 000000000000..6de1a981f47b
--- /dev/null
+++ b/tools/legal-review/engine/commons-logging.commons-logging-1.2/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE.txt
+META-INF/LICENSE.txt
diff --git a/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/custom-license b/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/custom-license
deleted file mode 100644
index 0e4b780ed1f1..000000000000
--- a/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/custom-license
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE.md
diff --git a/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/files-ignore b/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/files-ignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/files-keep b/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/files-keep
deleted file mode 100644
index 0b2d30a81366..000000000000
--- a/tools/legal-review/engine/nl.gn0s1s.bump_2.13-0.1.3/files-keep
+++ /dev/null
@@ -1 +0,0 @@
-/philippus/bump/blob/main/LICENSE.md
diff --git a/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-ignore b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-ignore
new file mode 100644
index 000000000000..9b4074024947
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-ignore
@@ -0,0 +1 @@
+initialMap.put("\u00A9", "&copy;"); // © - copyright sign
diff --git a/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-keep b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/custom-license b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/files-keep b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/files-keep
new file mode 100644
index 000000000000..e5a53c1b1767
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.commons.commons-text-1.10.0/files-keep
@@ -0,0 +1,2 @@
+META-INF/LICENSE.txt
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep b/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/custom-license b/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/custom-license
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/custom-license
rename to tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/custom-license
diff --git a/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/files-keep b/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.httpcomponents.httpclient-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/copyright-ignore b/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/copyright-ignore
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/copyright-ignore
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/custom-license b/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/custom-license
similarity index 100%
rename from tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/custom-license
rename to tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/custom-license
diff --git a/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/files-keep b/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/engine/org.apache.httpcomponents.httpcore-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/engine/org.graalvm.js.js-language-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.js.js-language-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.js.js-language-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.js.js-language-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.js.js-language-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.llvm.llvm-api-23.1.2/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-language-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-language-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.python.python-language-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-language-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.python.python-language-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-resources-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.0/copyright-keep-context b/tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep-context
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.python.python-resources-23.1.0/copyright-keep-context
rename to tools/legal-review/engine/org.graalvm.python.python-resources-23.1.2/copyright-keep-context
diff --git a/tools/legal-review/engine/org.graalvm.regex.regex-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.regex.regex-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.regex.regex-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.regex.regex-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.regex.regex-23.1.2/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.collections-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.sdk.collections-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.collections-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.sdk.collections-23.1.2/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
diff --git a/tools/legal-review/Base/org.graalvm.sdk.word-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.word-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-ignore
diff --git a/tools/legal-review/Base/org.graalvm.sdk.word-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/Base/org.graalvm.sdk.word-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.sdk.word-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/files-keep b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/custom-license
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.0/files-keep
rename to tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/custom-license
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/files-keep b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/files-keep
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/engine/org.graalvm.shadowed.icu4j-23.1.2/files-keep
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/engine/org.graalvm.shadowed.json-23.1.0/files-add/NOTICE b/tools/legal-review/engine/org.graalvm.shadowed.json-23.1.2/files-add/NOTICE
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.shadowed.json-23.1.0/files-add/NOTICE
rename to tools/legal-review/engine/org.graalvm.shadowed.json-23.1.2/files-add/NOTICE
diff --git a/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.tools.profiler-tool-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/copyright-ignore b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/copyright-ignore
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/copyright-keep b/tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.0/copyright-keep
rename to tools/legal-review/engine/org.graalvm.truffle.truffle-nfi-libffi-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context b/tools/legal-review/engine/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context
deleted file mode 100644
index 2d1291cd5315..000000000000
--- a/tools/legal-review/engine/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context
+++ /dev/null
@@ -1 +0,0 @@
-this code has waived all copyright and related or neighboring         *
diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state
index 769657194d34..d0b8e278f1a2 100644
--- a/tools/legal-review/engine/report-state
+++ b/tools/legal-review/engine/report-state
@@ -1,3 +1,3 @@
-D8B011DD7E11E226FD042DCDEE28B22C5D74D2B7A666346317619CCB487832C4
-0035ED295654FAACCD79D0DA6D2CDDA8E2EC8D0BA9254722FB55C6F622A68B94
+35A1500A3A4AF8131C4F3FB5BD818C9DEE8F503D6AA83723AA3C87765480CA58
+E18068AE6E3410A4876AB626424798EE1F4845F6D94227DEC2D872BFFBC28E82
 0
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/custom-license b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/files-keep b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-annotations-2.15.2/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/copyright-keep b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/copyright-keep
new file mode 100644
index 000000000000..841ee99764e1
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/copyright-keep
@@ -0,0 +1,2 @@
+Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
+Copyright 2018-2020 Raffaello Giulietti
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/custom-license b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/files-keep b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/files-keep
new file mode 100644
index 000000000000..bda60d5f21cb
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-core-2.15.2/files-keep
@@ -0,0 +1,3 @@
+META-INF/jackson-core-LICENSE
+META-INF/jackson-core-NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/copyright-keep b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/copyright-keep
new file mode 100644
index 000000000000..83abb6b6ce3d
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/copyright-keep
@@ -0,0 +1,2 @@
+Copyright 2010 Google Inc. All Rights Reserved.
+Copyright 2011 Google Inc. All Rights Reserved.
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/custom-license b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-ignore b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-ignore
new file mode 100644
index 000000000000..0d1c51375183
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-ignore
@@ -0,0 +1 @@
+META-INF/NOTICE
diff --git a/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-keep b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-keep
new file mode 100644
index 000000000000..b9005a4d5ae7
--- /dev/null
+++ b/tools/legal-review/launcher/com.fasterxml.jackson.core.jackson-databind-2.15.2/files-keep
@@ -0,0 +1 @@
+META-INF/LICENSE
diff --git a/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/COPYING.protobuf b/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/COPYING.protobuf
deleted file mode 100644
index 705db579c94f..000000000000
--- a/tools/legal-review/launcher/com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20/files-add/COPYING.protobuf
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
diff --git a/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-ignore b/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-ignore
deleted file mode 100644
index 4c3b3d7f85de..000000000000
--- a/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-ignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (C) 2014-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2015-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2017-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
-Copyright (C) 2021-2022 Lightbend Inc. <https://www.lightbend.com>
diff --git a/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-keep b/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-keep
deleted file mode 100644
index 524d999be2a0..000000000000
--- a/tools/legal-review/launcher/com.typesafe.akka.akka-stream_2.13-2.6.20/copyright-keep
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
diff --git a/tools/legal-review/launcher/com.typesafe.ssl-config-core_2.13-0.4.3/copyright-keep b/tools/legal-review/launcher/com.typesafe.ssl-config-core_2.13-0.4.3/copyright-keep
deleted file mode 100644
index cb8bfecd482c..000000000000
--- a/tools/legal-review/launcher/com.typesafe.ssl-config-core_2.13-0.4.3/copyright-keep
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (C) 2015 - 2020 Lightbend Inc. <https://www.lightbend.com>
diff --git a/tools/legal-review/launcher/commons-codec.commons-codec-1.9/copyright-keep b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/launcher/commons-codec.commons-codec-1.9/custom-license b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/launcher/commons-codec.commons-codec-1.9/files-keep b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/files-keep
new file mode 100644
index 000000000000..6de1a981f47b
--- /dev/null
+++ b/tools/legal-review/launcher/commons-codec.commons-codec-1.9/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE.txt
+META-INF/LICENSE.txt
diff --git a/tools/legal-review/launcher/commons-logging.commons-logging-1.2/copyright-keep b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/launcher/commons-logging.commons-logging-1.2/custom-license b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/launcher/commons-logging.commons-logging-1.2/files-keep b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/files-keep
new file mode 100644
index 000000000000..e5a53c1b1767
--- /dev/null
+++ b/tools/legal-review/launcher/commons-logging.commons-logging-1.2/files-keep
@@ -0,0 +1,2 @@
+META-INF/LICENSE.txt
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/custom-license b/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/custom-license
deleted file mode 100644
index 0e4b780ed1f1..000000000000
--- a/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/custom-license
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE.md
diff --git a/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/files-ignore b/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/files-ignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/files-keep b/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/files-keep
deleted file mode 100644
index 0b2d30a81366..000000000000
--- a/tools/legal-review/launcher/nl.gn0s1s.bump_2.13-0.1.3/files-keep
+++ /dev/null
@@ -1 +0,0 @@
-/philippus/bump/blob/main/LICENSE.md
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-ignore b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-ignore
new file mode 100644
index 000000000000..c5b4944d9be1
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-ignore
@@ -0,0 +1 @@
+{"\u00A9", "&copy;"}, // © - copyright sign
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-keep b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/custom-license b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-ignore b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-ignore
new file mode 100644
index 000000000000..f9a3ec844f02
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-ignore
@@ -0,0 +1 @@
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-keep b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-keep
new file mode 100644
index 000000000000..0256724c8d06
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-lang3-3.12.0/files-keep
@@ -0,0 +1 @@
+META-INF/LICENSE.txt
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-ignore b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-ignore
new file mode 100644
index 000000000000..9b4074024947
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-ignore
@@ -0,0 +1 @@
+initialMap.put("\u00A9", "&copy;"); // © - copyright sign
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-keep b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/custom-license b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/files-keep b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/files-keep
new file mode 100644
index 000000000000..e5a53c1b1767
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.commons.commons-text-1.10.0/files-keep
@@ -0,0 +1,2 @@
+META-INF/LICENSE.txt
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/custom-license b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/files-keep b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpclient-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/custom-license b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/files-keep b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/launcher/org.apache.httpcomponents.httpcore-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore b/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.0/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.collections-23.1.0/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.sdk.collections-23.1.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.collections-23.1.0/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
diff --git a/tools/legal-review/engine/org.graalvm.sdk.word-23.1.0/copyright-ignore b/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.word-23.1.0/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-ignore
diff --git a/tools/legal-review/engine/org.graalvm.sdk.word-23.1.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/engine/org.graalvm.sdk.word-23.1.0/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.sdk.word-23.1.2/copyright-keep
diff --git a/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore b/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore
rename to tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep b/tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep
rename to tools/legal-review/launcher/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
diff --git a/tools/legal-review/launcher/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context b/tools/legal-review/launcher/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context
deleted file mode 100644
index 2d1291cd5315..000000000000
--- a/tools/legal-review/launcher/org.reactivestreams.reactive-streams-1.0.3/copyright-keep-context
+++ /dev/null
@@ -1 +0,0 @@
-this code has waived all copyright and related or neighboring         *
diff --git a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-add b/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-add
deleted file mode 100644
index 86fdc160feb5..000000000000
--- a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-add
+++ /dev/null
@@ -1 +0,0 @@
-See org.scala-lang.scala-library-2.13 for notices related to this module.
diff --git a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-keep-context b/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-keep-context
deleted file mode 100644
index 1bb2f1e623d0..000000000000
--- a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/copyright-keep-context
+++ /dev/null
@@ -1 +0,0 @@
-Copyright EPFL and Lightbend, Inc.
diff --git a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/files-add/NOTICE b/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/files-add/NOTICE
deleted file mode 100644
index 779e510da785..000000000000
--- a/tools/legal-review/launcher/org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2/files-add/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-Scala parser combinators
-Copyright (c) 2002-2020 EPFL
-Copyright (c) 2011-2020 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
-
-Licensed under the Apache License, Version 2.0 (the "License").
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/tools/legal-review/launcher/report-state b/tools/legal-review/launcher/report-state
index 47cbd8faa811..5b1f107619b7 100644
--- a/tools/legal-review/launcher/report-state
+++ b/tools/legal-review/launcher/report-state
@@ -1,3 +1,3 @@
-7FD6B2CEF25DA9C73D447AAFC64AB53637F764914391B1A08BE19DC78C9A30E8
-BBDB37A47F71427476C52022158EA9E9BC3FF9AEFB6705E2BE56D8AF09A6A621
+9A1DF8B4A1C217C585B1A35E5EFE5601DA48970AD712F6C658255B3F58908740
+9FA7FD624B82CD0753D3E8D5A8B4CF8AFE2E985B3A36404BD657AD9E75BF4E25
 0
diff --git a/tools/legal-review/launcher/reviewed-licenses/The_Apache_Software_License__Version_2.0 b/tools/legal-review/launcher/reviewed-licenses/The_Apache_Software_License__Version_2.0
new file mode 100644
index 000000000000..ff46ef6ff419
--- /dev/null
+++ b/tools/legal-review/launcher/reviewed-licenses/The_Apache_Software_License__Version_2.0
@@ -0,0 +1 @@
+tools/legal-review/license-texts/APACHE2.0
diff --git a/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/copyright-keep b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/custom-license b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/files-keep b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/files-keep
new file mode 100644
index 000000000000..6de1a981f47b
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-codec.commons-codec-1.9/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE.txt
+META-INF/LICENSE.txt
diff --git a/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/copyright-keep b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/custom-license b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/files-keep b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/files-keep
new file mode 100644
index 000000000000..6de1a981f47b
--- /dev/null
+++ b/tools/legal-review/project-manager/commons-logging.commons-logging-1.2/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE.txt
+META-INF/LICENSE.txt
diff --git a/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/custom-license b/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/custom-license
deleted file mode 100644
index 0e4b780ed1f1..000000000000
--- a/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/custom-license
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE.md
diff --git a/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/files-ignore b/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/files-ignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/files-keep b/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/files-keep
deleted file mode 100644
index 0b2d30a81366..000000000000
--- a/tools/legal-review/project-manager/nl.gn0s1s.bump_2.13-0.1.3/files-keep
+++ /dev/null
@@ -1 +0,0 @@
-/philippus/bump/blob/main/LICENSE.md
diff --git a/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-ignore b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-ignore
new file mode 100644
index 000000000000..9b4074024947
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-ignore
@@ -0,0 +1 @@
+initialMap.put("\u00A9", "&copy;"); // © - copyright sign
diff --git a/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-keep b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-keep
new file mode 100644
index 000000000000..8cd8d66408c4
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/copyright-keep
@@ -0,0 +1 @@
+this work for additional information regarding copyright ownership.
diff --git a/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/custom-license b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/custom-license
new file mode 100644
index 000000000000..35252fda76e8
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/custom-license
@@ -0,0 +1 @@
+LICENSE.txt
diff --git a/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/files-keep b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/files-keep
new file mode 100644
index 000000000000..e5a53c1b1767
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.commons.commons-text-1.10.0/files-keep
@@ -0,0 +1,2 @@
+META-INF/LICENSE.txt
+META-INF/NOTICE.txt
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/copyright-keep
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/custom-license b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/files-keep b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpclient-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep
new file mode 100644
index 000000000000..dc34027f6f18
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/copyright-keep
@@ -0,0 +1 @@
+regarding copyright ownership.  The ASF licenses this file
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/custom-license b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/custom-license
new file mode 100644
index 000000000000..6b1d0bfabc3c
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/custom-license
@@ -0,0 +1 @@
+LICENSE
diff --git a/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/files-keep b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/files-keep
new file mode 100644
index 000000000000..26e9c87b6125
--- /dev/null
+++ b/tools/legal-review/project-manager/org.apache.httpcomponents.httpcore-4.4.1/files-keep
@@ -0,0 +1,2 @@
+META-INF/NOTICE
+META-INF/LICENSE
diff --git a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep
deleted file mode 100644
index e8cd72b6f25f..000000000000
--- a/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep
+++ /dev/null
@@ -1,3 +0,0 @@
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.0/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.polyglot.polyglot-23.1.0/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.polyglot.polyglot-23.1.2/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-keep
deleted file mode 100644
index aad5c148f2d3..000000000000
--- a/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.0/copyright-keep
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.0/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.0/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.collections-23.1.0/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.sdk.collections-23.1.2/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep
deleted file mode 100644
index b4c2cb61258b..000000000000
--- a/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.0/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.nativeimage-23.1.0/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.sdk.nativeimage-23.1.2/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-keep
deleted file mode 100644
index eda8fd514c3c..000000000000
--- a/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.0/copyright-keep
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.0/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.word-23.1.0/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-ignore
diff --git a/tools/legal-review/launcher/org.graalvm.sdk.word-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/launcher/org.graalvm.sdk.word-23.1.0/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.sdk.word-23.1.2/copyright-keep
diff --git a/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore b/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.0/copyright-ignore
rename to tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-ignore
diff --git a/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep b/tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
similarity index 100%
rename from tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.0/copyright-keep
rename to tools/legal-review/project-manager/org.graalvm.truffle.truffle-api-23.1.2/copyright-keep
diff --git a/tools/legal-review/project-manager/report-state b/tools/legal-review/project-manager/report-state
index 5d65f231dd65..614792183245 100644
--- a/tools/legal-review/project-manager/report-state
+++ b/tools/legal-review/project-manager/report-state
@@ -1,3 +1,3 @@
-578C28B786B877E41559F52CBDFBF45DE798CEB12FDF9632A93CC4B1B30C72C6
-D1B18FEE4514908AD689F9B25D7E4445E5F3D75296F136BED478DB855D891F88
+DA577D238B5C40A48477C0D5795CBCBAB62E952E90CB3D43068DF412B1568032
+2FB532C34469119F70F134A88D694A86E9442B669EAFA6B7753D787244201E80
 0
diff --git a/tools/simple-library-server/main.js b/tools/simple-library-server/main.js
index e31a6f31e44c..14a142a96ccc 100755
--- a/tools/simple-library-server/main.js
+++ b/tools/simple-library-server/main.js
@@ -10,6 +10,8 @@ const compression = require('compression')
 const yargs = require('yargs')
 const semverValid = require('semver/functions/valid')
 
+const LOG_REQUESTS = false
+
 const argv = yargs
     .usage(
         '$0',
@@ -38,6 +40,16 @@ const argv = yargs
 const libraryRoot = path.join(argv.root, 'libraries')
 
 const app = express()
+if (LOG_REQUESTS) {
+    app.use((req, res, next) => {
+        console.log(`Received [${req.method}] ${req.originalUrl}`)
+        console.log(`  Headers: ${JSON.stringify(req.headers)}`)
+        console.log(`  Query: ${JSON.stringify(req.query)}`)
+        console.log(`  Body: ${JSON.stringify(req.body)}`)
+        next()
+    })
+}
+
 const tmpDir = path.join(os.tmpdir(), 'enso-library-repo-uploads')
 const upload = multer({ dest: tmpDir })
 app.use(compression({ filter: shouldCompress }))
@@ -102,7 +114,9 @@ function shouldCompress(req, res) {
 async function handleUpload(req, res) {
     function fail(code, message) {
         res.status(code).json({ error: message })
-        cleanFiles(req.files)
+        if (req.files !== undefined) {
+            cleanFiles(req.files)
+        }
     }
 
     if (token !== null) {