diff --git a/package-lock.json b/package-lock.json
index e999e3c2b..d91badf57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,6 @@
         "@wagmi/core": "^1.4.5",
         "@walletconnect/modal": "^2.6.2",
         "@web3modal/ethereum": "^2.7.1",
-        "assert-ts": "^0.3.4",
         "bignumber.js": "^9.1.2",
         "cheerio": "^1.0.0-rc.12",
         "cookie": "^0.5.0",
@@ -4413,11 +4412,6 @@
         "util": "^0.12.5"
       }
     },
-    "node_modules/assert-ts": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/assert-ts/-/assert-ts-0.3.4.tgz",
-      "integrity": "sha512-CQtNOdOCzzZfE3TF9a1vFTcz4ZfJYM6iHoWYCkpFY3wdk6CkFvevuLwpOFVL/KMJ9vCNIbeidWH5uo/Y8sLVWg=="
-    },
     "node_modules/assertion-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
diff --git a/package.json b/package.json
index 1b4cdf540..840277c8c 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
     "@wagmi/core": "^1.4.5",
     "@walletconnect/modal": "^2.6.2",
     "@web3modal/ethereum": "^2.7.1",
-    "assert-ts": "^0.3.4",
     "bignumber.js": "^9.1.2",
     "cheerio": "^1.0.0-rc.12",
     "cookie": "^0.5.0",
diff --git a/src/lib/trade-executor/components/KeyMetric.svelte b/src/lib/trade-executor/components/KeyMetric.svelte
index b3711af76..c405d53e7 100644
--- a/src/lib/trade-executor/components/KeyMetric.svelte
+++ b/src/lib/trade-executor/components/KeyMetric.svelte
@@ -15,7 +15,7 @@ Display one key metric in a strategy tile.
 ```
 -->
 <script lang="ts">
-	import type { KeyMetric } from 'trade-executor/strategy/runtime-state';
+	import type { KeyMetric } from 'trade-executor/statistics/key-metric';
 	import { Icon, Tooltip } from '$lib/components';
 	import KeyMetricDescription from './KeyMetricDescription.svelte';
 
diff --git a/src/lib/trade-executor/components/KeyMetricDescription.svelte b/src/lib/trade-executor/components/KeyMetricDescription.svelte
index 55e61b106..03d3651bf 100644
--- a/src/lib/trade-executor/components/KeyMetricDescription.svelte
+++ b/src/lib/trade-executor/components/KeyMetricDescription.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { KeyMetric } from 'trade-executor/strategy/runtime-state';
+	import type { KeyMetric } from 'trade-executor/statistics/key-metric';
 	import { Timestamp } from '$lib/components';
 
 	export let title: string;
diff --git a/src/lib/trade-executor/state/index.ts b/src/lib/trade-executor/state/index.ts
index e3f061ef2..5949a8ea5 100644
--- a/src/lib/trade-executor/state/index.ts
+++ b/src/lib/trade-executor/state/index.ts
@@ -1,10 +1,10 @@
 import { error } from '@sveltejs/kit';
 import { publicApiError } from '$lib/helpers/public-api';
-import { getConfiguredStrategyById } from '../strategy/configuration';
+import { configuredStrategies } from '../strategy/configuration';
 import { stateSchema } from './state';
 
 export async function getStrategyState(fetch: Fetch, strategyId: string, raw = false) {
-	const strategy = getConfiguredStrategyById(strategyId);
+	const strategy = configuredStrategies.get(strategyId);
 	if (!strategy) throw error(404, 'Not found');
 
 	const url = `${strategy.url}/state`;
diff --git a/src/lib/trade-executor/statistics/key-metric.ts b/src/lib/trade-executor/statistics/key-metric.ts
index 1b4c90499..aaafedef9 100644
--- a/src/lib/trade-executor/statistics/key-metric.ts
+++ b/src/lib/trade-executor/statistics/key-metric.ts
@@ -63,6 +63,7 @@ export const keyMetricKind = z.enum([
 	'max_pullback_of_total_capital',
 	'max_loss_risk_at_opening_of_position'
 ]);
+export type KeyMetricKind = z.infer<typeof keyMetricKind>;
 
 export const keyMetricSource = z.enum(['backtesting', 'live_trading', 'missing']);
 
diff --git a/src/lib/trade-executor/strategy/configuration.ts b/src/lib/trade-executor/strategy/configuration.ts
index fa69d8d16..c293694b8 100644
--- a/src/lib/trade-executor/strategy/configuration.ts
+++ b/src/lib/trade-executor/strategy/configuration.ts
@@ -1,38 +1,27 @@
 import { strategyConfig } from '$lib/config';
+import { z } from 'zod';
 
-/**
- * TypeScript helper for having frontend side configuration for strategies.
- */
-export interface StrategyConfiguration {
-	/** Strategy id - used internally in the state files, etc. */
-	id: string;
-
-	/** Name displayed until we have loaded data from the server-side  */
-	name: string;
+export const strategyConfigurationSchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	url: z.string().url()
+});
+export type StrategyConfiguration = z.infer<typeof strategyConfigurationSchema>;
 
-	/** Webhook server URL */
-	url: string;
-}
+export type ConfiguredStrategies = Map<string, StrategyConfiguration>;
 
 /**
- * Get list of configured strategies.
- *
- * Typedefs JSON load from the config.
+ * export all configured strategies as a Map for easy iteration and lookup
  */
-export function getConfiguredStrategies(): StrategyConfiguration[] {
-	if (!!strategyConfig) {
-		return strategyConfig;
-	}
-
-	return [];
-}
-
-export function getConfiguredStrategyById(id: string): StrategyConfiguration | null {
-	const strats = getConfiguredStrategies();
-	for (let strat of strats) {
-		if (strat.id == id) {
-			return strat;
+export const configuredStrategies: ConfiguredStrategies = strategyConfig.reduce(
+	(acc: ConfiguredStrategies, strat: any) => {
+		try {
+			acc.set(strat.id, strategyConfigurationSchema.parse(strat));
+		} catch (e) {
+			const message = e instanceof Error ? e.message : String(e);
+			console.warn('Failed to parse strategy config', strat, message);
 		}
-	}
-	return null;
-}
+		return acc;
+	},
+	new Map()
+);
diff --git a/src/lib/trade-executor/strategy/runtime-state.ts b/src/lib/trade-executor/strategy/runtime-state.ts
index eb84d1f6a..8b227ee6a 100644
--- a/src/lib/trade-executor/strategy/runtime-state.ts
+++ b/src/lib/trade-executor/strategy/runtime-state.ts
@@ -1,95 +1,51 @@
 /**
  * Strategy runtime state fetching.
  */
-
-import { getConfiguredStrategies } from './configuration';
-import type { StrategyConfiguration } from './configuration';
-// https://github.com/fram-x/assert-ts/issues/23
-import { assert } from 'assert-ts';
-import loadError from '../assets/load-error.jpg';
+import { type StrategyConfiguration, configuredStrategies } from './configuration';
 import { type StrategySummary, strategySummarySchema } from './summary';
+import loadError from '../assets/load-error.jpg';
 
 // use 5 second timeout when fetching strategy metadata
-const clientTimeout = 5000;
+const CLIENT_TIMEOUT = 5000;
 
-export type ConnectedRuntimeState = StrategySummary & {
-	connected: true;
-	id: string;
-};
+export type ConnectedStrategyRuntimeState = StrategyConfiguration &
+	StrategySummary & {
+		connected: true;
+	};
 
-export type DisconnectedRuntimeState = {
+export type DisconnectedStrategyRuntimeState = StrategyConfiguration & {
 	connected: false;
-	id: string;
-	name: string;
 	icon_url: string;
 	error: string;
 };
 
-export type StrategyRuntimeState = ConnectedRuntimeState | DisconnectedRuntimeState;
-
-export async function getStrategiesWithRuntimeState(
-	strats: StrategyConfiguration[],
-	fetch: Fetch
-): Promise<StrategyRuntimeState[]> {
-	// Load runtime state for all strategies parallel
-	return await Promise.all(
-		strats.map(async ({ id, name, url }) => {
-			assert(url, `StrategyConfig URL missing: ${id}`);
-
-			const endpoint = `${url}/metadata`;
-			let resp: Partial<Response>;
-			let error: string;
-
-			try {
-				resp = await fetch(endpoint, { signal: AbortSignal.timeout(clientTimeout) });
-			} catch (e) {
-				resp = { ok: false, statusText: e.message };
-			}
-
-			if (resp.ok) {
-				try {
-					const payload = await resp.json!();
-
-					const safe = strategySummarySchema.safeParse(payload);
-					if (!safe.success) {
-						console.error(safe.error.issues);
-					}
-
-					const summary = strategySummarySchema.parse(payload);
-					return { connected: true, id, ...summary };
-				} catch (e) {
-					error = (e as Error).message ?? `Error parsing response from ${endpoint}`;
-				}
-			} else {
-				error = resp.statusText ?? `Error fetching ${endpoint}`;
-			}
-
-			return {
-				connected: false,
-				id,
-				name,
-				icon_url: loadError,
-				error
-			};
-		})
-	);
+export type StrategyRuntimeState = ConnectedStrategyRuntimeState | DisconnectedStrategyRuntimeState;
+
+export async function getStrategyRuntimeState(fetch: Fetch, id: string): Promise<StrategyRuntimeState | undefined> {
+	const strategy = configuredStrategies.get(id);
+	if (!strategy) return;
+
+	try {
+		const resp = await fetch(`${strategy.url}/metadata`, { signal: AbortSignal.timeout(CLIENT_TIMEOUT) });
+		if (!resp.ok) throw new Error(resp.statusText);
+		const summary = strategySummarySchema.parse(await resp.json());
+		return { connected: true, ...strategy, ...summary };
+	} catch (e) {
+		return {
+			connected: false,
+			...strategy,
+			icon_url: loadError,
+			error: e instanceof Error ? e.message : String(e)
+		};
+	}
 }
 
-/**
- * Get list of configured strategies and pings server for the latest runtime state.
- *
- * Typedefs JSON load from the config.
- */
-export async function getConfiguredStrategiesWithRuntimeState(fetch: Fetch) {
-	const strats = getConfiguredStrategies();
-	return getStrategiesWithRuntimeState(strats, fetch);
-}
-
-/**
- * Get runtime state for a single strategy
- *
- */
-export async function getStrategyRuntimeState(strategyConfig: StrategyConfiguration, fetch: Fetch) {
-	const arr = await getStrategiesWithRuntimeState([strategyConfig], fetch);
-	return arr[0];
+export async function getStrategiesWithRuntimeState(fetch: Fetch) {
+	// prettier-ignore
+	return Promise.all(
+		Array.from(
+			configuredStrategies,
+			async ([id]) => getStrategyRuntimeState(fetch, id) as Promise<StrategyRuntimeState>
+		)
+	);
 }
diff --git a/src/lib/wallet/MyDeposits.svelte b/src/lib/wallet/MyDeposits.svelte
index ca81631d7..8f6e43ac7 100644
--- a/src/lib/wallet/MyDeposits.svelte
+++ b/src/lib/wallet/MyDeposits.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentEvents } from 'svelte';
 	import type { ApiChain } from '$lib/helpers/chain';
-	import type { StrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
+	import type { ConnectedStrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
 	import fsm from 'svelte-fsm';
 	import { goto } from '$app/navigation';
 	import { switchNetwork } from '@wagmi/core';
@@ -10,7 +10,7 @@
 	import { Button, HashAddress, Icon } from '$lib/components';
 	import { formatDollar } from '$lib/helpers/formatters';
 
-	export let strategy: StrategyRuntimeState;
+	export let strategy: ConnectedStrategyRuntimeState;
 	export let chain: ApiChain;
 
 	let contentWrapper: HTMLElement;
diff --git a/src/lib/wallet/WalletWidget.svelte b/src/lib/wallet/WalletWidget.svelte
index 8d62188a1..9c182e916 100644
--- a/src/lib/wallet/WalletWidget.svelte
+++ b/src/lib/wallet/WalletWidget.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
 	import type { ApiChain } from '$lib/helpers/chain';
-	import type { StrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
+	import type { ConnectedStrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
 	import { goto } from '$app/navigation';
 	import { wizard } from 'wizard/store';
 	import { wallet } from '$lib/wallet';
 	import { Button, HashAddress, Icon } from '$lib/components';
 
 	export let chain: ApiChain;
-	export let strategy: StrategyRuntimeState;
+	export let strategy: ConnectedStrategyRuntimeState;
 
 	$: contracts = strategy.on_chain_data.smart_contracts;
 
diff --git a/src/routes/strategies/+page.server.ts b/src/routes/strategies/+page.server.ts
index 31c44ff8a..7ee05a3d9 100644
--- a/src/routes/strategies/+page.server.ts
+++ b/src/routes/strategies/+page.server.ts
@@ -4,11 +4,11 @@
  * Strategies are cached in-process using SWR cache with 5 minute TTL
  */
 import swrCache from '$lib/swrCache.js';
-import { getConfiguredStrategiesWithRuntimeState } from 'trade-executor/strategy/runtime-state';
+import { getStrategiesWithRuntimeState } from 'trade-executor/strategy/runtime-state';
 
 // Create a SWR cache for strategies with 1 minute TTL
 const cacheTimeSeconds = 60;
-const getCachedStrategies = swrCache(getConfiguredStrategiesWithRuntimeState, cacheTimeSeconds);
+const getCachedStrategies = swrCache(getStrategiesWithRuntimeState, cacheTimeSeconds);
 
 export async function load({ fetch, setHeaders }) {
 	const strategies = await getCachedStrategies(fetch);
diff --git a/src/routes/strategies/StrategyDataSummary.svelte b/src/routes/strategies/StrategyDataSummary.svelte
index e41480e19..febefb2d2 100644
--- a/src/routes/strategies/StrategyDataSummary.svelte
+++ b/src/routes/strategies/StrategyDataSummary.svelte
@@ -8,9 +8,9 @@
 
 	export let strategy: StrategyRuntimeState;
 
-	const metrics = strategy.summary_statistics?.key_metrics ?? {};
 	const strategyId = strategy.id;
-	const hasEnzymeVault = strategy.on_chain_data?.asset_management_mode === 'enzyme';
+	const metrics = strategy.connected ? strategy.summary_statistics.key_metrics : {};
+	const hasEnzymeVault = strategy.connected && strategy.on_chain_data.asset_management_mode === 'enzyme';
 </script>
 
 <dl class="strategy-data-summary ds-3">
diff --git a/src/routes/strategies/StrategyTile.svelte b/src/routes/strategies/StrategyTile.svelte
index c5d82df0f..7f7de1c87 100644
--- a/src/routes/strategies/StrategyTile.svelte
+++ b/src/routes/strategies/StrategyTile.svelte
@@ -2,22 +2,27 @@
 	import type { EventHandler } from 'svelte/elements';
 	import type { ApiChain } from '$lib/helpers/chain.js';
 	import type { StrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
+	import { type RawTick, type Quote, rawTicksToQuotes } from '$lib/chart';
 	import { goto } from '$app/navigation';
 	import { Alert, Button, EntitySymbol, Tooltip } from '$lib/components';
 	import ChartThumbnail from './ChartThumbnail.svelte';
 	import StrategyDataSummary from './StrategyDataSummary.svelte';
-	import { rawTicksToQuotes } from '$lib/chart';
 	import { getTradeExecutorErrorHtml } from 'trade-executor/strategy/error';
 
 	export let strategy: StrategyRuntimeState;
 	export let chain: ApiChain;
 
 	const href = `/strategies/${strategy.id}`;
-	const summaryStatistics = strategy.summary_statistics ?? {};
-	const chartData = rawTicksToQuotes(summaryStatistics.performance_chart_90_days ?? []);
 	const errorHtml = getTradeExecutorErrorHtml(strategy);
-	const keyMetrics = summaryStatistics.key_metrics ?? {};
-	const isBacktested = Object.values(keyMetrics).some(({ source }) => source === 'backtesting');
+
+	let chartData: Quote[] = [];
+	let isBacktested = false;
+
+	if (strategy.connected) {
+		const stats = strategy.summary_statistics;
+		chartData = rawTicksToQuotes(stats.performance_chart_90_days as RawTick[]);
+		isBacktested = Object.values(stats.key_metrics).some(({ source }) => source === 'backtesting');
+	}
 
 	const handleClick: EventHandler = ({ target }) => {
 		// skip explicit goto if user clicked an anchor tag
diff --git a/src/routes/strategies/[strategy]/(nav)/+layout.svelte b/src/routes/strategies/[strategy]/(nav)/+layout.svelte
index b51237616..ac2deae14 100644
--- a/src/routes/strategies/[strategy]/(nav)/+layout.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/+layout.svelte
@@ -6,18 +6,18 @@
 	import { getTradeExecutorErrorHtml } from 'trade-executor/strategy/error';
 
 	export let data;
-	$: ({ chain, summary, state } = data);
+	$: ({ chain, strategy, state } = data);
 
-	$: backtestAvailable = summary.backtest_available;
+	$: backtestAvailable = strategy.backtest_available;
 	// Get the error message HTML
-	$: errorHtml = getTradeExecutorErrorHtml(summary);
+	$: errorHtml = getTradeExecutorErrorHtml(strategy);
 </script>
 
 <main class="strategy-layout ds-container">
-	<PageHeading title={summary.name} description={summary.short_description}>
-		<img slot="icon" src={summary.icon_url} alt={summary.name} />
+	<PageHeading title={strategy.name} description={strategy.short_description}>
+		<img slot="icon" src={strategy.icon_url} alt={strategy.name} />
 		<div class="wallet-widget" slot="cta">
-			<WalletWidget strategy={summary} {chain} />
+			<WalletWidget {strategy} {chain} />
 		</div>
 	</PageHeading>
 
@@ -31,9 +31,9 @@
 
 	<div class="subpage">
 		<StrategyNav
-			strategyId={summary.id}
+			strategyId={strategy.id}
 			portfolio={state.portfolio}
-			onChainData={summary.on_chain_data}
+			onChainData={strategy.on_chain_data}
 			currentPath={$page.url.pathname}
 			{backtestAvailable}
 		/>
diff --git a/src/routes/strategies/[strategy]/(nav)/+page.svelte b/src/routes/strategies/[strategy]/(nav)/+page.svelte
index 343ce944c..9ed8bd439 100644
--- a/src/routes/strategies/[strategy]/(nav)/+page.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/+page.svelte
@@ -8,13 +8,13 @@
 	import { formatDaysAgo, formatNumber, formatPercent, formatPrice } from '$lib/helpers/formatters';
 	import { formatProfitability } from 'trade-executor/helpers/formatters';
 	import { relativeProfitability } from 'trade-executor/helpers/profit';
-	import type { KeyMetricKind } from 'trade-executor/strategy/runtime-state';
+	import type { KeyMetricKind } from 'trade-executor/statistics/key-metric';
 
 	export let data;
-	const { chain, strategy, summary } = data;
+	const { chain, strategy } = data;
 
-	const keyMetrics = summary.summary_statistics.key_metrics;
-	const strategyId = summary.id;
+	const keyMetrics = strategy.summary_statistics.key_metrics;
+	const strategyId = strategy.id;
 
 	let periodPerformance: MaybeNumber;
 
@@ -46,12 +46,12 @@
 </script>
 
 <svelte:head>
-	<title>{summary.name} | Trading Strategy</title>
-	<meta name="description" content={summary.short_description} />
+	<title>{strategy.name} | Trading Strategy</title>
+	<meta name="description" content={strategy.short_description} />
 </svelte:head>
 
 <div class="strategy-overview-page">
-	<MyDeposits strategy={summary} {chain} />
+	<MyDeposits {strategy} {chain} />
 
 	<div class="chart">
 		<ChartContainer let:timeSpan={{ spanDays, interval, periodicity }}>
@@ -106,7 +106,7 @@
 	</div>
 
 	<SummaryBox title="Strategy description">
-		<p>{@html summary.long_description}</p>
+		<p>{@html strategy.long_description}</p>
 	</SummaryBox>
 </div>
 
diff --git a/src/routes/strategies/[strategy]/(nav)/StrategyNav.svelte b/src/routes/strategies/[strategy]/(nav)/StrategyNav.svelte
index ff860579a..182d914c5 100644
--- a/src/routes/strategies/[strategy]/(nav)/StrategyNav.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/StrategyNav.svelte
@@ -8,7 +8,7 @@
 <script lang="ts">
 	import fsm from 'svelte-fsm';
 	import { Button, Menu, MenuItem } from '$lib/components';
-	import type { OnChainData } from 'trade-executor/strategy/runtime-state';
+	import type { OnChainData } from 'trade-executor/strategy/summary';
 
 	export let strategyId: string;
 
diff --git a/src/routes/strategies/[strategy]/(nav)/decision-making/+page.ts b/src/routes/strategies/[strategy]/(nav)/decision-making/+page.ts
index 36cde986f..6866ac584 100644
--- a/src/routes/strategies/[strategy]/(nav)/decision-making/+page.ts
+++ b/src/routes/strategies/[strategy]/(nav)/decision-making/+page.ts
@@ -3,17 +3,19 @@
  *
  * Generate a variant of decision making status image URL for both color schemes.
  */
-import { getConfiguredStrategyById } from 'trade-executor/strategy/configuration';
+import { configuredStrategies } from 'trade-executor/strategy/configuration';
+import { error } from '@sveltejs/kit';
 
 export async function load({ params }) {
-	const { url } = getConfiguredStrategyById(params.strategy)!;
+	const strategy = configuredStrategies.get(params.strategy);
+
+	if (!strategy) throw error(404, 'Not found');
 
 	const imageUrls: Record<string, string> = {};
-	const type = 'large';
 
 	for (let theme of ['light', 'dark']) {
-		const encoded = new URLSearchParams({ theme, type });
-		imageUrls[theme] = `${url}/visualisation?${encoded}`;
+		const encoded = new URLSearchParams({ theme, type: 'large' });
+		imageUrls[theme] = `${strategy.url}/visualisation?${encoded}`;
 	}
 
 	return { imageUrls };
diff --git a/src/routes/strategies/[strategy]/(nav)/logs/+page.ts b/src/routes/strategies/[strategy]/(nav)/logs/+page.ts
index f4b9746fb..ab8d01303 100644
--- a/src/routes/strategies/[strategy]/(nav)/logs/+page.ts
+++ b/src/routes/strategies/[strategy]/(nav)/logs/+page.ts
@@ -1,17 +1,17 @@
 /**
  * Fetch the server logs on the page load.
  */
+import { error } from '@sveltejs/kit';
 import { publicApiError } from '$lib/helpers/public-api';
-import { getConfiguredStrategyById } from 'trade-executor/strategy/configuration';
+import { configuredStrategies } from 'trade-executor/strategy/configuration';
 
 export async function load({ params, fetch }) {
-	const { url } = getConfiguredStrategyById(params.strategy)!;
+	const strategy = configuredStrategies.get(params.strategy);
 
-	const resp = await fetch(`${url}/logs`);
+	if (!strategy) throw error(404, 'Not found');
 
-	if (!resp.ok) {
-		throw await publicApiError(resp);
-	}
+	const resp = await fetch(`${strategy.url}/logs`);
+	if (!resp.ok) throw await publicApiError(resp);
 
 	return {
 		logs: resp.json()
diff --git a/src/routes/strategies/[strategy]/(nav)/netflow/+page.svelte b/src/routes/strategies/[strategy]/(nav)/netflow/+page.svelte
index 405724469..ca6f7642c 100644
--- a/src/routes/strategies/[strategy]/(nav)/netflow/+page.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/netflow/+page.svelte
@@ -11,9 +11,9 @@
 	import { getChartClient } from 'trade-executor/chart';
 
 	export let data;
-	const { strategy, summary } = data;
+	const { strategy } = data;
 
-	const startedAt = summary.summary_statistics?.key_metrics?.started_at?.value;
+	const startedAt = strategy.summary_statistics.key_metrics.started_at.value;
 
 	const tvlClient = getChartClient(fetch, strategy.url);
 	tvlClient.fetch({ type: 'total_equity', source: 'live_trading' });
diff --git a/src/routes/strategies/[strategy]/(nav)/performance/+page.svelte b/src/routes/strategies/[strategy]/(nav)/performance/+page.svelte
index dff3f9d63..6b3a68de3 100644
--- a/src/routes/strategies/[strategy]/(nav)/performance/+page.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/performance/+page.svelte
@@ -10,7 +10,7 @@
 	import LongShortTable from './LongShortTable.svelte';
 
 	export let data;
-	const { state, strategy, summary } = data;
+	const { state, strategy } = data;
 
 	const chartClient = getChartClient(fetch, strategy.url);
 
@@ -22,7 +22,7 @@
 	// Old path - read stats from the state
 	const oldLatestStats = getPortfolioLatestStats(state);
 	// New path - use server precalculated stats
-	const summaryStatistics = summary.summary_statistics;
+	const summaryStatistics = strategy.summary_statistics;
 </script>
 
 <section class="performance">
diff --git a/src/routes/strategies/[strategy]/(nav)/source/+page.svelte b/src/routes/strategies/[strategy]/(nav)/source/+page.svelte
index 9b39ae553..2506c0e3d 100644
--- a/src/routes/strategies/[strategy]/(nav)/source/+page.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/source/+page.svelte
@@ -7,14 +7,14 @@
 
 	export let data;
 
-	$: ({ summary, code } = data);
+	$: ({ strategy, code } = data);
 
 	// Github links disabled as for now they no longer host the canonical source
 	// $: githubUrl = `http://github.com/tradingstrategy-ai/trade-executor/tree/master/strategies/${summary.id}.py`;
 </script>
 
 <section class="source">
-	<SummaryBox title="Source code" subtitle="The source code of the {summary.name} strategy" ctaPosition="top">
+	<SummaryBox title="Source code" subtitle="The source code of the {strategy.name} strategy" ctaPosition="top">
 		<!--
 		<Button
 			slot="cta"
diff --git a/src/routes/strategies/[strategy]/(nav)/source/+page.ts b/src/routes/strategies/[strategy]/(nav)/source/+page.ts
index 809debc97..8844e7b82 100644
--- a/src/routes/strategies/[strategy]/(nav)/source/+page.ts
+++ b/src/routes/strategies/[strategy]/(nav)/source/+page.ts
@@ -3,22 +3,22 @@
  */
 import { error } from '@sveltejs/kit';
 import { publicApiError } from '$lib/helpers/public-api';
-import { getConfiguredStrategyById } from 'trade-executor/strategy/configuration';
+import { configuredStrategies } from 'trade-executor/strategy/configuration';
 
 export async function load({ params, fetch }) {
-	const { url } = getConfiguredStrategyById(params.strategy)!;
+	const strategy = configuredStrategies.get(params.strategy);
+
+	if (!strategy) throw error(404, 'Not found');
 
 	let resp;
 	try {
-		resp = await fetch(`${url}/source`);
+		resp = await fetch(`${strategy.url}/source`);
 	} catch (e) {
-		const stack = [`Error loading data from URL: ${url}/source`, e.message];
+		const stack = [`Error loading data from URL: ${strategy.url}/source`, e.message];
 		throw error(503, { message: 'Service Unavailable', stack });
 	}
 
-	if (!resp.ok) {
-		throw await publicApiError(resp);
-	}
+	if (!resp.ok) throw await publicApiError(resp);
 
 	return {
 		code: resp.text()
diff --git a/src/routes/strategies/[strategy]/(nav)/status/+page.svelte b/src/routes/strategies/[strategy]/(nav)/status/+page.svelte
index 95dea7bca..bb3cd0117 100644
--- a/src/routes/strategies/[strategy]/(nav)/status/+page.svelte
+++ b/src/routes/strategies/[strategy]/(nav)/status/+page.svelte
@@ -2,7 +2,7 @@
 	Page to display the instance run-time status
 -->
 <script lang="ts">
-	import { Alert, AlertList, DataBox, SummaryBox, Timestamp } from '$lib/components';
+	import { Alert, DataBox, SummaryBox, Timestamp } from '$lib/components';
 
 	export let data;
 	$: ({ runState, state } = data);
@@ -11,17 +11,15 @@
 <section class="instance-status">
 	<div class="status-box">
 		{#if runState.executor_running}
-			<Alert status="success">Instance is running</Alert>
+			<Alert size="md" status="success">Instance is running</Alert>
 		{:else}
-			<AlertList status="error" let:AlertItem>
-				<AlertItem>Instance has stopped</AlertItem>
+			<Alert size="md" status="error">
+				Instance has stopped
 				{#if runState.exception}
-					<AlertItem>
-						The trade executor crashed with an exception
-						<pre>{runState.exception.exception_message}</pre>
-					</AlertItem>
+					with an exception
+					<pre>{runState.exception.exception_message}</pre>
 				{/if}
-			</AlertList>
+			</Alert>
 		{/if}
 	</div>
 
diff --git a/src/routes/strategies/[strategy]/(nav)/status/+page.ts b/src/routes/strategies/[strategy]/(nav)/status/+page.ts
index f09436f6f..69e5789ea 100644
--- a/src/routes/strategies/[strategy]/(nav)/status/+page.ts
+++ b/src/routes/strategies/[strategy]/(nav)/status/+page.ts
@@ -3,16 +3,18 @@
  */
 import { error } from '@sveltejs/kit';
 import { publicApiError } from '$lib/helpers/public-api';
-import { getConfiguredStrategyById } from 'trade-executor/strategy/configuration';
+import { configuredStrategies } from 'trade-executor/strategy/configuration';
 
 export async function load({ params, fetch }) {
-	const { url } = getConfiguredStrategyById(params.strategy)!;
+	const strategy = configuredStrategies.get(params.strategy);
+
+	if (!strategy) throw error(404, 'Not found');
 
 	let resp;
 	try {
-		resp = await fetch(`${url}/status`);
+		resp = await fetch(`${strategy.url}/status`);
 	} catch (e) {
-		const stack = [`Error loading data from URL: ${url}/status`, e.message];
+		const stack = [`Error loading data from URL: ${strategy.url}/status`, e.message];
 		throw error(503, { message: 'Service Unavailable', stack });
 	}
 
diff --git a/src/routes/strategies/[strategy]/(nav)/vault/+page.ts b/src/routes/strategies/[strategy]/(nav)/vault/+page.ts
index 9f4fb047d..f04cdc231 100644
--- a/src/routes/strategies/[strategy]/(nav)/vault/+page.ts
+++ b/src/routes/strategies/[strategy]/(nav)/vault/+page.ts
@@ -1,10 +1,10 @@
 import { error } from '@sveltejs/kit';
-import type { OnChainData } from 'trade-executor/strategy/runtime-state.js';
+import type { OnChainData } from 'trade-executor/strategy/summary.js';
 
 export async function load({ parent }) {
-	const { summary } = await parent();
+	const { strategy } = await parent();
 
-	const onChainData: OnChainData = summary.on_chain_data;
+	const onChainData: OnChainData = strategy.on_chain_data;
 
 	if (onChainData?.asset_management_mode !== 'enzyme') {
 		throw error(404, 'Not found');
diff --git a/src/routes/strategies/[strategy]/+layout.svelte b/src/routes/strategies/[strategy]/+layout.svelte
index 42d3ef5d4..186cc562b 100644
--- a/src/routes/strategies/[strategy]/+layout.svelte
+++ b/src/routes/strategies/[strategy]/+layout.svelte
@@ -4,10 +4,10 @@
 
 	export let data;
 
-	$: summary = data.summary;
+	$: ({ strategy } = data);
 
 	$: breadcrumbs = {
-		[summary.id]: summary.name,
+		[strategy.id]: strategy.name,
 		'open-positions': 'Open positions',
 		'closed-positions': 'Closed positions',
 		'frozen-positions': 'Frozen positions',
diff --git a/src/routes/strategies/[strategy]/+layout.ts b/src/routes/strategies/[strategy]/+layout.ts
index 723f088c1..1b389cf76 100644
--- a/src/routes/strategies/[strategy]/+layout.ts
+++ b/src/routes/strategies/[strategy]/+layout.ts
@@ -3,22 +3,23 @@
  */
 import { error } from '@sveltejs/kit';
 import { fetchPublicApi } from '$lib/helpers/public-api';
-import { getConfiguredStrategyById } from 'trade-executor/strategy/configuration';
 import { getStrategyRuntimeState } from 'trade-executor/strategy/runtime-state';
 import { getStrategyState } from 'trade-executor/state';
 
 export async function load({ params, fetch }) {
-	const strategy = getConfiguredStrategyById(params.strategy);
-	if (!strategy) throw error(404, 'Not found');
+	const strategy = await getStrategyRuntimeState(fetch, params.strategy);
 
-	const summary = await getStrategyRuntimeState(strategy, fetch);
-	if (!summary.connected) throw error(503, 'Service Unavailable');
+	if (!strategy) {
+		throw error(404, 'Not found');
+	} else if (!strategy.connected) {
+		throw error(503, 'Service Unavailable');
+	}
 
 	const state = getStrategyState(fetch, strategy.id);
 
 	const chain = fetchPublicApi(fetch, 'chain-details', {
-		chain_id: summary.on_chain_data.chain_id.toString()
+		chain_id: strategy.on_chain_data.chain_id.toString()
 	});
 
-	return { chain, strategy, summary, state };
+	return { chain, strategy, state };
 }
diff --git a/src/routes/strategies/[strategy]/[status=positionStatus]-positions/[position]/+page.svelte b/src/routes/strategies/[strategy]/[status=positionStatus]-positions/[position]/+page.svelte
index 9078facda..f860390b6 100644
--- a/src/routes/strategies/[strategy]/[status=positionStatus]-positions/[position]/+page.svelte
+++ b/src/routes/strategies/[strategy]/[status=positionStatus]-positions/[position]/+page.svelte
@@ -17,12 +17,12 @@
 	import TradeTable from './TradeTable.svelte';
 
 	export let data;
-	const { summary, position, chain } = data;
+	const { strategy, position, chain } = data;
 </script>
 
 <main class="ds-container position-page">
 	<PageHeading title="Position #{position.position_id}">
-		<a slot="prefix" href="/strategies/{summary.id}">{summary.name}</a>
+		<a slot="prefix" href="/strategies/{strategy.id}">{strategy.name}</a>
 	</PageHeading>
 
 	<section>