diff --git a/BaseModel.ipynb b/BaseModel.ipynb
index 536ced9..ce451f5 100644
--- a/BaseModel.ipynb
+++ b/BaseModel.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "id": "productive-canberra",
+   "id": "velvet-difficulty",
    "metadata": {},
    "source": [
     "# ⚠ Warning\n",
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "legitimate-merit",
+   "id": "subject-princeton",
    "metadata": {},
    "source": [
     "# 🥭 BaseModel\n",
@@ -33,7 +33,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "wicked-louisiana",
+   "id": "reserved-fellow",
    "metadata": {
     "jupyter": {
      "source_hidden": true
@@ -66,7 +66,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "systematic-stanley",
+   "id": "small-austin",
    "metadata": {},
    "source": [
     "## Version enum\n",
@@ -77,7 +77,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "prime-franklin",
+   "id": "amended-reverse",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -92,7 +92,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "opened-moscow",
+   "id": "provincial-voice",
    "metadata": {},
    "source": [
     "## InstructionType enum\n",
@@ -103,7 +103,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "coastal-daisy",
+   "id": "republican-verification",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -132,7 +132,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "dimensional-peter",
+   "id": "earlier-foundation",
    "metadata": {},
    "source": [
     "## AccountInfo class\n"
@@ -141,7 +141,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "outdoor-pencil",
+   "id": "duplicate-timeline",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -201,7 +201,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "female-international",
+   "id": "reduced-arnold",
    "metadata": {},
    "source": [
     "## AddressableAccount class\n",
@@ -214,7 +214,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "outdoor-prison",
+   "id": "controlling-notion",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -233,7 +233,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "unexpected-vampire",
+   "id": "terminal-while",
    "metadata": {},
    "source": [
     "## SerumAccountFlags class\n",
@@ -244,7 +244,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "complex-tours",
+   "id": "sporting-storage",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -287,7 +287,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "agricultural-porter",
+   "id": "regulation-telling",
    "metadata": {},
    "source": [
     "## MangoAccountFlags class\n",
@@ -298,7 +298,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "novel-cathedral",
+   "id": "sorted-allergy",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -331,7 +331,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "neither-celebration",
+   "id": "guilty-convergence",
    "metadata": {},
    "source": [
     "## Index class"
@@ -340,7 +340,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "interesting-candy",
+   "id": "forbidden-reliance",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -367,7 +367,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "descending-madness",
+   "id": "honey-person",
    "metadata": {},
    "source": [
     "## AggregatorConfig class"
@@ -376,7 +376,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "formal-undergraduate",
+   "id": "piano-search",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -409,7 +409,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "optimum-venue",
+   "id": "controlling-singles",
    "metadata": {},
    "source": [
     "## Round class"
@@ -418,7 +418,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "conceptual-cameroon",
+   "id": "vertical-wound",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -443,7 +443,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "relative-complaint",
+   "id": "consolidated-hughes",
    "metadata": {},
    "source": [
     "## Answer class"
@@ -452,7 +452,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "hollow-rings",
+   "id": "identical-california",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -478,7 +478,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "italic-census",
+   "id": "extreme-nature",
    "metadata": {},
    "source": [
     "## Aggregator class"
@@ -487,7 +487,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "falling-meter",
+   "id": "arbitrary-ottawa",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -556,7 +556,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "speaking-trace",
+   "id": "alone-alfred",
    "metadata": {},
    "source": [
     "## Token class\n",
@@ -567,7 +567,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "gross-addition",
+   "id": "pediatric-sword",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -622,7 +622,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "tracked-wallet",
+   "id": "statistical-drinking",
    "metadata": {},
    "source": [
     "## SolToken object\n",
@@ -633,7 +633,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "married-delight",
+   "id": "small-mitchell",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -642,7 +642,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "previous-injection",
+   "id": "ordinary-corner",
    "metadata": {},
    "source": [
     "## TokenLookup class\n",
@@ -660,7 +660,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "divided-college",
+   "id": "durable-olive",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -686,7 +686,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "loving-engagement",
+   "id": "appointed-stewart",
    "metadata": {},
    "source": [
     "## BasketToken class\n",
@@ -697,7 +697,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "equal-factory",
+   "id": "synthetic-dallas",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -752,7 +752,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "distinct-collection",
+   "id": "polish-michigan",
    "metadata": {},
    "source": [
     "## TokenValue class\n",
@@ -763,7 +763,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "human-taylor",
+   "id": "acknowledged-trunk",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -848,7 +848,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "graphic-eligibility",
+   "id": "viral-property",
    "metadata": {},
    "source": [
     "## OwnedTokenValue class\n",
@@ -859,7 +859,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "iraqi-junior",
+   "id": "tribal-start",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -899,7 +899,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "wrapped-singapore",
+   "id": "emotional-eclipse",
    "metadata": {},
    "source": [
     "## MarketMetadata class"
@@ -908,7 +908,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "organized-receiver",
+   "id": "local-geometry",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -944,7 +944,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "numerous-halloween",
+   "id": "respective-advice",
    "metadata": {},
    "source": [
     "## Group class"
@@ -953,7 +953,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "greater-miller",
+   "id": "parallel-healing",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1094,7 +1094,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "sharp-messaging",
+   "id": "complete-perception",
    "metadata": {},
    "source": [
     "## TokenAccount class"
@@ -1103,7 +1103,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "verified-converter",
+   "id": "devoted-corps",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1172,7 +1172,7 @@
     "            raise Exception(f\"Data length ({len(data)}) does not match expected size ({layouts.TOKEN_ACCOUNT.sizeof()})\")\n",
     "\n",
     "        layout = layouts.TOKEN_ACCOUNT.parse(data)\n",
-    "        return TokenAccount.from_layout(account_info, layout)\n",
+    "        return TokenAccount.from_layout(layout, account_info)\n",
     "\n",
     "    @staticmethod\n",
     "    def load(context: Context, address: PublicKey) -> typing.Optional[\"TokenAccount\"]:\n",
@@ -1190,7 +1190,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "fuzzy-production",
+   "id": "paperback-collective",
    "metadata": {},
    "source": [
     "## OpenOrders class\n"
@@ -1199,7 +1199,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "synthetic-adaptation",
+   "id": "composite-pickup",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1322,7 +1322,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "married-privilege",
+   "id": "reported-preparation",
    "metadata": {},
    "source": [
     "## BalanceSheet class"
@@ -1331,7 +1331,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "periodic-broadcasting",
+   "id": "raised-sound",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1378,7 +1378,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "humanitarian-terrain",
+   "id": "juvenile-companion",
    "metadata": {},
    "source": [
     "## MarginAccount class\n"
@@ -1387,7 +1387,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "interesting-luther",
+   "id": "exceptional-interstate",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1593,7 +1593,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "tight-wings",
+   "id": "polar-converter",
    "metadata": {},
    "source": [
     "## MarginAccountMetadata class"
@@ -1602,7 +1602,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "streaming-quebec",
+   "id": "large-klein",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1628,7 +1628,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "durable-investing",
+   "id": "concerned-personal",
    "metadata": {},
    "source": [
     "# 🏃 Running"
@@ -1637,7 +1637,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "numerical-extreme",
+   "id": "generous-thickness",
    "metadata": {},
    "outputs": [],
    "source": [