diff --git a/docs/connectors/morningstar.md b/docs/connectors/morningstar.md
index eaa1208..800abc1 100644
--- a/docs/connectors/morningstar.md
+++ b/docs/connectors/morningstar.md
@@ -49,6 +49,8 @@ types.
 
 ### Available Connectors
 
-* [RNANews](morningstar/rna-news/regulatory-news-announcements.md)
+* [Goal Analysis](morningstar/goal-analysis.md)
+* [RNANews](morningstar/regulatory-news-announcements.md)
+* [Risk Score](morningstar/risk-score.md)
 * [TimeSeries](morningstar/time-series/time-series.md)
 * [XRay](morningstar/x-ray.md)
diff --git a/docs/connectors/morningstar/goal-analysis.md b/docs/connectors/morningstar/goal-analysis.md
new file mode 100644
index 0000000..aca348c
--- /dev/null
+++ b/docs/connectors/morningstar/goal-analysis.md
@@ -0,0 +1,45 @@
+Goal Analysis Connector
+=======================
+
+The Morningstar Goal Analysis service calculates the probabilities of an
+investor meeting their financial goals based on assumptions about markets and
+the assets in a portfolio.
+
+
+
+How to use Goal Analysis
+------------------------
+
+The Goal Analysis Connector provides an easy way to create an analysis to
+specific scenarios. The options give control over insights displayed in charts
+and dashboards.
+
+In order to fetch the analysis, you can request for example:
+
+```js
+const goalAnalysisConnector = MC.GoalAnalysisConnector({
+    postman: {
+        environmentJSON: postmanJSON
+    },
+    annualInvestment: 4800,
+    assetClassWeights: [
+        0.1, 0, 0, 0, 0, 0, 0, 0, 0.08, 0.03, 0, 0, 0.17,
+        0.05, 0, 0, 0, 0.13, 0.28, 0, 0, 0, 0.11, 0, 0
+    ],
+    currentSavings: 20000,
+    includeDetailedInvestmentGrowthGraph: true,
+    requestProbability: 90,
+    target: 9000,
+    timeHorizon: 5
+});
+```
+
+For more details, see [Morningstar's Goal Analysis API].
+
+
+
+<!-- Links -->
+
+
+
+[Morningstar's Goal Analysis API]: https://developer.morningstar.com/direct-web-services/documentation/api-reference/portfolio-analysis-apacemea/goal-analysis
diff --git a/docs/connectors/morningstar/rna-news/regulatory-news-announcements.md b/docs/connectors/morningstar/regulatory-news-announcements.md
similarity index 100%
rename from docs/connectors/morningstar/rna-news/regulatory-news-announcements.md
rename to docs/connectors/morningstar/regulatory-news-announcements.md
diff --git a/docs/connectors/morningstar/risk-score/risk-score.md b/docs/connectors/morningstar/risk-score.md
similarity index 100%
rename from docs/connectors/morningstar/risk-score/risk-score.md
rename to docs/connectors/morningstar/risk-score.md
diff --git a/docs/connectors/morningstar/x-ray.md b/docs/connectors/morningstar/x-ray.md
index bca3a2a..3f3d262 100644
--- a/docs/connectors/morningstar/x-ray.md
+++ b/docs/connectors/morningstar/x-ray.md
@@ -17,7 +17,7 @@ You can use the X-Ray Connector to fetch portfolio data points, holding data
 points, or benchmark data points. Depending on the request additional breakdown
 columns might be added to the table.
 
-In order to fetch a benchmark, you can for example 
+In order to fetch a benchmark, you can request for example:
 
 ```js
 const xRayConnector = MC.XRayConnector({
diff --git a/src/CLI/Library/APIServer.ts b/src/CLI/Library/APIServer.ts
index 9e281e7..74a6cc4 100644
--- a/src/CLI/Library/APIServer.ts
+++ b/src/CLI/Library/APIServer.ts
@@ -131,51 +131,6 @@ const STATIC_PATH = Path.join(__dirname, '..', 'Static');
  * */
 
 
-/**
- * Creates or retrieves an option with the given name path.
- *
- * @param tree
- * Tree root to walk on.
- *
- * @param nodePath
- * Node path to retrieve.
- *
- * @return
- * Created or retrieved option.
- */
-function treeNode (
-    tree: Options,
-    nodePath: string
-): Option {
-    let node: Option = {
-        doclet: {},
-        meta: {
-            fullname: '',
-            name: ''
-        },
-        children: tree
-    };
-
-    let currentName = '';
-
-    for (const name of nodePath.split('.')) {
-        currentName = (currentName ? `${currentName}.${name}` : name);
-        node = node.children[name] = (
-            node.children[name] ||
-            {
-                doclet: {},
-                meta: {
-                    fullname: currentName,
-                    name
-                },
-                children: {}
-            }
-        );
-    }
-
-    return node;
-}
-
 
 function escape (
     text: string
@@ -234,7 +189,7 @@ async function getOption (
 
     if (node) {
         option.doclet.description =
-            await Marked.parse(jsdoc2Markdown(node.description));
+            await Marked.parse(jsdoc2Markdown(escape(node.description)));
 
         if (node.deprecated) {
             option.doclet.deprecated = `${node.deprecated.toFixed(2)}.0`;
@@ -246,7 +201,7 @@ async function getOption (
                     (option.doclet as Record<string, string>).default =
                         node.doclet.default.join(',');
                 } else {
-                    option.doclet.defaultvalue = escape(node.doclet.default.join(','));
+                    option.doclet.defaultvalue = node.doclet.default.join(',');
                 }
             }
         }
@@ -265,11 +220,11 @@ async function getOption (
         root.meta.hasChildren = true;
         childOption = treeNode(root.children, child.name);
         childOption.doclet.description =
-            await Marked.parse(jsdoc2Markdown(child.description));
+            await Marked.parse(jsdoc2Markdown(escape(child.description)));
 
         if (child.doclet.type) {
             childOption.doclet.type = {
-                name: child.doclet.type.map(escape)
+                name: child.doclet.type
             };
         }
 
@@ -319,33 +274,6 @@ function jsdoc2Markdown (text: string): string {
 }
 
 
-async function toNav (
-    item: Database.Item
-): Promise<Nav> {
-    const nav: Nav = {};
-
-    if (item.description) {
-        nav.description = await Marked.parse(jsdoc2Markdown(item.description));
-    }
-
-    if (item.meta.file) {
-        nav.filename = item.meta.file;
-    }
-
-    nav.fullname = item.name;
-    nav.name = item.name.split('.').pop();
-
-    if (item.doclet.type) {
-        if (item.doclet.default) {
-            nav.default = item.doclet.default[item.doclet.default.length - 1];
-        }
-        nav.typeList = { names: item.doclet.type.map(escape) };
-    }
-
-    return nav;
-}
-
-
 /**
  * Response with a 200
  *
@@ -410,6 +338,80 @@ function sanitizePath (path: string): string {
 }
 
 
+async function toNav (
+    item: Database.Item
+): Promise<Nav> {
+    const nav: Nav = {};
+
+    if (item.description) {
+        nav.description =
+            await Marked.parse(jsdoc2Markdown(escape(item.description)));
+    }
+
+    if (item.meta.file) {
+        nav.filename = item.meta.file;
+    }
+
+    nav.fullname = item.name;
+    nav.name = item.name.split('.').pop();
+
+    if (item.doclet.type) {
+        if (item.doclet.default) {
+            nav.default = item.doclet.default[item.doclet.default.length - 1];
+        }
+        nav.typeList = { names: item.doclet.type };
+    }
+
+    return nav;
+}
+
+
+/**
+ * Creates or retrieves an option with the given name path.
+ *
+ * @param tree
+ * Tree root to walk on.
+ *
+ * @param nodePath
+ * Node path to retrieve.
+ *
+ * @return
+ * Created or retrieved option.
+ */
+function treeNode (
+    tree: Options,
+    nodePath: string
+): Option {
+    let node: Option = {
+        doclet: {},
+        meta: {
+            fullname: '',
+            name: ''
+        },
+        children: tree
+    };
+
+    let currentName = '';
+
+    for (const name of nodePath.split('.')) {
+        currentName = (currentName ? `${currentName}.${name}` : name);
+        node = node.children[name] = (
+            node.children[name] ||
+            {
+                doclet: {},
+                meta: {
+                    fullname: currentName,
+                    name
+                },
+                children: {}
+            }
+        );
+    }
+
+    return node;
+}
+
+
 /* *
  *
  *  Tasks
diff --git a/src/GoalAnalysis/GoalAnalysisConnector.ts b/src/GoalAnalysis/GoalAnalysisConnector.ts
new file mode 100644
index 0000000..28f1f0a
--- /dev/null
+++ b/src/GoalAnalysis/GoalAnalysisConnector.ts
@@ -0,0 +1,150 @@
+/* *
+ *
+ *  (c) 2009-2024 Highsoft AS
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ *  Authors:
+ *  - Sophie Bremer
+ *
+ * */
+
+
+'use strict';
+
+
+/* *
+ *
+ *  Imports
+ *
+ * */
+
+
+import GoalAnalysisConverter from './GoalAnalysisConverter';
+import GoalAnalysisOptions, {
+    GoalAnalysisMetadata
+} from './GoalAnalysisOptions';
+import MorningstarAPI from '../Shared/MorningstarAPI';
+import MorningstarConnector from '../Shared/MorningstarConnector';
+import MorningstarURL from '../Shared/MorningstarURL';
+
+
+/* *
+ *
+ *  Class
+ *
+ * */
+
+
+export class GoalAnalysisConnector extends MorningstarConnector {
+
+
+    /* *
+     *
+     *  Constructor
+     *
+     * */
+
+
+    public constructor (
+        options: GoalAnalysisOptions = {}
+    ) {
+        super(options);
+
+        this.converter = new GoalAnalysisConverter(options.converter);
+        this.metadata = this.converter.metadata;
+        this.options = options;
+    }
+
+
+    /* *
+     *
+     *  Properties
+     *
+     * */
+
+
+    public override readonly converter: GoalAnalysisConverter;
+
+
+    public override readonly metadata: GoalAnalysisMetadata;
+
+
+    public override readonly options: GoalAnalysisOptions;
+
+
+    /* *
+     *
+     *  Functions
+     *
+     * */
+
+
+    public override async load (): Promise<this> {
+
+        await super.load();
+
+        const options = this.options;
+        const api = this.api = this.api || new MorningstarAPI(options.api);
+        const url = new MorningstarURL('ecint/v1/goal-analysis', api.baseURL);
+
+        if (!options.assetClassWeights) {
+            throw new Error('Option assetClassWeights is missing.');
+        }
+
+        const searchParams = url.searchParams;
+
+        searchParams.set('AssetClassWeights', options.assetClassWeights.join('|'));
+
+        if (options.annualInvestment) {
+            searchParams.set('annualInvestment', `${options.annualInvestment}`);
+        }
+
+        if (options.currentSavings) {
+            searchParams.set('currentSavings', `${options.currentSavings}`);
+        }
+
+        if (typeof options.includeDetailedInvestmentGrowthGraph === 'boolean') {
+            searchParams.set(
+                'IncludeDetailedInvestmentGrowthGraph',
+                options.includeDetailedInvestmentGrowthGraph ? 'True' : 'False'
+            );
+        }
+
+        if (options.requestProbability) {
+            searchParams.set('RequestProbability', `${options.requestProbability}`);
+        }
+
+        if (options.target) {
+            searchParams.set('target', `${options.target}`);
+        }
+
+        if (options.timeHorizon) {
+            searchParams.set('timeHorizon', `${options.timeHorizon}`);
+        }
+
+        const response = await api.fetch(url);
+        const json = await response.json() as unknown;
+
+        this.converter.parse({ json });
+
+        this.table.deleteColumns();
+        this.table.setColumns(this.converter.getTable().getColumns());
+
+        return this;
+    }
+
+
+}
+
+
+/* *
+ *
+ *  Default Export
+ *
+ * */
+
+
+export default GoalAnalysisConnector;
diff --git a/src/GoalAnalysis/GoalAnalysisConverter.ts b/src/GoalAnalysis/GoalAnalysisConverter.ts
new file mode 100644
index 0000000..07423d3
--- /dev/null
+++ b/src/GoalAnalysis/GoalAnalysisConverter.ts
@@ -0,0 +1,177 @@
+/* *
+ *
+ *  (c) 2009-2024 Highsoft AS
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ *  Authors:
+ *  - Sophie Bremer
+ *
+ * */
+
+
+'use strict';
+
+
+/* *
+ *
+ *  Imports
+ *
+ * */
+
+
+import {
+    GoalAnalysisConverterOptions,
+    GoalAnalysisMetadata
+} from './GoalAnalysisOptions';
+import GoalAnalysisJSON from './GoalAnalysisJSON';
+import MorningstarConverter from '../Shared/MorningstarConverter';
+
+
+/* *
+ *
+ *  Class
+ *
+ * */
+
+
+export class GoalAnalysisConverter extends MorningstarConverter {
+
+
+    /* *
+     *
+     *  Constructor
+     *
+     * */
+
+
+    public constructor (
+        options?: GoalAnalysisConverterOptions
+    ) {
+        super(options);
+
+        this.metadata = {
+            annualisedRequiredReturn: 0,
+            columns: {},
+            expectedReturn: 0,
+            financialGoal: 0,
+            probabilityOfReachingTarget: 0,
+            requiredReturn: 0,
+            requiredReturnValue: 0,
+            standardDeviation: 0,
+            totalGain: 0,
+            totalInvestment: 0,
+            totalReturn: 0,
+            years: 0
+        };
+    }
+
+
+    /* *
+     *
+     *  Properties
+     *
+     * */
+
+
+    public readonly metadata: GoalAnalysisMetadata;
+
+
+    /* *
+     *
+     *  Functions
+     *
+     * */
+
+
+    public parse (
+        options: GoalAnalysisConverterOptions
+    ): void {
+        const metadata = this.metadata;
+        const table = this.table;
+        const userOptions = {
+            ...this.options,
+            ...options
+        };
+        const json = userOptions.json;
+
+        // Validate JSON
+
+        if (!GoalAnalysisJSON.isGoalAnalysisResponse(json)) {
+            throw new Error('Invalid data');
+        }
+
+        // Prepare table
+
+        table.deleteColumns();
+        table.setColumn('Goal_Probability');
+        table.setColumn('Goal_Amount');
+
+        let seriesData = json.seriesData?.[0]?.data;
+
+        for (let i = 0, iEnd = seriesData.length; i < iEnd; ++i) {
+            table.setColumn(`Goal_AssetClass_${i}`);
+        }
+
+        // Add analysis to table
+
+        let assetClassIndex = 0;
+        let rowIndex = 0;
+
+        for (const probabilityAccumulate of json.probabilityAccumulate) {
+            table.setCell(
+                'Goal_Probability',
+                rowIndex,
+                probabilityAccumulate.probability
+            );
+            table.setCell(
+                'Goal_Amount',
+                rowIndex,
+                probabilityAccumulate.Amount
+            );
+
+            assetClassIndex = 0;
+            seriesData = json.seriesData?.[rowIndex]?.data;
+
+            for (const assetClassData of seriesData) {
+                table.setCell(
+                    `Goal_AssetClass_${assetClassIndex}`,
+                    rowIndex,
+                    assetClassData
+                );
+                ++assetClassIndex;
+            }
+
+            ++rowIndex;
+        }
+
+        // Update meta data
+
+        metadata.annualisedRequiredReturn = json.annualisedRequiredReturn;
+        metadata.expectedReturn = json.expectedReturn;
+        metadata.financialGoal = json.financialGoal;
+        metadata.probabilityOfReachingTarget = json.probabilityOfReachingTarget;
+        metadata.requiredReturn = json.requiredReturn;
+        metadata.requiredReturnValue = json.requiredReturnValue;
+        metadata.standardDeviation = json.standardDeviation;
+        metadata.totalGain = json.totalGain;
+        metadata.totalInvestment = json.totalInvestment;
+        metadata.totalReturn = json.totalReturn;
+        metadata.years = json.years;
+
+    }
+
+
+}
+
+
+/* *
+ *
+ *  Default Export
+ *
+ * */
+
+
+export default GoalAnalysisConverter;
diff --git a/src/GoalAnalysis/GoalAnalysisJSON.ts b/src/GoalAnalysis/GoalAnalysisJSON.ts
new file mode 100644
index 0000000..509bb6b
--- /dev/null
+++ b/src/GoalAnalysis/GoalAnalysisJSON.ts
@@ -0,0 +1,133 @@
+/* *
+ *
+ *  (c) 2009-2024 Highsoft AS
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ *  Authors:
+ *  - Sophie Bremer
+ *
+ * */
+
+
+'use strict';
+
+
+/* *
+ *
+ *  Namespace
+ *
+ * */
+
+
+namespace GoalAnalysisJSON {
+
+
+    /* *
+     *
+     *  Declarations
+     *
+     * */
+
+
+    export interface GoalAnalysisResponse {
+        annualisedRequiredReturn: number;
+        expectedReturn: number;
+        financialGoal: number;
+        probabilityAccumulate: Array<ProbabilityAccumulate>;
+        probabilityOfReachingTarget: number;
+        requiredReturn: number;
+        requiredReturnValue: number;
+        seriesData: Array<SeriesData>;
+        standardDeviation: number;
+        totalGain: number;
+        totalInvestment: number;
+        totalReturn: number;
+        years: number;
+    }
+
+
+    export interface ProbabilityAccumulate {
+        Amount: number;
+        probability: number;
+    }
+
+
+    export interface SeriesData {
+        data: Array<number>;
+        probability: number;
+    }
+
+
+    /* *
+     *
+     *  Functions
+     *
+     * */
+
+
+    export function isGoalAnalysisResponse (
+        json?: unknown
+    ): json is GoalAnalysisResponse {
+        return (
+            !!json &&
+            typeof json === 'object' &&
+            typeof (json as GoalAnalysisResponse).annualisedRequiredReturn === 'number' &&
+            typeof (json as GoalAnalysisResponse).probabilityAccumulate === 'object' &&
+            (json as GoalAnalysisResponse).probabilityAccumulate instanceof Array &&
+            (
+                (json as GoalAnalysisResponse).probabilityAccumulate.length === 0 ||
+                isProbabilityAccumulate((json as GoalAnalysisResponse).probabilityAccumulate[0])
+            ) &&
+            typeof (json as GoalAnalysisResponse).seriesData === 'object' &&
+            (json as GoalAnalysisResponse).seriesData instanceof Array &&
+            (
+                (json as GoalAnalysisResponse).seriesData.length === 0 ||
+                isSeriesData((json as GoalAnalysisResponse).seriesData[0])
+            )
+        );
+    }
+
+
+    function isProbabilityAccumulate (
+        json?: unknown
+    ): json is ProbabilityAccumulate {
+        return (
+            !!json &&
+            typeof json === 'object' &&
+            typeof (json as ProbabilityAccumulate).Amount === 'number' &&
+            typeof (json as ProbabilityAccumulate).probability === 'number'
+        );
+    }
+
+
+    function isSeriesData (
+        json?: unknown
+    ): json is SeriesData {
+        return (
+            !!json &&
+            typeof json === 'object' &&
+            typeof (json as SeriesData).probability === 'number' &&
+            typeof (json as SeriesData).data === 'object' &&
+            (json as SeriesData).data instanceof Array &&
+            (
+                (json as SeriesData).data.length === 0 ||
+                typeof (json as SeriesData).data[0] === 'number'
+            )
+        );
+    }
+
+
+}
+
+
+/* *
+ *
+ *  Default Export
+ *
+ * */
+
+
+export default GoalAnalysisJSON;
diff --git a/src/GoalAnalysis/GoalAnalysisOptions.ts b/src/GoalAnalysis/GoalAnalysisOptions.ts
new file mode 100644
index 0000000..9ebd031
--- /dev/null
+++ b/src/GoalAnalysis/GoalAnalysisOptions.ts
@@ -0,0 +1,161 @@
+/* *
+ *
+ *  (c) 2009-2024 Highsoft AS
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ *  Authors:
+ *  - Sophie Bremer
+ *
+ * */
+
+
+'use strict';
+
+
+/* *
+ *
+ *  Imports
+ *
+ * */
+
+
+import type {
+    MorningstarConverterOptions,
+    MorningstarMetadata,
+    MorningstarOptions
+} from '../Shared/MorningstarOptions';
+
+
+/* *
+ *
+ *  API Options
+ *
+ * 
+ * */
+
+
+export interface GoalAnalysisConverterOptions extends MorningstarConverterOptions {
+    // Nothing to add yet
+}
+
+
+export interface GoalAnalysisMetadata extends MorningstarMetadata {
+
+    /**
+     * Annualised required return percentage.
+     */
+    annualisedRequiredReturn: number;
+
+    /**
+     * Expected return on initial investment.
+     */
+    expectedReturn: number;
+
+    /**
+     * Target investment goal amount.
+     */
+    financialGoal: number;
+
+    /**
+     * Probability percentage of reaching investment goal.
+     */
+    probabilityOfReachingTarget: number;
+
+    /**
+     * Required return percentage.
+     */
+    requiredReturn: number;
+
+    /**
+     * Required return value.
+     */
+    requiredReturnValue: number;
+
+    /**
+     * Standard deviation value.
+     */
+    standardDeviation: number;
+
+    /**
+     * Total gain percentage.
+     */
+    totalGain: number;
+
+    /**
+     * Total investment value at end of time period.
+     */
+    totalInvestment: number;
+
+    /**
+     * Total return percentage.
+     */
+    totalReturn: number;
+
+    /**
+     * Number of years to reach goal.
+     */
+    years: number;
+
+}
+
+
+export interface GoalAnalysisOptions extends MorningstarOptions {
+
+    /**
+     * Amount investor invests yearly.
+     *
+     * **Note:** Required when `includeDetailedInvestmentGrowthGraph`option is
+     * set to `true`.
+     */
+    annualInvestment?: number;
+
+    /**
+     * Weight list of individual asset classes.
+     */
+    assetClassWeights?: Array<number>;
+
+    /**
+     * Investor’s current savings amount.
+     *
+     * **Note:** Required when `includeDetailedInvestmentGrowthGraph`option is
+     * set to `true`.
+     */
+    currentSavings?: number;
+
+    /**
+     * Returns time series data for charting purposes.
+     */
+    includeDetailedInvestmentGrowthGraph?: boolean;
+
+    requestProbability?: number;
+
+    /**
+     * Investor’s target goal amount.
+     *
+     * **Note:** Required when `includeDetailedInvestmentGrowthGraph`option is
+     * set to `true`.
+     */
+    target?: number;
+
+    /**
+     * Time horizon in years.
+     *
+     * **Note:** Required when `includeDetailedInvestmentGrowthGraph`option is
+     * set to `true`.
+     */
+    timeHorizon?: number;
+
+}
+
+
+/* *
+ *
+ *  Default Export
+ *
+ * */
+
+
+export default GoalAnalysisOptions;
diff --git a/src/GoalAnalysis/index.ts b/src/GoalAnalysis/index.ts
new file mode 100644
index 0000000..be1ede6
--- /dev/null
+++ b/src/GoalAnalysis/index.ts
@@ -0,0 +1,47 @@
+/* *
+ *
+ *  (c) 2009-2024 Highsoft AS
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ *  Authors:
+ *  - Sophie Bremer
+ *
+ * */
+
+
+'use strict';
+
+
+/* *
+ *
+ *  Imports
+ *
+ * */
+
+
+import GoalAnalysisConnector from './GoalAnalysisConnector';
+
+
+/* *
+ *
+ *  Exports
+ *
+ * */
+
+
+export * from './GoalAnalysisConnector';
+export * from './GoalAnalysisConverter';
+export * from './GoalAnalysisOptions';
+
+
+/* *
+ *
+ *  Default Export
+ *
+ * */
+
+
+export default GoalAnalysisConnector;
diff --git a/src/api.d.ts b/src/api.d.ts
index bfa5dd9..6fdc664 100644
--- a/src/api.d.ts
+++ b/src/api.d.ts
@@ -19,6 +19,8 @@
  * */
 
 
+import GoalAnalysisOptions from './GoalAnalysis/GoalAnalysisOptions';
+import RiskScoreOptions from './RiskScore/RiskScoreOptions';
 import RNANewsOptions from './RNANews/RNANewsOptions';
 import TimeSeriesOptions from './TimeSeries/TimeSeriesOptions';
 import XRayOptions from './XRay/XRayOptions';
@@ -35,6 +37,8 @@ import XRayOptions from './XRay/XRayOptions';
  * Available types of the Highcharts Morningstar Connectors.
  */
 interface Options {
+    GoalAnalysis: GoalAnalysisOptions;
+    RiskScore: RiskScoreOptions;
     RNANews: RNANewsOptions;
     TimeSeries: TimeSeriesOptions;
     XRay: XRayOptions;
diff --git a/src/index.ts b/src/index.ts
index 53d7e3f..8133a51 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,6 +22,7 @@
  * */
 
 
+import GoalAnalysis from './GoalAnalysis/index';
 import RNANews from './RNANews/index';
 import RiskScore from './RiskScore/index';
 import * as Shared from './Shared/index';
@@ -37,6 +38,7 @@ import XRay from './XRay/index';
  * */
 
 
+export * from './GoalAnalysis/index';
 export * from './RNANews/index';
 export * from './RiskScore/index';
 export * as Shared from './Shared/index';
@@ -53,6 +55,7 @@ export * from './XRay/index';
 
 
 export default {
+    GoalAnalysis,
     RNANews,
     RiskScore,
     Shared,
diff --git a/tests/GoalAnalysis/GoalAnalysisConnector.test.ts b/tests/GoalAnalysis/GoalAnalysisConnector.test.ts
new file mode 100644
index 0000000..7870a1d
--- /dev/null
+++ b/tests/GoalAnalysis/GoalAnalysisConnector.test.ts
@@ -0,0 +1,49 @@
+import * as Assert from 'node:assert/strict';
+import * as MC from '../../code/connectors-morningstar.src';
+
+export async function goalAnalysisConnector (
+    api: MC.Shared.MorningstarAPIOptions
+) {
+    const connector = new MC.GoalAnalysisConnector({
+        api,
+        annualInvestment: 4800,
+        assetClassWeights: [
+            0.1, 0, 0, 0, 0, 0, 0, 0, 0.08, 0.03, 0, 0, 0.17,
+            0.05, 0, 0, 0, 0.13, 0.28, 0, 0, 0, 0.11, 0, 0
+        ],
+        currentSavings: 20000,
+        includeDetailedInvestmentGrowthGraph: true,
+        requestProbability: 90,
+        target: 9000,
+        timeHorizon: 5
+    });
+
+    Assert.ok(
+        connector instanceof MC.GoalAnalysisConnector,
+        'Connector should be instance of GoalAnalysisConnector class.'
+    );
+
+    Assert.ok(
+        connector.converter instanceof MC.GoalAnalysisConverter,
+        'Converter should be instance of GoalAnalysisConverter class.'
+    );
+
+    await connector.load();
+
+    Assert.deepStrictEqual(
+        connector.table.getColumnNames(),
+        [
+            'Goal_Probability', 'Goal_Amount', 'Goal_AssetClass_0',
+            'Goal_AssetClass_1', 'Goal_AssetClass_2', 'Goal_AssetClass_3',
+            'Goal_AssetClass_4', 'Goal_AssetClass_5'
+        ],
+        'Connector table should exist of expected columns.'
+    );
+
+    Assert.strictEqual(
+        connector.table.getRowCount(),
+        7,
+        'Connector table should have the expected amount of rows.'
+    );
+
+}
diff --git a/tests/XRay/Breakdown.test.ts b/tests/XRay/Breakdown.test.ts
index 5754c8e..875f193 100644
--- a/tests/XRay/Breakdown.test.ts
+++ b/tests/XRay/Breakdown.test.ts
@@ -37,8 +37,6 @@ export async function breakdownLoad (
 
     await connector.load();
 
-    process.stdout.write(JSON.stringify(connector.table.getColumnNames()));
-
     Assert.deepStrictEqual(
         connector.table.getColumnNames(),
         ['XRay_TotalReturn_TimePeriod', 'XRay_TotalReturn_Value'],
diff --git a/tools/api.ts b/tools/api.ts
index 415dc3b..3a0b286 100644
--- a/tools/api.ts
+++ b/tools/api.ts
@@ -222,7 +222,7 @@ async function addOption (
 
             }
             if (codeInfo.type) {
-                item.doclet.type = TSLib.extractTypes(codeInfo.type);
+                item.doclet.type = TSLib.extractTypes(codeInfo.type, true);
                 for (const type of item.doclet.type) {
                     if (type.endsWith('Options')) {
                         resolved = TSLib.resolveReference(
diff --git a/tools/tests.ts b/tools/tests.ts
index cf2a0d9..579ddf3 100644
--- a/tools/tests.ts
+++ b/tools/tests.ts
@@ -197,6 +197,8 @@ async function runUnitTests () {
             'failed.\n'
         );
 
+        process.exit(1);
+
     }
 
 }