From f2a2ac9ec859c20c8c9e3c2882535c14b19869a6 Mon Sep 17 00:00:00 2001
From: Arik Chakma <arikchangma@gmail.com>
Date: Tue, 30 Apr 2024 22:48:51 +0600
Subject: [PATCH] feat: implement team activity stream (#5565)

* wip

* feat: implement team activity page

* feat: add pagination

* fix: add max height

* Team activity updates

* Remove invalid activityes

* Team activity page

* fix: team roadmap versions not working

* Add team activity items

---------

Co-authored-by: Kamran Ahmed <kamranahmed.se@gmail.com>
---
 .../Activity/ActivityTopicsModal.tsx          |    2 +-
 src/components/Authenticator/authenticator.ts |    1 +
 src/components/CreateTeam/Step4.tsx           |    2 +-
 src/components/FrameRenderer/renderer.ts      |   14 +-
 src/components/HeroSection/HeroRoadmaps.tsx   |    2 +-
 .../Navigation/DropdownTeamList.tsx           |    2 +-
 .../Notification/NotificationPage.tsx         |    2 +-
 src/components/RespondInviteForm.tsx          |    8 +-
 .../TeamActivity/TeamActivityItem.tsx         |  195 +
 .../TeamActivity/TeamActivityPage.tsx         |  189 +
 .../TeamActivity/TeamActivityTopicsModal.tsx  |  128 +
 .../TeamActivity/TeamEmptyStream.tsx          |   23 +
 src/components/TeamDropdown/TeamDropdown.tsx  |    2 +-
 .../TeamProgress/MemberProgressModal.tsx      |    4 +-
 src/components/TeamSidebar.tsx                |    8 +-
 src/components/TeamVersions/TeamVersions.tsx  |   25 +-
 src/components/TeamsList.tsx                  |    2 +-
 src/data/roadmaps/backend/backend.json        | 1397 ++++----
 src/data/roadmaps/mlops/mlops.json            | 3128 +++++++++--------
 src/lib/resource-progress.ts                  |    4 +-
 src/pages/team/activity.astro                 |   15 +
 src/pages/team/progress.astro                 |    8 +-
 22 files changed, 2891 insertions(+), 2270 deletions(-)
 create mode 100644 src/components/TeamActivity/TeamActivityItem.tsx
 create mode 100644 src/components/TeamActivity/TeamActivityPage.tsx
 create mode 100644 src/components/TeamActivity/TeamActivityTopicsModal.tsx
 create mode 100644 src/components/TeamActivity/TeamEmptyStream.tsx
 create mode 100644 src/pages/team/activity.astro

diff --git a/src/components/Activity/ActivityTopicsModal.tsx b/src/components/Activity/ActivityTopicsModal.tsx
index dcafa3e20..ff353a616 100644
--- a/src/components/Activity/ActivityTopicsModal.tsx
+++ b/src/components/Activity/ActivityTopicsModal.tsx
@@ -107,7 +107,7 @@ export function ActivityTopicsModal(props: ActivityTopicDetailsProps) {
             />
           </a>
         </span>
-        <ul className="flex flex-col gap-1">
+        <ul className="flex max-h-[50vh] flex-col gap-1 overflow-y-auto max-md:max-h-full">
           {topicIds.map((topicId) => {
             const topicTitle = topicTitles[topicId] || 'Unknown Topic';
 
diff --git a/src/components/Authenticator/authenticator.ts b/src/components/Authenticator/authenticator.ts
index 2a8185abc..9a14bff32 100644
--- a/src/components/Authenticator/authenticator.ts
+++ b/src/components/Authenticator/authenticator.ts
@@ -42,6 +42,7 @@ function handleGuest() {
     '/account',
     '/team',
     '/team/progress',
+    '/team/activity',
     '/team/roadmaps',
     '/team/new',
     '/team/members',
diff --git a/src/components/CreateTeam/Step4.tsx b/src/components/CreateTeam/Step4.tsx
index 34eabe32e..1591703fb 100644
--- a/src/components/CreateTeam/Step4.tsx
+++ b/src/components/CreateTeam/Step4.tsx
@@ -15,7 +15,7 @@ export function Step4({ team }: Step4Props) {
           Your team has been created. Happy learning!
         </p>
         <a
-          href={`/team/progress?t=${team._id}`}
+          href={`/team/activity?t=${team._id}`}
           className="mt-4 rounded-md bg-black px-5 py-1.5 text-sm text-white"
         >
           View Team
diff --git a/src/components/FrameRenderer/renderer.ts b/src/components/FrameRenderer/renderer.ts
index bbc0848be..a4d0aac20 100644
--- a/src/components/FrameRenderer/renderer.ts
+++ b/src/components/FrameRenderer/renderer.ts
@@ -1,20 +1,19 @@
 import { wireframeJSONToSVG } from 'roadmap-renderer';
-import { httpPost } from '../../lib/http';
 import { isLoggedIn } from '../../lib/jwt';
+import type {
+  ResourceProgressType,
+  ResourceType,
+} from '../../lib/resource-progress';
 import {
   refreshProgressCounters,
   renderResourceProgress,
   renderTopicProgress,
   updateResourceProgress,
 } from '../../lib/resource-progress';
-import type {
-  ResourceProgressType,
-  ResourceType,
-} from '../../lib/resource-progress';
 import { pageProgressMessage } from '../../stores/page';
 import { showLoginPopup } from '../../lib/popup';
 import { replaceChildren } from '../../lib/dom.ts';
-import {setUrlParams} from "../../lib/browser.ts";
+import { setUrlParams } from '../../lib/browser.ts';
 
 export class Renderer {
   resourceId: string;
@@ -94,7 +93,6 @@ export class Renderer {
       })
       .then((svg) => {
         replaceChildren(this.containerEl!, svg);
-        // this.containerEl?.replaceChildren(svg);
       })
       .then(() => {
         return renderResourceProgress(
@@ -143,7 +141,7 @@ export class Renderer {
     const newJsonFileSlug = newJsonUrl.split('/').pop()?.replace('.json', '');
 
     const type = this.resourceType[0]; // r for roadmap, b for best-practices
-    setUrlParams({ [type]: newJsonFileSlug! })
+    setUrlParams({ [type]: newJsonFileSlug! });
 
     this.jsonToSvg(newJsonUrl)?.then(() => {});
   }
diff --git a/src/components/HeroSection/HeroRoadmaps.tsx b/src/components/HeroSection/HeroRoadmaps.tsx
index 02662102f..c0d0a2348 100644
--- a/src/components/HeroSection/HeroRoadmaps.tsx
+++ b/src/components/HeroSection/HeroRoadmaps.tsx
@@ -201,7 +201,7 @@ export function HeroRoadmaps(props: ProgressListProps) {
                     Team{' '}
                     <a
                       className="mx-1 font-medium underline underline-offset-2 transition-colors hover:text-gray-300"
-                      href={`/team/progress?t=${currentTeam?.id}`}
+                      href={`/team/activity?t=${currentTeam?.id}`}
                     >
                       {teamName}
                     </a>
diff --git a/src/components/Navigation/DropdownTeamList.tsx b/src/components/Navigation/DropdownTeamList.tsx
index 6f0e99de3..4661cfa82 100644
--- a/src/components/Navigation/DropdownTeamList.tsx
+++ b/src/components/Navigation/DropdownTeamList.tsx
@@ -73,7 +73,7 @@ export function DropdownTeamList(props: DropdownTeamListProps) {
             if (team.status === 'invited') {
               pageLink = `/respond-invite?i=${team.memberId}`;
             } else if (team.status === 'joined') {
-              pageLink = `/team/progress?t=${team._id}`;
+              pageLink = `/team/activity?t=${team._id}`;
             }
 
             return (
diff --git a/src/components/Notification/NotificationPage.tsx b/src/components/Notification/NotificationPage.tsx
index 3c964d4c6..281d6d51e 100644
--- a/src/components/Notification/NotificationPage.tsx
+++ b/src/components/Notification/NotificationPage.tsx
@@ -47,7 +47,7 @@ export function NotificationPage() {
     }
 
     if (status === 'accept') {
-      window.location.href = `/team/progress?t=${response.teamId}`;
+      window.location.href = `/team/activity?t=${response.teamId}`;
     } else {
       window.dispatchEvent(
         new CustomEvent('refresh-notification', {
diff --git a/src/components/RespondInviteForm.tsx b/src/components/RespondInviteForm.tsx
index 909182682..f08459baf 100644
--- a/src/components/RespondInviteForm.tsx
+++ b/src/components/RespondInviteForm.tsx
@@ -75,7 +75,7 @@ export function RespondInviteForm() {
       window.location.href = '/';
       return;
     }
-    window.location.href = `/team/progress?t=${response.teamId}`;
+    window.location.href = `/team/activity?t=${response.teamId}`;
   }
 
   if (isLoadingInvite) {
@@ -106,7 +106,7 @@ export function RespondInviteForm() {
 
   return (
     <div className="container text-center">
-      <BuildingIcon className="mx-auto mb-4 mt-24 w-20 opacity-20" />
+      <BuildingIcon className="mx-auto mb-4 mt-24 w-20 h-20 opacity-20" />
 
       <h2 className={'mb-1 text-2xl font-bold'}>Join Team</h2>
       <p className="mb-3 text-base leading-6 text-gray-600">
@@ -139,7 +139,7 @@ export function RespondInviteForm() {
                   pageProgressMessage.set('');
                 })
               }
-              className="flex-grow cursor-pointer rounded-lg bg-gray-200 px-3 py-2 text-center"
+              className="flex-grow cursor-pointer rounded-lg hover:bg-gray-300 bg-gray-200 px-3 py-2 text-center"
             >
               Accept
             </button>
@@ -150,7 +150,7 @@ export function RespondInviteForm() {
                   pageProgressMessage.set('');
                 })
               }
-              className="flex-grow cursor-pointer rounded-lg bg-red-500 px-3 py-2 text-white disabled:opacity-40"
+              className="flex-grow cursor-pointer rounded-lg bg-red-500 hover:bg-red-600 px-3 py-2 text-white disabled:opacity-40"
             >
               Reject
             </button>
diff --git a/src/components/TeamActivity/TeamActivityItem.tsx b/src/components/TeamActivity/TeamActivityItem.tsx
new file mode 100644
index 000000000..659860515
--- /dev/null
+++ b/src/components/TeamActivity/TeamActivityItem.tsx
@@ -0,0 +1,195 @@
+import { useState } from 'react';
+import { getRelativeTimeString } from '../../lib/date';
+import type { TeamStreamActivity } from './TeamActivityPage';
+import { ChevronsDown, ChevronsUp } from 'lucide-react';
+
+type TeamActivityItemProps = {
+  onTopicClick?: (activity: TeamStreamActivity) => void;
+  user: {
+    activities: TeamStreamActivity[];
+    _id: string;
+    name: string;
+    avatar?: string | undefined;
+    username?: string | undefined;
+  };
+};
+
+export function TeamActivityItem(props: TeamActivityItemProps) {
+  const { user, onTopicClick } = props;
+  const { activities } = user;
+
+  const [showAll, setShowAll] = useState(false);
+
+  const resourceLink = (activity: TeamStreamActivity) => {
+    const {
+      resourceId,
+      resourceTitle,
+      resourceType,
+      isCustomResource,
+      resourceSlug,
+    } = activity;
+
+    const resourceUrl =
+      resourceType === 'question'
+        ? `/questions/${resourceId}`
+        : resourceType === 'best-practice'
+          ? `/best-practices/${resourceId}`
+          : isCustomResource && resourceType === 'roadmap'
+            ? `/r/${resourceSlug}`
+            : `/${resourceId}`;
+
+    return (
+      <a
+        className="font-medium underline transition-colors hover:cursor-pointer hover:text-black"
+        target="_blank"
+        href={resourceUrl}
+      >
+        {resourceTitle}
+      </a>
+    );
+  };
+
+  const timeAgo = (date: string | Date) => (
+    <span className="ml-1 text-xs text-gray-400">
+      {getRelativeTimeString(new Date(date).toISOString())}
+    </span>
+  );
+  const userAvatar = user.avatar
+    ? `${import.meta.env.PUBLIC_AVATAR_BASE_URL}/${user.avatar}`
+    : '/images/default-avatar.png';
+
+  const username = (
+    <>
+      <img
+        className="mr-1 inline-block h-5 w-5 rounded-full"
+        src={userAvatar}
+        alt={user.name}
+      />
+      <span className="font-medium">{user?.name || 'Unknown'}</span>{' '}
+    </>
+  );
+
+  if (activities.length === 1) {
+    const activity = activities[0];
+    const { actionType, topicIds } = activity;
+    const topicCount = topicIds?.length || 0;
+
+    return (
+      <li
+        key={user._id}
+        className="flex items-center flex-wrap gap-1 rounded-md border px-2 py-2.5 text-sm"
+      >
+        {actionType === 'in_progress' && (
+          <>
+            {username} started{' '}
+            <button
+              className="font-medium underline underline-offset-2 hover:text-black"
+              onClick={() => onTopicClick?.(activity)}
+            >
+              {topicCount} topic{topicCount > 1 ? 's' : ''}
+            </button>{' '}
+            in {resourceLink(activity)} {timeAgo(activity.updatedAt)}
+          </>
+        )}
+
+        {actionType === 'done' && (
+          <>
+            {username} completed{' '}
+            <button
+              className="font-medium underline underline-offset-2 hover:text-black"
+              onClick={() => onTopicClick?.(activity)}
+            >
+              {topicCount} topic{topicCount > 1 ? 's' : ''}
+            </button>{' '}
+            in {resourceLink(activity)} {timeAgo(activity.updatedAt)}
+          </>
+        )}
+        {actionType === 'answered' && (
+          <>
+            {username} answered {topicCount} question
+            {topicCount > 1 ? 's' : ''} in {resourceLink(activity)}{' '}
+            {timeAgo(activity.updatedAt)}
+          </>
+        )}
+      </li>
+    );
+  }
+
+  const uniqueResourcesCount = new Set(
+    activities.map((activity) => activity.resourceId),
+  ).size;
+
+  const activityLimit = showAll ? activities.length : 5;
+
+  return (
+    <li key={user._id} className="rounded-md border overflow-hidden">
+      <h3 className="flex flex-wrap items-center gap-1 bg-gray-100 px-2 py-2.5 text-sm">
+        {username} has {activities.length} updates in {uniqueResourcesCount}{' '}
+        resources
+      </h3>
+      <div className="py-3">
+        <ul className="flex flex-col gap-2 ml-2 sm:ml-[36px]">
+          {activities.slice(0, activityLimit).map((activity) => {
+            const { actionType, topicIds } = activity;
+            const topicCount = topicIds?.length || 0;
+
+            return (
+              <li key={activity._id} className="text-sm text-gray-600">
+                {actionType === 'in_progress' && (
+                  <>
+                    Started{' '}
+                    <button
+                      className="font-medium underline underline-offset-2 hover:text-black"
+                      onClick={() => onTopicClick?.(activity)}
+                    >
+                      {topicCount} topic{topicCount > 1 ? 's' : ''}
+                    </button>{' '}
+                    in {resourceLink(activity)} {timeAgo(activity.updatedAt)}
+                  </>
+                )}
+                {actionType === 'done' && (
+                  <>
+                    Completed{' '}
+                    <button
+                      className="font-medium underline underline-offset-2 hover:text-black"
+                      onClick={() => onTopicClick?.(activity)}
+                    >
+                      {topicCount} topic{topicCount > 1 ? 's' : ''}
+                    </button>{' '}
+                    in {resourceLink(activity)} {timeAgo(activity.updatedAt)}
+                  </>
+                )}
+                {actionType === 'answered' && (
+                  <>
+                    Answered {topicCount} question
+                    {topicCount > 1 ? 's' : ''} in {resourceLink(activity)}{' '}
+                    {timeAgo(activity.updatedAt)}
+                  </>
+                )}
+              </li>
+            );
+          })}
+        </ul>
+
+        {activities.length > 5 && (
+          <button
+            className="mt-3 flex items-center gap-2 rounded-md border border-gray-300 p-1 text-xs uppercase tracking-wide text-gray-600 transition-colors hover:border-black hover:bg-black hover:text-white"
+            onClick={() => setShowAll(!showAll)}
+          >
+            {showAll ? (
+              <>
+                <ChevronsUp size={14} />
+                Show less
+              </>
+            ) : (
+              <>
+                <ChevronsDown size={14} />
+                Show more
+              </>
+            )}
+          </button>
+        )}
+      </div>
+    </li>
+  );
+}
diff --git a/src/components/TeamActivity/TeamActivityPage.tsx b/src/components/TeamActivity/TeamActivityPage.tsx
new file mode 100644
index 000000000..23da24938
--- /dev/null
+++ b/src/components/TeamActivity/TeamActivityPage.tsx
@@ -0,0 +1,189 @@
+import { useEffect, useState, useMemo } from 'react';
+import { useToast } from '../../hooks/use-toast';
+import { getUrlParams } from '../../lib/browser';
+import { httpGet } from '../../lib/http';
+import type { ResourceType } from '../../lib/resource-progress';
+import type { AllowedActivityActionType } from '../Activity/ActivityStream';
+import { pageProgressMessage } from '../../stores/page';
+import { TeamActivityItem } from './TeamActivityItem';
+import { TeamActivityTopicsModal } from './TeamActivityTopicsModal';
+import { TeamEmptyStream } from './TeamEmptyStream';
+import { Pagination } from '../Pagination/Pagination';
+
+export type TeamStreamActivity = {
+  _id?: string;
+  resourceType: ResourceType | 'question';
+  resourceId: string;
+  resourceTitle: string;
+  resourceSlug?: string;
+  isCustomResource?: boolean;
+  actionType: AllowedActivityActionType;
+  topicIds?: string[];
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export interface TeamActivityStreamDocument {
+  _id?: string;
+  teamId: string;
+  userId: string;
+  activity: TeamStreamActivity[];
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+type GetTeamActivityResponse = {
+  data: {
+    users: {
+      _id: string;
+      name: string;
+      avatar?: string;
+      username?: string;
+    }[];
+    activities: TeamActivityStreamDocument[];
+  };
+  totalCount: number;
+  totalPages: number;
+  currPage: number;
+  perPage: number;
+};
+
+export function TeamActivityPage() {
+  const { t: teamId } = getUrlParams();
+
+  const toast = useToast();
+
+  const [isLoading, setIsLoading] = useState(true);
+  const [selectedActivity, setSelectedActivity] =
+    useState<TeamStreamActivity | null>(null);
+  const [teamActivities, setTeamActivities] = useState<GetTeamActivityResponse>(
+    {
+      data: {
+        users: [],
+        activities: [],
+      },
+      totalCount: 0,
+      totalPages: 0,
+      currPage: 1,
+      perPage: 21,
+    },
+  );
+  const [currPage, setCurrPage] = useState(1);
+
+  const getTeamProgress = async (currPage: number = 1) => {
+    const { response, error } = await httpGet<GetTeamActivityResponse>(
+      `${import.meta.env.PUBLIC_API_URL}/v1-get-team-activity/${teamId}`,
+      {
+        currPage,
+      },
+    );
+    if (error || !response) {
+      toast.error(error?.message || 'Failed to get team activity');
+      return;
+    }
+
+    setTeamActivities(response);
+    setCurrPage(response.currPage);
+  };
+
+  useEffect(() => {
+    if (!teamId) {
+      return;
+    }
+
+    getTeamProgress().then(() => {
+      pageProgressMessage.set('');
+      setIsLoading(false);
+    });
+  }, [teamId]);
+
+  const { users, activities } = teamActivities?.data;
+  const usersWithActivities = useMemo(() => {
+    const validActivities = activities.filter((activity) => {
+      return (
+        activity.activity.length > 0 &&
+        activity.activity.some((t) => (t?.topicIds?.length || 0) > 0)
+      );
+    });
+
+    return users
+      .map((user) => {
+        const userActivities = validActivities
+          .filter((activity) => activity.userId === user._id)
+          .flatMap((activity) => activity.activity)
+          .filter((activity) => (activity?.topicIds?.length || 0) > 0)
+          .sort((a, b) => {
+            return (
+              new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+            );
+          });
+
+        return {
+          ...user,
+          activities: userActivities,
+        };
+      })
+      .filter((user) => user.activities.length > 0)
+      .sort((a, b) => {
+        return (
+          new Date(b.activities[0].updatedAt).getTime() -
+          new Date(a.activities[0].updatedAt).getTime()
+        );
+      });
+  }, [users, activities]);
+
+  if (!teamId) {
+    window.location.href = '/';
+    return;
+  }
+
+  if (isLoading) {
+    return null;
+  }
+
+  return (
+    <>
+      {selectedActivity && (
+        <TeamActivityTopicsModal
+          activity={selectedActivity}
+          onClose={() => setSelectedActivity(null)}
+        />
+      )}
+
+      {usersWithActivities.length > 0 ? (
+        <>
+          <h3 className="mb-4 flex w-full items-center justify-between text-xs uppercase text-gray-400">
+            Team Activity
+          </h3>
+          <ul className="mb-4 mt-2 flex flex-col gap-3">
+            {usersWithActivities.map((user) => {
+              return (
+                <TeamActivityItem
+                  key={user._id}
+                  user={user}
+                  onTopicClick={setSelectedActivity}
+                />
+              );
+            })}
+          </ul>
+
+          <Pagination
+            currPage={currPage}
+            totalPages={teamActivities.totalPages}
+            totalCount={teamActivities.totalCount}
+            perPage={teamActivities.perPage}
+            onPageChange={(page) => {
+              setCurrPage(page);
+              pageProgressMessage.set('Loading...');
+              getTeamProgress(page).finally(() => {
+                pageProgressMessage.set('');
+              });
+            }}
+          />
+        </>
+      ) : (
+        <TeamEmptyStream teamId={teamId} />
+      )}
+    </>
+  );
+}
diff --git a/src/components/TeamActivity/TeamActivityTopicsModal.tsx b/src/components/TeamActivity/TeamActivityTopicsModal.tsx
new file mode 100644
index 000000000..76b147f16
--- /dev/null
+++ b/src/components/TeamActivity/TeamActivityTopicsModal.tsx
@@ -0,0 +1,128 @@
+import { useEffect, useState } from 'react';
+import { httpPost } from '../../lib/http';
+import { Modal } from '../Modal.tsx';
+import { ModalLoader } from '../UserProgress/ModalLoader.tsx';
+import { ArrowUpRight, BookOpen, Check } from 'lucide-react';
+import type { TeamStreamActivity } from './TeamActivityPage.tsx';
+
+type TeamActivityTopicsModalProps = {
+  activity: TeamStreamActivity;
+  onClose: () => void;
+};
+
+export function TeamActivityTopicsModal(props: TeamActivityTopicsModalProps) {
+  const { activity, onClose } = props;
+  const {
+    resourceId,
+    resourceType,
+    isCustomResource,
+    topicIds = [],
+    actionType,
+  } = activity;
+
+  const [isLoading, setIsLoading] = useState(true);
+  const [topicTitles, setTopicTitles] = useState<Record<string, string>>({});
+  const [error, setError] = useState<string | null>(null);
+
+  const loadTopicTitles = async () => {
+    setIsLoading(true);
+    setError(null);
+
+    const { response, error } = await httpPost(
+      `${import.meta.env.PUBLIC_API_URL}/v1-get-topic-titles`,
+      {
+        resourceId,
+        resourceType,
+        isCustomResource,
+        topicIds,
+      },
+    );
+
+    if (error || !response) {
+      setError(error?.message || 'Failed to load topic titles');
+      setIsLoading(false);
+      return;
+    }
+
+    setTopicTitles(response);
+    setIsLoading(false);
+  };
+
+  useEffect(() => {
+    loadTopicTitles().finally(() => {
+      setIsLoading(false);
+    });
+  }, []);
+
+  if (isLoading || error) {
+    return (
+      <ModalLoader
+        error={error!}
+        text={'Loading topics..'}
+        isLoading={isLoading}
+      />
+    );
+  }
+
+  let pageUrl = '';
+  if (resourceType === 'roadmap') {
+    pageUrl = isCustomResource ? `/r/${resourceId}` : `/${resourceId}`;
+  } else if (resourceType === 'best-practice') {
+    pageUrl = `/best-practices/${resourceId}`;
+  } else {
+    pageUrl = `/questions/${resourceId}`;
+  }
+
+  return (
+    <Modal
+      onClose={() => {
+        onClose();
+        setError(null);
+        setIsLoading(false);
+      }}
+    >
+      <div className={`popup-body relative rounded-lg bg-white p-4 shadow`}>
+        <span className="mb-2 flex items-center justify-between text-lg font-semibold capitalize">
+          <span className="flex items-center gap-2">
+            {actionType.replace('_', ' ')}
+          </span>
+          <a
+            href={pageUrl}
+            target="_blank"
+            className="flex items-center gap-1 rounded-md border border-transparent py-0.5 pl-2 pr-1 text-sm font-normal text-gray-400 transition-colors hover:border-black hover:bg-black hover:text-white"
+          >
+            Visit Page{' '}
+            <ArrowUpRight
+              size={16}
+              strokeWidth={2}
+              className="relative top-px"
+            />
+          </a>
+        </span>
+        <ul className="flex max-h-[50vh] flex-col gap-1 overflow-y-auto max-md:max-h-full">
+          {topicIds.map((topicId) => {
+            const topicTitle = topicTitles[topicId] || 'Unknown Topic';
+
+            const ActivityIcon =
+              actionType === 'done'
+                ? Check
+                : actionType === 'in_progress'
+                  ? BookOpen
+                  : Check;
+
+            return (
+              <li key={topicId} className="flex items-start gap-2">
+                <ActivityIcon
+                  strokeWidth={3}
+                  className="relative top-[4px] text-green-500"
+                  size={16}
+                />
+                {topicTitle}
+              </li>
+            );
+          })}
+        </ul>
+      </div>
+    </Modal>
+  );
+}
diff --git a/src/components/TeamActivity/TeamEmptyStream.tsx b/src/components/TeamActivity/TeamEmptyStream.tsx
new file mode 100644
index 000000000..ee9aa34de
--- /dev/null
+++ b/src/components/TeamActivity/TeamEmptyStream.tsx
@@ -0,0 +1,23 @@
+import { Activity, List, ListTodo } from 'lucide-react';
+
+type TeamActivityItemProps = {
+  teamId: string;
+};
+
+export function TeamEmptyStream(props: TeamActivityItemProps) {
+  const { teamId } = props;
+
+  return (
+    <div className="rounded-md">
+      <div className="flex flex-col items-center p-7 text-center sm:p-14">
+        <ListTodo className="mb-4 h-[60px] w-[60px] opacity-10 sm:h-[60px] sm:w-[60px]" />
+
+        <h2 className="text-lg font-semibold sm:text-lg">No Activity</h2>
+        <p className="my-1 max-w-[400px] text-balance text-sm text-gray-500 sm:my-2 sm:text-base">
+          Team activity will appear here once members start tracking their
+          progress.
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/TeamDropdown/TeamDropdown.tsx b/src/components/TeamDropdown/TeamDropdown.tsx
index 4b6edf3f9..ff412de6a 100644
--- a/src/components/TeamDropdown/TeamDropdown.tsx
+++ b/src/components/TeamDropdown/TeamDropdown.tsx
@@ -162,7 +162,7 @@ export function TeamDropdown() {
                 if (team.status === 'invited') {
                   pageLink = `/respond-invite?i=${team.memberId}`;
                 } else if (team.status === 'joined') {
-                  pageLink = `/team/progress?t=${team._id}`;
+                  pageLink = `/team/activity?t=${team._id}`;
                 }
 
                 return (
diff --git a/src/components/TeamProgress/MemberProgressModal.tsx b/src/components/TeamProgress/MemberProgressModal.tsx
index 81c2942d7..aad14653c 100644
--- a/src/components/TeamProgress/MemberProgressModal.tsx
+++ b/src/components/TeamProgress/MemberProgressModal.tsx
@@ -57,7 +57,9 @@ export function MemberProgressModal(props: ProgressMapProps) {
   const [isLoading, setIsLoading] = useState(true);
   const toast = useToast();
 
-  let resourceJsonUrl = 'https://roadmap.sh';
+  let resourceJsonUrl = import.meta.env.DEV
+    ? 'http://localhost:3000'
+    : 'https://roadmap.sh';
   if (resourceType === 'roadmap') {
     resourceJsonUrl += `/${resourceId}.json`;
   } else {
diff --git a/src/components/TeamSidebar.tsx b/src/components/TeamSidebar.tsx
index ca07e71e7..08676c80b 100644
--- a/src/components/TeamSidebar.tsx
+++ b/src/components/TeamSidebar.tsx
@@ -9,7 +9,7 @@ import { SubmitFeedbackPopup } from './Feedback/SubmitFeedbackPopup';
 import { ChevronDownIcon } from './ReactIcons/ChevronDownIcon.tsx';
 import { GroupIcon } from './ReactIcons/GroupIcon.tsx';
 import { TeamProgressIcon } from './ReactIcons/TeamProgressIcon.tsx';
-import { MapIcon, MessageCircle } from 'lucide-react';
+import { BarChart2, MapIcon, MessageCircle } from 'lucide-react';
 import { CogIcon } from './ReactIcons/CogIcon.tsx';
 
 type TeamSidebarProps = {
@@ -25,6 +25,12 @@ export function TeamSidebar({ activePageId, children }: TeamSidebarProps) {
   const { teamId } = useTeamId();
 
   const sidebarLinks = [
+    {
+      title: 'Activity',
+      href: `/team/activity?t=${teamId}`,
+      id: 'activity',
+      icon: BarChart2,
+    },
     {
       title: 'Progress',
       href: `/team/progress?t=${teamId}`,
diff --git a/src/components/TeamVersions/TeamVersions.tsx b/src/components/TeamVersions/TeamVersions.tsx
index 256163e00..b76e44d5b 100644
--- a/src/components/TeamVersions/TeamVersions.tsx
+++ b/src/components/TeamVersions/TeamVersions.tsx
@@ -107,20 +107,29 @@ export function TeamVersions(props: TeamVersionsProps) {
 
   useEffect(() => {
     clearResourceProgress();
+
+    // teams have customizations. Assigning #customized-roadmap to roadmapSvgWrap
+    // makes those customizations visible and removes extra boxes
+    const roadmapSvgWrap: HTMLElement =
+      document.getElementById('resource-svg-wrap')?.parentElement ||
+      document.createElement('div');
+
     if (!selectedTeamVersion) {
       deleteUrlParam('t');
       renderResourceProgress(resourceType, resourceId).then();
-      return;
-    }
 
-    setUrlParams({ t: selectedTeamVersion.team._id! });
+      roadmapSvgWrap.id = '';
+    } else {
+      setUrlParams({ t: selectedTeamVersion.team._id! });
 
-    renderResourceProgress(resourceType, resourceId).then(() => {
-      selectedTeamVersion.config?.removed?.forEach((topic) => {
-        renderTopicProgress(topic, 'removed');
+      renderResourceProgress(resourceType, resourceId).then(() => {
+        selectedTeamVersion.config?.removed?.forEach((topic) => {
+          renderTopicProgress(topic, 'removed');
+        });
+        refreshProgressCounters();
+        roadmapSvgWrap.id = 'customized-roadmap';
       });
-      refreshProgressCounters();
-    });
+    }
   }, [selectedTeamVersion]);
 
   if (isPreparing) {
diff --git a/src/components/TeamsList.tsx b/src/components/TeamsList.tsx
index 885b7b7f2..ad173b9d6 100644
--- a/src/components/TeamsList.tsx
+++ b/src/components/TeamsList.tsx
@@ -64,7 +64,7 @@ export function TeamsList() {
             if (team.status === 'invited') {
               pageLink = `/respond-invite?i=${team.memberId}`;
             } else if (team.status === 'joined') {
-              pageLink = `/team/progress?t=${team._id}`;
+              pageLink = `/team/activity?t=${team._id}`;
             }
 
             return (
diff --git a/src/data/roadmaps/backend/backend.json b/src/data/roadmaps/backend/backend.json
index 7ffd256db..93e0b578a 100644
--- a/src/data/roadmaps/backend/backend.json
+++ b/src/data/roadmaps/backend/backend.json
@@ -3,15 +3,15 @@
     "controls": {
       "control": [
         {
-          "ID": "2380",
+          "ID": "3372",
           "typeID": "Arrow",
           "zOrder": "0",
           "w": "1",
           "h": "101",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1254",
-          "y": "846",
+          "x": "1264",
+          "y": "856",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -33,15 +33,15 @@
           }
         },
         {
-          "ID": "2381",
+          "ID": "3373",
           "typeID": "Arrow",
           "zOrder": "1",
           "w": "136",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1071",
-          "y": "3249",
+          "x": "1081",
+          "y": "3259",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -63,15 +63,15 @@
           }
         },
         {
-          "ID": "2382",
+          "ID": "3374",
           "typeID": "__group__",
           "zOrder": "2",
           "measuredW": "214",
           "measuredH": "46",
           "w": "214",
           "h": "46",
-          "x": "671",
-          "y": "3258",
+          "x": "681",
+          "y": "3268",
           "properties": {
             "controlName": "102-scalability:migration-strategies"
           },
@@ -110,15 +110,15 @@
           }
         },
         {
-          "ID": "2383",
+          "ID": "3375",
           "typeID": "__group__",
           "zOrder": "3",
           "measuredW": "211",
           "measuredH": "196",
           "w": "211",
           "h": "196",
-          "x": "671",
-          "y": "3298",
+          "x": "681",
+          "y": "3308",
           "properties": {
             "controlName": "101-scalability:instrumentation-monitoring-telemetry"
           },
@@ -235,15 +235,15 @@
           }
         },
         {
-          "ID": "2384",
+          "ID": "3376",
           "typeID": "Arrow",
           "zOrder": "4",
           "w": "1",
           "h": "744",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1301",
-          "y": "2957",
+          "x": "1311",
+          "y": "2967",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -264,15 +264,15 @@
           }
         },
         {
-          "ID": "2385",
+          "ID": "3377",
           "typeID": "Arrow",
           "zOrder": "5",
           "w": "276",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1264",
-          "y": "2948",
+          "x": "1274",
+          "y": "2958",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -294,15 +294,15 @@
           }
         },
         {
-          "ID": "2386",
+          "ID": "3378",
           "typeID": "Arrow",
           "zOrder": "6",
           "w": "1",
           "h": "95",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1051",
-          "y": "2946",
+          "x": "1061",
+          "y": "2956",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -324,15 +324,15 @@
           }
         },
         {
-          "ID": "2387",
+          "ID": "3379",
           "typeID": "Arrow",
           "zOrder": "7",
           "w": "487",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "837",
-          "y": "2949",
+          "x": "847",
+          "y": "2959",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -353,15 +353,15 @@
           }
         },
         {
-          "ID": "2388",
+          "ID": "3380",
           "typeID": "Arrow",
           "zOrder": "8",
           "w": "1",
           "h": "141",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "745",
-          "y": "2813",
+          "x": "755",
+          "y": "2823",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -382,15 +382,15 @@
           }
         },
         {
-          "ID": "2389",
+          "ID": "3381",
           "typeID": "__group__",
           "zOrder": "9",
           "measuredW": "200",
           "measuredH": "50",
           "w": "200",
           "h": "50",
-          "x": "674",
-          "y": "2927",
+          "x": "684",
+          "y": "2937",
           "properties": {
             "controlName": "120-real-time-data"
           },
@@ -425,15 +425,15 @@
           }
         },
         {
-          "ID": "2390",
+          "ID": "3382",
           "typeID": "Arrow",
           "zOrder": "10",
           "w": "1",
           "h": "91",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "747",
-          "y": "2729",
+          "x": "757",
+          "y": "2739",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -455,15 +455,15 @@
           }
         },
         {
-          "ID": "2391",
+          "ID": "3383",
           "typeID": "Arrow",
           "zOrder": "11",
           "w": "623",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "849",
-          "y": "2811",
+          "x": "859",
+          "y": "2821",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -484,15 +484,15 @@
           }
         },
         {
-          "ID": "2392",
+          "ID": "3384",
           "typeID": "Arrow",
           "zOrder": "12",
           "w": "1",
           "h": "260",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1567",
-          "y": "2502",
+          "x": "1577",
+          "y": "2512",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -513,15 +513,15 @@
           }
         },
         {
-          "ID": "2393",
+          "ID": "3385",
           "typeID": "Arrow",
           "zOrder": "13",
           "w": "1",
           "h": "61",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1751",
-          "y": "2608",
+          "x": "1761",
+          "y": "2618",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -543,15 +543,15 @@
           }
         },
         {
-          "ID": "2394",
+          "ID": "3386",
           "typeID": "Arrow",
           "zOrder": "14",
           "w": "1",
           "h": "68",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1379",
-          "y": "2491",
+          "x": "1389",
+          "y": "2501",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -573,15 +573,15 @@
           }
         },
         {
-          "ID": "2395",
+          "ID": "3387",
           "typeID": "Arrow",
           "zOrder": "15",
           "w": "413",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1160",
-          "y": "2489",
+          "x": "1170",
+          "y": "2499",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -602,15 +602,15 @@
           }
         },
         {
-          "ID": "2396",
+          "ID": "3388",
           "typeID": "Arrow",
           "zOrder": "16",
           "w": "1",
           "h": "95",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1086",
-          "y": "2494",
+          "x": "1096",
+          "y": "2504",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -632,15 +632,15 @@
           }
         },
         {
-          "ID": "2397",
+          "ID": "3389",
           "typeID": "Arrow",
           "zOrder": "17",
           "w": "1",
           "h": "141",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1086",
-          "y": "2351",
+          "x": "1096",
+          "y": "2361",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -661,15 +661,15 @@
           }
         },
         {
-          "ID": "2398",
+          "ID": "3390",
           "typeID": "Arrow",
           "zOrder": "18",
           "w": "283",
           "h": "70",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1286",
-          "y": "2337",
+          "x": "1296",
+          "y": "2347",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -691,15 +691,15 @@
           }
         },
         {
-          "ID": "2399",
+          "ID": "3391",
           "typeID": "Arrow",
           "zOrder": "19",
           "w": "280",
           "h": "32",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1291",
-          "y": "2330",
+          "x": "1301",
+          "y": "2340",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -721,15 +721,15 @@
           }
         },
         {
-          "ID": "2400",
+          "ID": "3392",
           "typeID": "Arrow",
           "zOrder": "20",
           "w": "272",
           "h": "35",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1299",
-          "y": "2269",
+          "x": "1309",
+          "y": "2279",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -751,15 +751,15 @@
           }
         },
         {
-          "ID": "2401",
+          "ID": "3393",
           "typeID": "Arrow",
           "zOrder": "21",
           "w": "280",
           "h": "72",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1287",
-          "y": "2223",
+          "x": "1297",
+          "y": "2233",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -781,15 +781,15 @@
           }
         },
         {
-          "ID": "2402",
+          "ID": "3394",
           "typeID": "Arrow",
           "zOrder": "22",
           "w": "320",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1295",
-          "y": "2316",
+          "x": "1305",
+          "y": "2326",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -811,15 +811,15 @@
           }
         },
         {
-          "ID": "2403",
+          "ID": "3395",
           "typeID": "__group__",
           "zOrder": "23",
           "measuredW": "324",
           "measuredH": "50",
           "w": "324",
           "h": "50",
-          "x": "1005",
-          "y": "2312",
+          "x": "1015",
+          "y": "2322",
           "properties": {
             "controlName": "114-design-and-development-principles"
           },
@@ -858,15 +858,15 @@
           }
         },
         {
-          "ID": "2404",
+          "ID": "3396",
           "typeID": "Arrow",
           "zOrder": "24",
           "w": "219",
           "h": "145",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "868",
-          "y": "2155",
+          "x": "878",
+          "y": "2165",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -887,15 +887,15 @@
           }
         },
         {
-          "ID": "2405",
+          "ID": "3397",
           "typeID": "Arrow",
           "zOrder": "25",
           "w": "1",
           "h": "91",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "768",
-          "y": "2148",
+          "x": "778",
+          "y": "2158",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -917,15 +917,15 @@
           }
         },
         {
-          "ID": "2406",
+          "ID": "3398",
           "typeID": "Arrow",
           "zOrder": "26",
           "w": "1",
           "h": "118",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "768",
-          "y": "2031",
+          "x": "778",
+          "y": "2041",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -946,15 +946,15 @@
           }
         },
         {
-          "ID": "2407",
+          "ID": "3399",
           "typeID": "Arrow",
           "zOrder": "27",
           "w": "1",
           "h": "91",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "769",
-          "y": "1939",
+          "x": "779",
+          "y": "1949",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -976,15 +976,15 @@
           }
         },
         {
-          "ID": "2408",
+          "ID": "3400",
           "typeID": "Arrow",
           "zOrder": "28",
           "w": "469",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "837",
-          "y": "2033",
+          "x": "847",
+          "y": "2043",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1005,15 +1005,15 @@
           }
         },
         {
-          "ID": "2409",
+          "ID": "3401",
           "typeID": "Arrow",
           "zOrder": "29",
           "w": "1",
           "h": "75",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "2039",
+          "x": "1401",
+          "y": "2049",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1035,15 +1035,15 @@
           }
         },
         {
-          "ID": "2410",
+          "ID": "3402",
           "typeID": "Arrow",
           "zOrder": "30",
           "w": "223",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "1798",
+          "x": "1401",
+          "y": "1808",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1064,15 +1064,15 @@
           }
         },
         {
-          "ID": "2411",
+          "ID": "3403",
           "typeID": "Arrow",
           "zOrder": "31",
           "w": "1",
           "h": "206",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1688",
-          "y": "1690",
+          "x": "1698",
+          "y": "1700",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1094,15 +1094,15 @@
           }
         },
         {
-          "ID": "2412",
+          "ID": "3404",
           "typeID": "Arrow",
           "zOrder": "32",
           "w": "223",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "1780",
+          "x": "1401",
+          "y": "1790",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1123,15 +1123,15 @@
           }
         },
         {
-          "ID": "2413",
+          "ID": "3405",
           "typeID": "Arrow",
           "zOrder": "33",
           "w": "1",
           "h": "211",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "1566",
+          "x": "1401",
+          "y": "1576",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1152,15 +1152,15 @@
           }
         },
         {
-          "ID": "2414",
+          "ID": "3406",
           "typeID": "Arrow",
           "zOrder": "34",
           "w": "1",
           "h": "93",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "1486",
+          "x": "1401",
+          "y": "1496",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1182,15 +1182,15 @@
           }
         },
         {
-          "ID": "2415",
+          "ID": "3407",
           "typeID": "Arrow",
           "zOrder": "35",
           "w": "267",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1137",
-          "y": "1579",
+          "x": "1147",
+          "y": "1589",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1211,15 +1211,15 @@
           }
         },
         {
-          "ID": "2416",
+          "ID": "3408",
           "typeID": "Arrow",
           "zOrder": "36",
           "w": "1",
           "h": "108",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1120",
-          "y": "1464",
+          "x": "1130",
+          "y": "1474",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1241,15 +1241,15 @@
           }
         },
         {
-          "ID": "2417",
+          "ID": "3409",
           "typeID": "Arrow",
           "zOrder": "37",
           "w": "1",
           "h": "129",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1058",
-          "y": "1587",
+          "x": "1068",
+          "y": "1597",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1271,15 +1271,15 @@
           }
         },
         {
-          "ID": "2418",
+          "ID": "3410",
           "typeID": "Arrow",
           "zOrder": "38",
           "w": "214",
           "h": "180",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "816",
-          "y": "1586",
+          "x": "826",
+          "y": "1596",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1301,15 +1301,15 @@
           }
         },
         {
-          "ID": "2419",
+          "ID": "3411",
           "typeID": "Arrow",
           "zOrder": "39",
           "w": "183",
           "h": "125",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "811",
-          "y": "1594",
+          "x": "821",
+          "y": "1604",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1331,15 +1331,15 @@
           }
         },
         {
-          "ID": "2420",
+          "ID": "3412",
           "typeID": "Arrow",
           "zOrder": "40",
           "w": "186",
           "h": "82",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "808",
-          "y": "1591",
+          "x": "818",
+          "y": "1601",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1361,14 +1361,14 @@
           }
         },
         {
-          "ID": "2421",
+          "ID": "3413",
           "typeID": "Arrow",
           "zOrder": "41",
           "h": "40",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "817",
-          "y": "1591",
+          "x": "827",
+          "y": "1601",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1390,15 +1390,15 @@
           }
         },
         {
-          "ID": "2422",
+          "ID": "3414",
           "typeID": "Arrow",
           "zOrder": "42",
           "w": "176",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "804",
-          "y": "1577",
+          "x": "814",
+          "y": "1587",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1420,15 +1420,15 @@
           }
         },
         {
-          "ID": "2423",
+          "ID": "3415",
           "typeID": "Arrow",
           "zOrder": "43",
           "w": "1",
           "h": "239",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1059",
-          "y": "1336",
+          "x": "1069",
+          "y": "1346",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1449,15 +1449,15 @@
           }
         },
         {
-          "ID": "2424",
+          "ID": "3416",
           "typeID": "Arrow",
           "zOrder": "44",
           "w": "236",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1135",
-          "y": "1323",
+          "x": "1145",
+          "y": "1333",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1478,15 +1478,15 @@
           }
         },
         {
-          "ID": "2425",
+          "ID": "3417",
           "typeID": "Arrow",
           "zOrder": "45",
           "w": "166",
           "h": "168",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "859",
-          "y": "1342",
+          "x": "869",
+          "y": "1352",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1508,15 +1508,15 @@
           }
         },
         {
-          "ID": "2426",
+          "ID": "3418",
           "typeID": "Arrow",
           "zOrder": "46",
           "w": "151",
           "h": "125",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "862",
-          "y": "1340",
+          "x": "872",
+          "y": "1350",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1538,15 +1538,15 @@
           }
         },
         {
-          "ID": "2427",
+          "ID": "3419",
           "typeID": "Arrow",
           "zOrder": "47",
           "w": "115",
           "h": "81",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "863",
-          "y": "1344",
+          "x": "873",
+          "y": "1354",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1568,15 +1568,15 @@
           }
         },
         {
-          "ID": "2428",
+          "ID": "3420",
           "typeID": "Arrow",
           "zOrder": "48",
           "w": "97",
           "h": "40",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "859",
-          "y": "1335",
+          "x": "869",
+          "y": "1345",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1598,15 +1598,15 @@
           }
         },
         {
-          "ID": "2429",
+          "ID": "3421",
           "typeID": "Arrow",
           "zOrder": "49",
           "w": "107",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "846",
-          "y": "1321",
+          "x": "856",
+          "y": "1331",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1628,15 +1628,15 @@
           }
         },
         {
-          "ID": "2430",
+          "ID": "3422",
           "typeID": "Arrow",
           "zOrder": "50",
           "w": "140",
           "h": "251",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1202",
-          "y": "1058",
+          "x": "1212",
+          "y": "1068",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -1658,15 +1658,15 @@
           }
         },
         {
-          "ID": "2431",
+          "ID": "3423",
           "typeID": "Arrow",
           "zOrder": "51",
           "w": "1",
           "h": "99",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "909",
-          "y": "954",
+          "x": "919",
+          "y": "964",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -1688,15 +1688,15 @@
           }
         },
         {
-          "ID": "2432",
+          "ID": "3424",
           "typeID": "Arrow",
           "zOrder": "52",
           "w": "257",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "909",
-          "y": "952",
+          "x": "919",
+          "y": "962",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1717,15 +1717,15 @@
           }
         },
         {
-          "ID": "2433",
+          "ID": "3425",
           "typeID": "Arrow",
           "zOrder": "53",
           "w": "189",
           "h": "129",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1329",
-          "y": "971",
+          "x": "1339",
+          "y": "981",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1747,15 +1747,15 @@
           }
         },
         {
-          "ID": "2434",
+          "ID": "3426",
           "typeID": "Arrow",
           "zOrder": "54",
           "w": "173",
           "h": "89",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1344",
-          "y": "965",
+          "x": "1354",
+          "y": "975",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1777,15 +1777,15 @@
           }
         },
         {
-          "ID": "2435",
+          "ID": "3427",
           "typeID": "Arrow",
           "zOrder": "55",
           "w": "60",
           "h": "30",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1444",
-          "y": "1445",
+          "x": "1454",
+          "y": "1455",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1807,15 +1807,15 @@
           }
         },
         {
-          "ID": "2436",
+          "ID": "3428",
           "typeID": "Arrow",
           "zOrder": "56",
           "w": "61",
           "h": "24",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1448",
-          "y": "1409",
+          "x": "1458",
+          "y": "1419",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1837,15 +1837,15 @@
           }
         },
         {
-          "ID": "2437",
+          "ID": "3429",
           "typeID": "Arrow",
           "zOrder": "57",
           "w": "1",
           "h": "76",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1751",
-          "y": "2482",
+          "x": "1761",
+          "y": "2492",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -1867,15 +1867,15 @@
           }
         },
         {
-          "ID": "2438",
+          "ID": "3430",
           "typeID": "Arrow",
           "zOrder": "58",
           "w": "1",
           "h": "83",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1328",
-          "y": "1054",
+          "x": "1338",
+          "y": "1064",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -1897,15 +1897,15 @@
           }
         },
         {
-          "ID": "2439",
+          "ID": "3431",
           "typeID": "Arrow",
           "zOrder": "59",
           "w": "189",
           "h": "26",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1336",
-          "y": "948",
+          "x": "1346",
+          "y": "958",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1927,15 +1927,15 @@
           }
         },
         {
-          "ID": "2440",
+          "ID": "3432",
           "typeID": "Arrow",
           "zOrder": "60",
           "w": "166",
           "h": "56",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1351",
-          "y": "872",
+          "x": "1361",
+          "y": "882",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1957,15 +1957,15 @@
           }
         },
         {
-          "ID": "2441",
+          "ID": "3433",
           "typeID": "Arrow",
           "zOrder": "61",
           "w": "167",
           "h": "21",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1349",
-          "y": "918",
+          "x": "1359",
+          "y": "928",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -1987,15 +1987,15 @@
           }
         },
         {
-          "ID": "2442",
+          "ID": "3434",
           "typeID": "Arrow",
           "zOrder": "62",
           "w": "174",
           "h": "99",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1519",
-          "y": "1206",
+          "x": "1529",
+          "y": "1216",
           "properties": {
             "curvature": "0",
             "rightArrow": "false",
@@ -2017,15 +2017,15 @@
           }
         },
         {
-          "ID": "2443",
+          "ID": "3435",
           "typeID": "Arrow",
           "zOrder": "63",
           "w": "177",
           "h": "54",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1516",
-          "y": "1263",
+          "x": "1526",
+          "y": "1273",
           "properties": {
             "curvature": "0",
             "rightArrow": "false",
@@ -2047,15 +2047,15 @@
           }
         },
         {
-          "ID": "2444",
+          "ID": "3436",
           "typeID": "Arrow",
           "zOrder": "64",
           "w": "189",
           "h": "5",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1520",
-          "y": "1323",
+          "x": "1530",
+          "y": "1333",
           "properties": {
             "curvature": "0",
             "rightArrow": "false",
@@ -2077,15 +2077,15 @@
           }
         },
         {
-          "ID": "2445",
+          "ID": "3437",
           "typeID": "Arrow",
           "zOrder": "65",
           "w": "236",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "923",
-          "y": "1047",
+          "x": "933",
+          "y": "1057",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -2106,15 +2106,15 @@
           }
         },
         {
-          "ID": "2446",
+          "ID": "3438",
           "typeID": "Arrow",
           "zOrder": "66",
           "w": "1",
           "h": "90",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "910",
-          "y": "1052",
+          "x": "920",
+          "y": "1062",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -2136,15 +2136,15 @@
           }
         },
         {
-          "ID": "2447",
+          "ID": "3439",
           "typeID": "Arrow",
           "zOrder": "67",
           "w": "1",
           "h": "172",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "746",
-          "y": "969",
+          "x": "756",
+          "y": "979",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -2166,15 +2166,15 @@
           }
         },
         {
-          "ID": "2448",
+          "ID": "3440",
           "typeID": "Arrow",
           "zOrder": "68",
           "w": "1",
           "h": "113",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1299",
-          "y": "3757",
+          "x": "1309",
+          "y": "3767",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -2196,15 +2196,15 @@
           }
         },
         {
-          "ID": "2449",
+          "ID": "3441",
           "typeID": "__group__",
           "zOrder": "69",
           "measuredW": "200",
           "measuredH": "50",
           "w": "200",
           "h": "50",
-          "x": "1005",
-          "y": "2463",
+          "x": "1015",
+          "y": "2473",
           "properties": {
             "controlName": "115-architectural-patterns"
           },
@@ -2242,15 +2242,15 @@
           }
         },
         {
-          "ID": "2450",
+          "ID": "3442",
           "typeID": "__group__",
           "zOrder": "70",
           "measuredW": "209",
           "measuredH": "40",
           "w": "209",
           "h": "40",
-          "x": "1005",
-          "y": "2546",
+          "x": "1015",
+          "y": "2556",
           "properties": {
             "controlName": "100-architectural-patterns:monolithic-apps"
           },
@@ -2322,15 +2322,15 @@
           }
         },
         {
-          "ID": "2451",
+          "ID": "3443",
           "typeID": "__group__",
           "zOrder": "71",
           "measuredW": "209",
           "measuredH": "37",
           "w": "209",
           "h": "37",
-          "x": "1005",
-          "y": "2588",
+          "x": "1015",
+          "y": "2598",
           "properties": {
             "controlName": "101-architectural-patterns:microservices"
           },
@@ -2402,15 +2402,15 @@
           }
         },
         {
-          "ID": "2452",
+          "ID": "3444",
           "typeID": "__group__",
           "zOrder": "72",
           "measuredW": "209",
           "measuredH": "37",
           "w": "209",
           "h": "37",
-          "x": "1005",
-          "y": "2628",
+          "x": "1015",
+          "y": "2638",
           "properties": {
             "controlName": "102-architectural-patterns:soa"
           },
@@ -2482,15 +2482,15 @@
           }
         },
         {
-          "ID": "2453",
+          "ID": "3445",
           "typeID": "__group__",
           "zOrder": "73",
           "measuredW": "182",
           "measuredH": "50",
           "w": "182",
           "h": "50",
-          "x": "1284",
-          "y": "2463",
+          "x": "1294",
+          "y": "2473",
           "properties": {
             "controlName": "117-message-brokers"
           },
@@ -2530,15 +2530,15 @@
           }
         },
         {
-          "ID": "2454",
+          "ID": "3446",
           "typeID": "__group__",
           "zOrder": "74",
           "measuredW": "305",
           "measuredH": "50",
           "w": "305",
           "h": "50",
-          "x": "1516",
-          "y": "2465",
+          "x": "1526",
+          "y": "2475",
           "properties": {
             "controlName": "118-containerization"
           },
@@ -2577,15 +2577,15 @@
           }
         },
         {
-          "ID": "2455",
+          "ID": "3447",
           "typeID": "__group__",
           "zOrder": "75",
           "measuredW": "197",
           "measuredH": "50",
           "w": "197",
           "h": "50",
-          "x": "678",
-          "y": "2786",
+          "x": "688",
+          "y": "2796",
           "properties": {
             "controlName": "122-web-servers"
           },
@@ -2624,15 +2624,15 @@
           }
         },
         {
-          "ID": "2456",
+          "ID": "3448",
           "typeID": "__group__",
           "zOrder": "76",
           "measuredW": "153",
           "measuredH": "40",
           "w": "153",
           "h": "40",
-          "x": "671",
-          "y": "2572",
+          "x": "681",
+          "y": "2582",
           "properties": {
             "controlName": "100-web-servers:nginx"
           },
@@ -2704,15 +2704,15 @@
           }
         },
         {
-          "ID": "2457",
+          "ID": "3449",
           "typeID": "__group__",
           "zOrder": "77",
           "measuredW": "153",
           "measuredH": "40",
           "w": "153",
           "h": "40",
-          "x": "671",
-          "y": "2617",
+          "x": "681",
+          "y": "2627",
           "properties": {
             "controlName": "101-web-servers:apache"
           },
@@ -2800,15 +2800,15 @@
           }
         },
         {
-          "ID": "2458",
+          "ID": "3450",
           "typeID": "__group__",
           "zOrder": "78",
           "measuredW": "153",
           "measuredH": "40",
           "w": "153",
           "h": "40",
-          "x": "671",
-          "y": "2663",
+          "x": "681",
+          "y": "2673",
           "properties": {
             "controlName": "102-web-servers:caddy"
           },
@@ -2896,15 +2896,15 @@
           }
         },
         {
-          "ID": "2459",
+          "ID": "3451",
           "typeID": "__group__",
           "zOrder": "79",
           "measuredW": "152",
           "measuredH": "40",
           "w": "152",
           "h": "40",
-          "x": "671",
-          "y": "2708",
+          "x": "681",
+          "y": "2718",
           "properties": {
             "controlName": "103-web-servers:ms-iis"
           },
@@ -2992,15 +2992,15 @@
           }
         },
         {
-          "ID": "2460",
+          "ID": "3452",
           "typeID": "__group__",
           "zOrder": "80",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "1671",
-          "y": "2588",
+          "x": "1681",
+          "y": "2598",
           "properties": {
             "controlName": "ext_link:roadmap.sh/docker"
           },
@@ -3042,15 +3042,15 @@
           }
         },
         {
-          "ID": "2461",
+          "ID": "3453",
           "typeID": "__group__",
           "zOrder": "81",
           "measuredW": "154",
           "measuredH": "40",
           "w": "154",
           "h": "40",
-          "x": "1672",
-          "y": "2544",
+          "x": "1682",
+          "y": "2554",
           "properties": {
             "controlName": "102-containerization:lxc"
           },
@@ -3124,15 +3124,15 @@
           }
         },
         {
-          "ID": "2462",
+          "ID": "3454",
           "typeID": "__group__",
           "zOrder": "82",
           "measuredW": "141",
           "measuredH": "50",
           "w": "141",
           "h": "50",
-          "x": "976",
-          "y": "2927",
+          "x": "986",
+          "y": "2937",
           "properties": {
             "controlName": "ext_link:roadmap.sh/graphql"
           },
@@ -3173,15 +3173,15 @@
           }
         },
         {
-          "ID": "2463",
+          "ID": "3455",
           "typeID": "__group__",
           "zOrder": "83",
           "measuredW": "155",
           "measuredH": "40",
           "w": "155",
           "h": "40",
-          "x": "975",
-          "y": "3025",
+          "x": "985",
+          "y": "3035",
           "properties": {
             "controlName": "100-graphql:apollo"
           },
@@ -3253,15 +3253,15 @@
           }
         },
         {
-          "ID": "2464",
+          "ID": "3456",
           "typeID": "__group__",
           "zOrder": "84",
           "measuredW": "153",
           "measuredH": "40",
           "w": "153",
           "h": "40",
-          "x": "975",
-          "y": "3069",
+          "x": "985",
+          "y": "3079",
           "properties": {
             "controlName": "101-graphql:relay-modern"
           },
@@ -3349,15 +3349,15 @@
           }
         },
         {
-          "ID": "2465",
+          "ID": "3457",
           "typeID": "__group__",
           "zOrder": "85",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1692",
+          "x": "985",
+          "y": "1702",
           "properties": {
             "controlName": "104-apis:authentication:jwt"
           },
@@ -3428,15 +3428,15 @@
           }
         },
         {
-          "ID": "2466",
+          "ID": "3458",
           "typeID": "__group__",
           "zOrder": "86",
           "measuredW": "130",
           "measuredH": "50",
           "w": "130",
           "h": "50",
-          "x": "1332",
-          "y": "1552",
+          "x": "1342",
+          "y": "1562",
           "properties": {
             "controlName": "110-caching"
           },
@@ -3475,15 +3475,15 @@
           }
         },
         {
-          "ID": "2467",
+          "ID": "3459",
           "typeID": "__group__",
           "zOrder": "87",
           "measuredW": "154",
           "measuredH": "40",
           "w": "154",
           "h": "40",
-          "x": "1502",
-          "y": "1400",
+          "x": "1512",
+          "y": "1410",
           "properties": {
             "controlName": "100-caching:server-side:redis"
           },
@@ -3555,15 +3555,15 @@
           }
         },
         {
-          "ID": "2468",
+          "ID": "3460",
           "typeID": "__group__",
           "zOrder": "88",
           "measuredW": "155",
           "measuredH": "40",
           "w": "155",
           "h": "40",
-          "x": "1502",
-          "y": "1445",
+          "x": "1512",
+          "y": "1455",
           "properties": {
             "controlName": "101-caching:server-side:memcached"
           },
@@ -3651,15 +3651,15 @@
           }
         },
         {
-          "ID": "2469",
+          "ID": "3461",
           "typeID": "__group__",
           "zOrder": "89",
           "measuredW": "129",
           "measuredH": "40",
           "w": "129",
           "h": "40",
-          "x": "1332",
-          "y": "1421",
+          "x": "1342",
+          "y": "1431",
           "properties": {
             "controlName": "101-caching:server-side"
           },
@@ -3699,15 +3699,15 @@
           }
         },
         {
-          "ID": "2470",
+          "ID": "3462",
           "typeID": "__group__",
           "zOrder": "90",
           "measuredW": "140",
           "measuredH": "40",
           "w": "140",
           "h": "40",
-          "x": "1333",
-          "y": "1464",
+          "x": "1343",
+          "y": "1474",
           "properties": {
             "controlName": "102-caching:client-side"
           },
@@ -3779,15 +3779,15 @@
           }
         },
         {
-          "ID": "2471",
+          "ID": "3463",
           "typeID": "__group__",
           "zOrder": "91",
           "measuredW": "139",
           "measuredH": "37",
           "w": "139",
           "h": "37",
-          "x": "1332",
-          "y": "1381",
+          "x": "1342",
+          "y": "1391",
           "properties": {
             "controlName": "100-caching:cdn"
           },
@@ -3859,15 +3859,15 @@
           }
         },
         {
-          "ID": "2472",
+          "ID": "3464",
           "typeID": "__group__",
           "zOrder": "92",
           "measuredW": "229",
           "measuredH": "50",
           "w": "229",
           "h": "50",
-          "x": "941",
-          "y": "1301",
+          "x": "951",
+          "y": "1311",
           "properties": {
             "controlName": "106-relational-databases"
           },
@@ -3906,15 +3906,15 @@
           }
         },
         {
-          "ID": "2473",
+          "ID": "3465",
           "typeID": "__group__",
           "zOrder": "93",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "668",
-          "y": "1305",
+          "x": "678",
+          "y": "1315",
           "properties": {
             "controlName": "100-relational-databases:postgresql"
           },
@@ -4002,15 +4002,15 @@
           }
         },
         {
-          "ID": "2474",
+          "ID": "3466",
           "typeID": "__group__",
           "zOrder": "94",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "668",
-          "y": "1350",
+          "x": "678",
+          "y": "1360",
           "properties": {
             "controlName": "101-relational-databases:mysql"
           },
@@ -4098,15 +4098,15 @@
           }
         },
         {
-          "ID": "2475",
+          "ID": "3467",
           "typeID": "__group__",
           "zOrder": "95",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "668",
-          "y": "1395",
+          "x": "678",
+          "y": "1405",
           "properties": {
             "controlName": "102-relational-databases:mariadb"
           },
@@ -4193,15 +4193,15 @@
           }
         },
         {
-          "ID": "2476",
+          "ID": "3468",
           "typeID": "__group__",
           "zOrder": "96",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "668",
-          "y": "1440",
+          "x": "678",
+          "y": "1450",
           "properties": {
             "controlName": "103-relational-databases:mssql"
           },
@@ -4289,15 +4289,15 @@
           }
         },
         {
-          "ID": "2477",
+          "ID": "3469",
           "typeID": "__group__",
           "zOrder": "97",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "668",
-          "y": "1486",
+          "x": "678",
+          "y": "1496",
           "properties": {
             "controlName": "104-relational-databases:oracle"
           },
@@ -4385,15 +4385,15 @@
           }
         },
         {
-          "ID": "2478",
+          "ID": "3470",
           "typeID": "__group__",
           "zOrder": "98",
           "measuredW": "214",
           "measuredH": "50",
           "w": "214",
           "h": "50",
-          "x": "1188",
-          "y": "2924",
+          "x": "1198",
+          "y": "2934",
           "properties": {
             "controlName": "107-nosql-databases"
           },
@@ -4432,15 +4432,15 @@
           }
         },
         {
-          "ID": "2479",
+          "ID": "3471",
           "typeID": "__group__",
           "zOrder": "99",
           "measuredW": "213",
           "measuredH": "40",
           "w": "213",
           "h": "40",
-          "x": "674",
-          "y": "2262",
+          "x": "684",
+          "y": "2272",
           "properties": {
             "controlName": "101-more-about-databases:acid"
           },
@@ -4512,15 +4512,15 @@
           }
         },
         {
-          "ID": "2480",
+          "ID": "3472",
           "typeID": "__group__",
           "zOrder": "100",
           "measuredW": "211",
           "measuredH": "50",
           "w": "211",
           "h": "50",
-          "x": "679",
-          "y": "2130",
+          "x": "689",
+          "y": "2140",
           "properties": {
             "controlName": "108-more-about-databases"
           },
@@ -4559,15 +4559,15 @@
           }
         },
         {
-          "ID": "2481",
+          "ID": "3473",
           "typeID": "__group__",
           "zOrder": "101",
           "measuredW": "213",
           "measuredH": "40",
           "w": "213",
           "h": "40",
-          "x": "674",
-          "y": "2306",
+          "x": "684",
+          "y": "2316",
           "properties": {
             "controlName": "102-more-about-databases:transactions"
           },
@@ -4639,15 +4639,15 @@
           }
         },
         {
-          "ID": "2482",
+          "ID": "3474",
           "typeID": "__group__",
           "zOrder": "102",
           "measuredW": "213",
           "measuredH": "40",
           "w": "213",
           "h": "40",
-          "x": "674",
-          "y": "2350",
+          "x": "684",
+          "y": "2360",
           "properties": {
             "controlName": "103-more-about-databases:n-plus-one-problem"
           },
@@ -4718,15 +4718,15 @@
           }
         },
         {
-          "ID": "2483",
+          "ID": "3475",
           "typeID": "__group__",
           "zOrder": "103",
           "measuredW": "215",
           "measuredH": "40",
           "w": "215",
           "h": "40",
-          "x": "672",
-          "y": "2394",
+          "x": "682",
+          "y": "2404",
           "properties": {
             "controlName": "104-more-about-databases:database-normalization"
           },
@@ -4797,15 +4797,15 @@
           }
         },
         {
-          "ID": "2484",
+          "ID": "3476",
           "typeID": "__group__",
           "zOrder": "104",
           "measuredW": "218",
           "measuredH": "40",
           "w": "218",
           "h": "40",
-          "x": "670",
-          "y": "1810",
+          "x": "680",
+          "y": "1820",
           "properties": {
             "controlName": "100-scaling-databases:database-indexes"
           },
@@ -4876,15 +4876,15 @@
           }
         },
         {
-          "ID": "2485",
+          "ID": "3477",
           "typeID": "__group__",
           "zOrder": "105",
           "measuredW": "212",
           "measuredH": "50",
           "w": "212",
           "h": "50",
-          "x": "945",
-          "y": "1554",
+          "x": "955",
+          "y": "1564",
           "properties": {
             "controlName": "109-apis"
           },
@@ -4923,15 +4923,15 @@
           }
         },
         {
-          "ID": "2486",
+          "ID": "3478",
           "typeID": "__group__",
           "zOrder": "106",
           "measuredW": "157",
           "measuredH": "40",
           "w": "157",
           "h": "40",
-          "x": "668",
-          "y": "1562",
+          "x": "678",
+          "y": "1572",
           "properties": {
             "controlName": "100-apis:rest"
           },
@@ -5003,15 +5003,15 @@
           }
         },
         {
-          "ID": "2487",
+          "ID": "3479",
           "typeID": "__group__",
           "zOrder": "107",
           "measuredW": "157",
           "measuredH": "40",
           "w": "157",
           "h": "40",
-          "x": "668",
-          "y": "1607",
+          "x": "678",
+          "y": "1617",
           "properties": {
             "controlName": "101-apis:json-apis"
           },
@@ -5083,15 +5083,15 @@
           }
         },
         {
-          "ID": "2488",
+          "ID": "3480",
           "typeID": "__group__",
           "zOrder": "108",
           "measuredW": "155",
           "measuredH": "40",
           "w": "155",
           "h": "40",
-          "x": "670",
-          "y": "1652",
+          "x": "680",
+          "y": "1662",
           "properties": {
             "controlName": "102-apis:soap"
           },
@@ -5163,15 +5163,15 @@
           }
         },
         {
-          "ID": "2489",
+          "ID": "3481",
           "typeID": "__group__",
           "zOrder": "109",
           "measuredW": "201",
           "measuredH": "40",
           "w": "201",
           "h": "40",
-          "x": "1082",
-          "y": "1412",
+          "x": "1092",
+          "y": "1422",
           "properties": {
             "controlName": "104-apis:hateoas"
           },
@@ -5243,15 +5243,15 @@
           }
         },
         {
-          "ID": "2490",
+          "ID": "3482",
           "typeID": "__group__",
           "zOrder": "110",
           "measuredW": "201",
           "measuredH": "40",
           "w": "201",
           "h": "40",
-          "x": "1082",
-          "y": "1448",
+          "x": "1092",
+          "y": "1458",
           "properties": {
             "controlName": "105-apis:open-api-spec"
           },
@@ -5322,15 +5322,15 @@
           }
         },
         {
-          "ID": "2491",
+          "ID": "3483",
           "typeID": "__group__",
           "zOrder": "111",
           "measuredW": "170",
           "measuredH": "50",
           "w": "170",
           "h": "50",
-          "x": "985",
-          "y": "1645",
+          "x": "995",
+          "y": "1655",
           "properties": {
             "controlName": "106-apis:authentication"
           },
@@ -5367,15 +5367,15 @@
           }
         },
         {
-          "ID": "2492",
+          "ID": "3484",
           "typeID": "__group__",
           "zOrder": "112",
           "measuredW": "240",
           "measuredH": "54",
           "w": "240",
           "h": "54",
-          "x": "1581",
-          "y": "1762",
+          "x": "1591",
+          "y": "1772",
           "properties": {
             "controlName": "111-web-security-knowledge"
           },
@@ -5414,26 +5414,26 @@
           }
         },
         {
-          "ID": "2493",
+          "ID": "3485",
           "typeID": "TextArea",
           "zOrder": "113",
           "w": "270",
           "h": "192",
           "measuredW": "200",
           "measuredH": "140",
-          "x": "1552",
-          "y": "1526"
+          "x": "1562",
+          "y": "1536"
         },
         {
-          "ID": "2494",
+          "ID": "3486",
           "typeID": "__group__",
           "zOrder": "114",
           "measuredW": "239",
           "measuredH": "40",
           "w": "239",
           "h": "40",
-          "x": "1567",
-          "y": "1541",
+          "x": "1577",
+          "y": "1551",
           "properties": {
             "controlName": "100-web-security-knowledge:md5"
           },
@@ -5473,15 +5473,15 @@
           }
         },
         {
-          "ID": "2495",
+          "ID": "3487",
           "typeID": "__group__",
           "zOrder": "115",
           "measuredW": "237",
           "measuredH": "40",
           "w": "237",
           "h": "40",
-          "x": "1568",
-          "y": "1586",
+          "x": "1578",
+          "y": "1596",
           "properties": {
             "controlName": "101-web-security-knowledge:sha-family"
           },
@@ -5521,15 +5521,15 @@
           }
         },
         {
-          "ID": "2496",
+          "ID": "3488",
           "typeID": "__group__",
           "zOrder": "116",
           "measuredW": "119",
           "measuredH": "40",
           "w": "119",
           "h": "40",
-          "x": "1569",
-          "y": "1632",
+          "x": "1579",
+          "y": "1642",
           "properties": {
             "controlName": "104-web-security-knowledge:scrypt"
           },
@@ -5569,15 +5569,15 @@
           }
         },
         {
-          "ID": "2497",
+          "ID": "3489",
           "typeID": "__group__",
           "zOrder": "117",
           "measuredW": "111",
           "measuredH": "40",
           "w": "111",
           "h": "40",
-          "x": "1695",
-          "y": "1632",
+          "x": "1705",
+          "y": "1642",
           "properties": {
             "controlName": "102-web-security-knowledge:bcrypt"
           },
@@ -5617,42 +5617,42 @@
           }
         },
         {
-          "ID": "2498",
+          "ID": "3490",
           "typeID": "Label",
           "zOrder": "118",
           "w": "155",
           "measuredW": "149",
           "measuredH": "25",
-          "x": "1609",
-          "y": "1680",
+          "x": "1619",
+          "y": "1690",
           "properties": {
             "size": "17",
             "text": "Hashing Algorithms"
           }
         },
         {
-          "ID": "2499",
+          "ID": "3491",
           "typeID": "Label",
           "zOrder": "119",
           "measuredW": "128",
           "measuredH": "40",
-          "x": "1200",
-          "y": "789",
+          "x": "1210",
+          "y": "799",
           "properties": {
             "size": "32",
             "text": "Backend"
           }
         },
         {
-          "ID": "2500",
+          "ID": "3492",
           "typeID": "Arrow",
           "zOrder": "120",
           "w": "1",
           "h": "75",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1251",
-          "y": "702",
+          "x": "1261",
+          "y": "712",
           "properties": {
             "color": "2848996",
             "curvature": "-1",
@@ -5675,15 +5675,15 @@
           }
         },
         {
-          "ID": "2501",
+          "ID": "3493",
           "typeID": "__group__",
           "zOrder": "121",
           "measuredW": "350",
           "measuredH": "141",
           "w": "350",
           "h": "141",
-          "x": "1477",
-          "y": "672",
+          "x": "1487",
+          "y": "682",
           "children": {
             "controls": {
               "control": [
@@ -5835,15 +5835,15 @@
           }
         },
         {
-          "ID": "2502",
+          "ID": "3494",
           "typeID": "__group__",
           "zOrder": "122",
           "measuredW": "408",
           "measuredH": "162",
           "w": "408",
           "h": "162",
-          "x": "665",
-          "y": "662",
+          "x": "675",
+          "y": "672",
           "children": {
             "controls": {
               "control": [
@@ -6044,15 +6044,15 @@
           }
         },
         {
-          "ID": "2503",
+          "ID": "3495",
           "typeID": "__group__",
           "zOrder": "123",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "668",
-          "y": "950",
+          "x": "678",
+          "y": "960",
           "properties": {
             "controlName": "100-learn-a-language:go"
           },
@@ -6140,15 +6140,15 @@
           }
         },
         {
-          "ID": "2504",
+          "ID": "3496",
           "typeID": "__group__",
           "zOrder": "124",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "668",
-          "y": "1108",
+          "x": "678",
+          "y": "1118",
           "properties": {
             "controlName": "102-learn-a-language:java"
           },
@@ -6236,15 +6236,15 @@
           }
         },
         {
-          "ID": "2505",
+          "ID": "3497",
           "typeID": "__group__",
           "zOrder": "125",
           "measuredW": "145",
           "measuredH": "40",
           "w": "145",
           "h": "40",
-          "x": "668",
-          "y": "907",
+          "x": "678",
+          "y": "917",
           "properties": {
             "controlName": "101-learn-a-language:rust"
           },
@@ -6332,15 +6332,15 @@
           }
         },
         {
-          "ID": "2506",
+          "ID": "3498",
           "typeID": "__group__",
           "zOrder": "126",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "668",
-          "y": "1152",
+          "x": "678",
+          "y": "1162",
           "properties": {
             "controlName": "103-learn-a-language:csharp"
           },
@@ -6428,15 +6428,15 @@
           }
         },
         {
-          "ID": "2507",
+          "ID": "3499",
           "typeID": "__group__",
           "zOrder": "127",
           "measuredW": "302",
           "measuredH": "50",
           "w": "302",
           "h": "50",
-          "x": "679",
-          "y": "1026",
+          "x": "689",
+          "y": "1036",
           "properties": {
             "controlName": "103-learn-a-language"
           },
@@ -6475,15 +6475,15 @@
           }
         },
         {
-          "ID": "2508",
+          "ID": "3500",
           "typeID": "__group__",
           "zOrder": "128",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "668",
-          "y": "1196",
+          "x": "678",
+          "y": "1206",
           "properties": {
             "controlName": "103-learn-a-language:php"
           },
@@ -6571,15 +6571,15 @@
           }
         },
         {
-          "ID": "2509",
+          "ID": "3501",
           "typeID": "__group__",
           "zOrder": "129",
           "measuredW": "146",
           "measuredH": "40",
           "w": "146",
           "h": "40",
-          "x": "846",
-          "y": "1110",
+          "x": "856",
+          "y": "1120",
           "properties": {
             "controlName": "105-learn-a-language:javascript"
           },
@@ -6651,15 +6651,15 @@
           }
         },
         {
-          "ID": "2510",
+          "ID": "3502",
           "typeID": "__group__",
           "zOrder": "130",
           "measuredW": "146",
           "measuredH": "40",
           "w": "146",
           "h": "40",
-          "x": "846",
-          "y": "1153",
+          "x": "856",
+          "y": "1163",
           "properties": {
             "controlName": "106-learn-a-language:python"
           },
@@ -6747,15 +6747,15 @@
           }
         },
         {
-          "ID": "2511",
+          "ID": "3503",
           "typeID": "__group__",
           "zOrder": "131",
           "measuredW": "146",
           "measuredH": "40",
           "w": "146",
           "h": "40",
-          "x": "846",
-          "y": "1196",
+          "x": "856",
+          "y": "1206",
           "properties": {
             "controlName": "107-learn-a-language:ruby"
           },
@@ -6843,15 +6843,15 @@
           }
         },
         {
-          "ID": "2512",
+          "ID": "3504",
           "typeID": "Arrow",
           "zOrder": "132",
           "w": "175",
           "h": "48",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1342",
-          "y": "960",
+          "x": "1352",
+          "y": "970",
           "properties": {
             "color": "2848996",
             "curvature": "0",
@@ -6873,15 +6873,15 @@
           }
         },
         {
-          "ID": "2513",
+          "ID": "3505",
           "typeID": "__group__",
           "zOrder": "133",
           "measuredW": "227",
           "measuredH": "50",
           "w": "227",
           "h": "50",
-          "x": "1140",
-          "y": "927",
+          "x": "1150",
+          "y": "937",
           "properties": {
             "controlName": "100-internet"
           },
@@ -6920,15 +6920,15 @@
           }
         },
         {
-          "ID": "2514",
+          "ID": "3506",
           "typeID": "__group__",
           "zOrder": "134",
           "measuredW": "310",
           "measuredH": "44",
           "w": "310",
           "h": "44",
-          "x": "1510",
-          "y": "855",
+          "x": "1520",
+          "y": "865",
           "properties": {
             "controlName": "100-internet:how-does-the-internet-work"
           },
@@ -7000,15 +7000,15 @@
           }
         },
         {
-          "ID": "2515",
+          "ID": "3507",
           "typeID": "__group__",
           "zOrder": "135",
           "measuredW": "310",
           "measuredH": "40",
           "w": "310",
           "h": "40",
-          "x": "1510",
-          "y": "902",
+          "x": "1520",
+          "y": "912",
           "properties": {
             "controlName": "101-internet:what-is-http"
           },
@@ -7080,15 +7080,15 @@
           }
         },
         {
-          "ID": "2516",
+          "ID": "3508",
           "typeID": "__group__",
           "zOrder": "136",
           "measuredW": "310",
           "measuredH": "40",
           "w": "310",
           "h": "40",
-          "x": "1510",
-          "y": "946",
+          "x": "1520",
+          "y": "956",
           "properties": {
             "controlName": "102-internet:browsers-and-how-they-work"
           },
@@ -7160,15 +7160,15 @@
           }
         },
         {
-          "ID": "2517",
+          "ID": "3509",
           "typeID": "__group__",
           "zOrder": "137",
           "measuredW": "311",
           "measuredH": "40",
           "w": "311",
           "h": "40",
-          "x": "1511",
-          "y": "990",
+          "x": "1521",
+          "y": "1000",
           "properties": {
             "controlName": "103-internet:dns-and-how-it-works"
           },
@@ -7240,15 +7240,15 @@
           }
         },
         {
-          "ID": "2518",
+          "ID": "3510",
           "typeID": "__group__",
           "zOrder": "138",
           "measuredW": "312",
           "measuredH": "40",
           "w": "312",
           "h": "40",
-          "x": "1510",
-          "y": "1034",
+          "x": "1520",
+          "y": "1044",
           "properties": {
             "controlName": "104-internet:what-is-domain-name"
           },
@@ -7320,15 +7320,15 @@
           }
         },
         {
-          "ID": "2519",
+          "ID": "3511",
           "typeID": "__group__",
           "zOrder": "139",
           "measuredW": "313",
           "measuredH": "40",
           "w": "313",
           "h": "40",
-          "x": "1511",
-          "y": "1078",
+          "x": "1521",
+          "y": "1088",
           "properties": {
             "controlName": "105-internet:what-is-hosting"
           },
@@ -7400,15 +7400,15 @@
           }
         },
         {
-          "ID": "2520",
+          "ID": "3512",
           "typeID": "__group__",
           "zOrder": "140",
           "measuredW": "82",
           "measuredH": "50",
           "w": "82",
           "h": "50",
-          "x": "1293",
-          "y": "1102",
+          "x": "1303",
+          "y": "1112",
           "properties": {
             "controlName": "100-version-control-systems:git"
           },
@@ -7479,15 +7479,15 @@
           }
         },
         {
-          "ID": "2521",
+          "ID": "3513",
           "typeID": "__group__",
           "zOrder": "141",
           "measuredW": "138",
           "measuredH": "49",
           "w": "138",
           "h": "49",
-          "x": "1684",
-          "y": "1184",
+          "x": "1694",
+          "y": "1194",
           "properties": {
             "controlName": "100-repo-hosting-services:github"
           },
@@ -7558,15 +7558,15 @@
           }
         },
         {
-          "ID": "2522",
+          "ID": "3514",
           "typeID": "__group__",
           "zOrder": "142",
           "measuredW": "227",
           "measuredH": "50",
           "w": "227",
           "h": "50",
-          "x": "1333",
-          "y": "1292",
+          "x": "1343",
+          "y": "1302",
           "properties": {
             "controlName": "105-repo-hosting-services"
           },
@@ -7605,15 +7605,15 @@
           }
         },
         {
-          "ID": "2523",
+          "ID": "3515",
           "typeID": "__group__",
           "zOrder": "143",
           "measuredW": "226",
           "measuredH": "50",
           "w": "226",
           "h": "50",
-          "x": "1139",
-          "y": "1023",
+          "x": "1149",
+          "y": "1033",
           "properties": {
             "controlName": "104-version-control-systems"
           },
@@ -7652,15 +7652,15 @@
           }
         },
         {
-          "ID": "2524",
+          "ID": "3516",
           "typeID": "__group__",
           "zOrder": "144",
           "measuredW": "140",
           "measuredH": "49",
           "w": "140",
           "h": "49",
-          "x": "1684",
-          "y": "1291",
+          "x": "1694",
+          "y": "1301",
           "properties": {
             "controlName": "102-repo-hosting-services:bitbucket"
           },
@@ -7748,15 +7748,15 @@
           }
         },
         {
-          "ID": "2525",
+          "ID": "3517",
           "typeID": "__group__",
           "zOrder": "145",
           "measuredW": "140",
           "measuredH": "49",
           "w": "140",
           "h": "49",
-          "x": "1684",
-          "y": "1237",
+          "x": "1694",
+          "y": "1247",
           "properties": {
             "controlName": "101-repo-hosting-services:gitlab"
           },
@@ -7845,15 +7845,15 @@
           }
         },
         {
-          "ID": "2526",
+          "ID": "3518",
           "typeID": "__group__",
           "zOrder": "146",
           "measuredW": "212",
           "measuredH": "40",
           "w": "212",
           "h": "40",
-          "x": "674",
-          "y": "2218",
+          "x": "684",
+          "y": "2228",
           "properties": {
             "controlName": "100-more-about-databases:orms"
           },
@@ -7925,15 +7925,15 @@
           }
         },
         {
-          "ID": "2527",
+          "ID": "3519",
           "typeID": "__group__",
           "zOrder": "147",
           "measuredW": "169",
           "measuredH": "50",
           "w": "169",
           "h": "50",
-          "x": "984",
-          "y": "2008",
+          "x": "994",
+          "y": "2018",
           "properties": {
             "controlName": "113-ci-cd"
           },
@@ -7973,15 +7973,15 @@
           }
         },
         {
-          "ID": "2528",
+          "ID": "3520",
           "typeID": "__group__",
           "zOrder": "148",
           "measuredW": "271",
           "measuredH": "40",
           "w": "271",
           "h": "40",
-          "x": "1561",
-          "y": "2208",
+          "x": "1571",
+          "y": "2218",
           "properties": {
             "controlName": "100-design-and-development-principles:gof-design-patterns"
           },
@@ -8053,15 +8053,15 @@
           }
         },
         {
-          "ID": "2529",
+          "ID": "3521",
           "typeID": "__group__",
           "zOrder": "149",
           "measuredW": "271",
           "measuredH": "40",
           "w": "271",
           "h": "40",
-          "x": "1561",
-          "y": "2252",
+          "x": "1571",
+          "y": "2262",
           "properties": {
             "controlName": "101-design-and-development-principles:domain-driven-design"
           },
@@ -8133,15 +8133,15 @@
           }
         },
         {
-          "ID": "2530",
+          "ID": "3522",
           "typeID": "__group__",
           "zOrder": "150",
           "measuredW": "271",
           "measuredH": "40",
           "w": "271",
           "h": "40",
-          "x": "1561",
-          "y": "2296",
+          "x": "1571",
+          "y": "2306",
           "properties": {
             "controlName": "102-design-and-development-principles:test-driven-development"
           },
@@ -8213,15 +8213,15 @@
           }
         },
         {
-          "ID": "2531",
+          "ID": "3523",
           "typeID": "__group__",
           "zOrder": "151",
           "measuredW": "210",
           "measuredH": "37",
           "w": "210",
           "h": "37",
-          "x": "1005",
-          "y": "2668",
+          "x": "1015",
+          "y": "2678",
           "properties": {
             "controlName": "104-architectural-patterns:serverless"
           },
@@ -8293,15 +8293,15 @@
           }
         },
         {
-          "ID": "2532",
+          "ID": "3524",
           "typeID": "__group__",
           "zOrder": "152",
           "measuredW": "155",
           "measuredH": "40",
           "w": "155",
           "h": "40",
-          "x": "670",
-          "y": "1697",
+          "x": "680",
+          "y": "1707",
           "properties": {
             "controlName": "103-apis:grpc"
           },
@@ -8374,15 +8374,15 @@
           }
         },
         {
-          "ID": "2533",
+          "ID": "3525",
           "typeID": "__group__",
           "zOrder": "153",
           "measuredW": "323",
           "measuredH": "50",
           "w": "323",
           "h": "50",
-          "x": "1005",
-          "y": "2264",
+          "x": "1015",
+          "y": "2274",
           "properties": {
             "controlName": "ext_link:roadmap.sh/software-design-architecture"
           },
@@ -8424,15 +8424,15 @@
           }
         },
         {
-          "ID": "2534",
+          "ID": "3526",
           "typeID": "__group__",
           "zOrder": "154",
           "measuredW": "174",
           "measuredH": "154",
           "w": "174",
           "h": "154",
-          "x": "1475",
-          "y": "2923",
+          "x": "1485",
+          "y": "2933",
           "properties": {
             "controlName": "100-nosql-databases:document-databases"
           },
@@ -8636,15 +8636,15 @@
           }
         },
         {
-          "ID": "2535",
+          "ID": "3527",
           "typeID": "__group__",
           "zOrder": "155",
           "measuredW": "168",
           "measuredH": "154",
           "w": "168",
           "h": "154",
-          "x": "1646",
-          "y": "2923",
+          "x": "1656",
+          "y": "2933",
           "properties": {
             "controlName": "102-nosql-databases:timeseries-databases"
           },
@@ -8848,15 +8848,15 @@
           }
         },
         {
-          "ID": "2536",
+          "ID": "3528",
           "typeID": "__group__",
           "zOrder": "156",
           "measuredW": "174",
           "measuredH": "154",
           "w": "174",
           "h": "154",
-          "x": "1475",
-          "y": "3072",
+          "x": "1485",
+          "y": "3082",
           "properties": {
             "controlName": "103-nosql-databases:realtime-databases"
           },
@@ -9060,15 +9060,15 @@
           }
         },
         {
-          "ID": "2537",
+          "ID": "3529",
           "typeID": "__group__",
           "zOrder": "157",
           "measuredW": "168",
           "measuredH": "154",
           "w": "168",
           "h": "154",
-          "x": "1646",
-          "y": "3072",
+          "x": "1656",
+          "y": "3082",
           "properties": {
             "controlName": "101-nosql-databases:column-databases"
           },
@@ -9272,15 +9272,15 @@
           }
         },
         {
-          "ID": "2538",
+          "ID": "3530",
           "typeID": "__group__",
           "zOrder": "158",
           "measuredW": "174",
           "measuredH": "154",
           "w": "174",
           "h": "154",
-          "x": "1475",
-          "y": "3222",
+          "x": "1485",
+          "y": "3232",
           "properties": {
             "controlName": "104-nosql-databases:key-value-databases"
           },
@@ -9484,15 +9484,15 @@
           }
         },
         {
-          "ID": "2539",
+          "ID": "3531",
           "typeID": "__group__",
           "zOrder": "159",
           "measuredW": "24",
           "measuredH": "24",
           "w": "24",
           "h": "24",
-          "x": "1802",
-          "y": "3036",
+          "x": "1812",
+          "y": "3046",
           "children": {
             "controls": {
               "control": [
@@ -9533,15 +9533,15 @@
           }
         },
         {
-          "ID": "2540",
+          "ID": "3532",
           "typeID": "__group__",
           "zOrder": "160",
           "measuredW": "24",
           "measuredH": "24",
           "w": "24",
           "h": "24",
-          "x": "1802",
-          "y": "3185",
+          "x": "1812",
+          "y": "3195",
           "children": {
             "controls": {
               "control": [
@@ -9582,15 +9582,15 @@
           }
         },
         {
-          "ID": "2541",
+          "ID": "3533",
           "typeID": "__group__",
           "zOrder": "161",
           "measuredW": "24",
           "measuredH": "24",
           "w": "24",
           "h": "24",
-          "x": "1466",
-          "y": "3185",
+          "x": "1476",
+          "y": "3195",
           "children": {
             "controls": {
               "control": [
@@ -9631,15 +9631,15 @@
           }
         },
         {
-          "ID": "2542",
+          "ID": "3534",
           "typeID": "__group__",
           "zOrder": "162",
           "measuredW": "24",
           "measuredH": "24",
           "w": "24",
           "h": "24",
-          "x": "1490",
-          "y": "2910",
+          "x": "1500",
+          "y": "2920",
           "children": {
             "controls": {
               "control": [
@@ -9680,15 +9680,15 @@
           }
         },
         {
-          "ID": "2543",
+          "ID": "3535",
           "typeID": "__group__",
           "zOrder": "163",
           "measuredW": "24",
           "measuredH": "24",
           "w": "24",
           "h": "24",
-          "x": "1466",
-          "y": "2910",
+          "x": "1476",
+          "y": "2920",
           "children": {
             "controls": {
               "control": [
@@ -9729,15 +9729,15 @@
           }
         },
         {
-          "ID": "2544",
+          "ID": "3536",
           "typeID": "__group__",
           "zOrder": "164",
           "measuredW": "211",
           "measuredH": "50",
           "w": "211",
           "h": "50",
-          "x": "679",
-          "y": "2008",
+          "x": "689",
+          "y": "2018",
           "properties": {
             "controlName": "109-scaling-databases"
           },
@@ -9776,15 +9776,15 @@
           }
         },
         {
-          "ID": "2545",
+          "ID": "3537",
           "typeID": "__group__",
           "zOrder": "165",
           "measuredW": "153",
           "measuredH": "40",
           "w": "153",
           "h": "40",
-          "x": "672",
-          "y": "1742",
+          "x": "682",
+          "y": "1752",
           "properties": {
             "controlName": "106-apis:graphql"
           },
@@ -9856,15 +9856,15 @@
           }
         },
         {
-          "ID": "2546",
+          "ID": "3538",
           "typeID": "__group__",
           "zOrder": "166",
           "measuredW": "144",
           "measuredH": "40",
           "w": "144",
           "h": "40",
-          "x": "1673",
-          "y": "2653",
+          "x": "1683",
+          "y": "2663",
           "properties": {
             "controlName": "ext_link:roadmap.sh/kubernetes"
           },
@@ -9905,15 +9905,15 @@
           }
         },
         {
-          "ID": "2547",
+          "ID": "3539",
           "typeID": "__group__",
           "zOrder": "167",
           "measuredW": "169",
           "measuredH": "102",
           "w": "169",
           "h": "102",
-          "x": "1646",
-          "y": "3222",
+          "x": "1656",
+          "y": "3232",
           "properties": {
             "controlName": "120-graph-databases"
           },
@@ -10041,26 +10041,26 @@
           }
         },
         {
-          "ID": "2548",
+          "ID": "3540",
           "typeID": "TextArea",
           "zOrder": "168",
           "w": "271",
           "h": "224",
           "measuredW": "200",
           "measuredH": "140",
-          "x": "1551",
-          "y": "1874"
+          "x": "1561",
+          "y": "1884"
         },
         {
-          "ID": "2549",
+          "ID": "3541",
           "typeID": "__group__",
           "zOrder": "169",
           "measuredW": "86",
           "measuredH": "42",
           "w": "86",
           "h": "42",
-          "x": "1567",
-          "y": "1938",
+          "x": "1577",
+          "y": "1948",
           "properties": {
             "controlName": "106-web-security-knowledge:cors"
           },
@@ -10099,15 +10099,15 @@
           }
         },
         {
-          "ID": "2550",
+          "ID": "3542",
           "typeID": "__group__",
           "zOrder": "170",
           "measuredW": "90",
           "measuredH": "43",
           "w": "90",
           "h": "43",
-          "x": "1565",
-          "y": "1888",
+          "x": "1575",
+          "y": "1898",
           "properties": {
             "controlName": "105-web-security-knowledge:https"
           },
@@ -10146,15 +10146,15 @@
           }
         },
         {
-          "ID": "2551",
+          "ID": "3543",
           "typeID": "__group__",
           "zOrder": "171",
           "measuredW": "87",
           "measuredH": "44",
           "w": "87",
           "h": "44",
-          "x": "1568",
-          "y": "1988",
+          "x": "1578",
+          "y": "1998",
           "properties": {
             "controlName": "105-web-security-knowledge:content-security-policy"
           },
@@ -10193,15 +10193,15 @@
           }
         },
         {
-          "ID": "2552",
+          "ID": "3544",
           "typeID": "__group__",
           "zOrder": "172",
           "measuredW": "147",
           "measuredH": "43",
           "w": "147",
           "h": "43",
-          "x": "1660",
-          "y": "1888",
+          "x": "1670",
+          "y": "1898",
           "properties": {
             "controlName": "108-web-security-knowledge:owasp"
           },
@@ -10240,15 +10240,15 @@
           }
         },
         {
-          "ID": "2553",
+          "ID": "3545",
           "typeID": "__group__",
           "zOrder": "173",
           "measuredW": "149",
           "measuredH": "43",
           "w": "149",
           "h": "43",
-          "x": "1659",
-          "y": "1938",
+          "x": "1669",
+          "y": "1948",
           "properties": {
             "controlName": "107-web-security-knowledge:ssl-tls"
           },
@@ -10287,15 +10287,15 @@
           }
         },
         {
-          "ID": "2554",
+          "ID": "3546",
           "typeID": "__group__",
           "zOrder": "174",
           "measuredW": "271",
           "measuredH": "40",
           "w": "271",
           "h": "40",
-          "x": "1561",
-          "y": "2340",
+          "x": "1571",
+          "y": "2350",
           "properties": {
             "controlName": "103-design-and-development-principles:cqrs"
           },
@@ -10366,15 +10366,15 @@
           }
         },
         {
-          "ID": "2555",
+          "ID": "3547",
           "typeID": "__group__",
           "zOrder": "175",
           "measuredW": "270",
           "measuredH": "40",
           "w": "270",
           "h": "40",
-          "x": "1561",
-          "y": "2384",
+          "x": "1571",
+          "y": "2394",
           "properties": {
             "controlName": "104-design-and-development-principles:event-sourcing"
           },
@@ -10445,15 +10445,15 @@
           }
         },
         {
-          "ID": "2556",
+          "ID": "3548",
           "typeID": "__group__",
           "zOrder": "176",
           "measuredW": "211",
           "measuredH": "37",
           "w": "211",
           "h": "37",
-          "x": "1006",
-          "y": "2708",
+          "x": "1016",
+          "y": "2718",
           "properties": {
             "controlName": "105-architectural-patterns:service-mesh"
           },
@@ -10524,15 +10524,15 @@
           }
         },
         {
-          "ID": "2557",
+          "ID": "3549",
           "typeID": "__group__",
           "zOrder": "177",
           "measuredW": "211",
           "measuredH": "37",
           "w": "211",
           "h": "37",
-          "x": "1006",
-          "y": "2748",
+          "x": "1016",
+          "y": "2758",
           "properties": {
             "controlName": "106-architectural-patterns:twelve-factor-apps"
           },
@@ -10603,15 +10603,15 @@
           }
         },
         {
-          "ID": "2558",
+          "ID": "3550",
           "typeID": "__group__",
           "zOrder": "178",
           "measuredW": "198",
           "measuredH": "159",
           "w": "198",
           "h": "159",
-          "x": "1424",
-          "y": "2674",
+          "x": "1434",
+          "y": "2684",
           "properties": {
             "controlName": "116-search-engines"
           },
@@ -10648,15 +10648,15 @@
           }
         },
         {
-          "ID": "2559",
+          "ID": "3551",
           "typeID": "__group__",
           "zOrder": "179",
           "measuredW": "167",
           "measuredH": "40",
           "w": "167",
           "h": "40",
-          "x": "1439",
-          "y": "2691",
+          "x": "1449",
+          "y": "2701",
           "properties": {
             "controlName": "100-search-engines:elasticsearch"
           },
@@ -10728,15 +10728,15 @@
           }
         },
         {
-          "ID": "2560",
+          "ID": "3552",
           "typeID": "__group__",
           "zOrder": "180",
           "measuredW": "167",
           "measuredH": "40",
           "w": "167",
           "h": "40",
-          "x": "1439",
-          "y": "2737",
+          "x": "1449",
+          "y": "2747",
           "properties": {
             "controlName": "101-search-engines:solr"
           },
@@ -10808,15 +10808,15 @@
           }
         },
         {
-          "ID": "2561",
+          "ID": "3553",
           "typeID": "__group__",
           "zOrder": "181",
           "measuredW": "191",
           "measuredH": "40",
           "w": "191",
           "h": "40",
-          "x": "1275",
-          "y": "2540",
+          "x": "1285",
+          "y": "2550",
           "properties": {
             "controlName": "100-message-brokers:rabbitmq"
           },
@@ -10887,15 +10887,15 @@
           }
         },
         {
-          "ID": "2562",
+          "ID": "3554",
           "typeID": "__group__",
           "zOrder": "182",
           "measuredW": "192",
           "measuredH": "40",
           "w": "192",
           "h": "40",
-          "x": "1275",
-          "y": "2584",
+          "x": "1285",
+          "y": "2594",
           "properties": {
             "controlName": "101-message-brokers:kafka"
           },
@@ -10966,15 +10966,15 @@
           }
         },
         {
-          "ID": "2563",
+          "ID": "3555",
           "typeID": "__group__",
           "zOrder": "183",
           "measuredW": "201",
           "measuredH": "50",
           "w": "201",
           "h": "50",
-          "x": "674",
-          "y": "2973",
+          "x": "684",
+          "y": "2983",
           "properties": {
             "controlName": "122-server-sent-events"
           },
@@ -11013,15 +11013,15 @@
           }
         },
         {
-          "ID": "2564",
+          "ID": "3556",
           "typeID": "__group__",
           "zOrder": "184",
           "measuredW": "213",
           "measuredH": "50",
           "w": "213",
           "h": "50",
-          "x": "1188",
-          "y": "3224",
+          "x": "1198",
+          "y": "3234",
           "properties": {
             "controlName": "123-scalability"
           },
@@ -11060,15 +11060,15 @@
           }
         },
         {
-          "ID": "2565",
+          "ID": "3557",
           "typeID": "__group__",
           "zOrder": "185",
           "measuredW": "232",
           "measuredH": "282",
           "w": "232",
           "h": "282",
-          "x": "880",
-          "y": "3212",
+          "x": "890",
+          "y": "3222",
           "properties": {
             "controlName": "100-scalability:mitigation-strategies"
           },
@@ -11136,15 +11136,15 @@
           }
         },
         {
-          "ID": "2566",
+          "ID": "3558",
           "typeID": "__group__",
           "zOrder": "186",
           "measuredW": "197",
           "measuredH": "40",
           "w": "197",
           "h": "40",
-          "x": "892",
-          "y": "3231",
+          "x": "902",
+          "y": "3241",
           "properties": {
             "controlName": "100-scalability:mitigation-strategies:graceful-degradation"
           },
@@ -11183,15 +11183,15 @@
           }
         },
         {
-          "ID": "2567",
+          "ID": "3559",
           "typeID": "__group__",
           "zOrder": "187",
           "measuredW": "197",
           "measuredH": "40",
           "w": "197",
           "h": "40",
-          "x": "892",
-          "y": "3275",
+          "x": "902",
+          "y": "3285",
           "properties": {
             "controlName": "101-scalability:mitigation-strategies:throttling"
           },
@@ -11230,15 +11230,15 @@
           }
         },
         {
-          "ID": "2568",
+          "ID": "3560",
           "typeID": "__group__",
           "zOrder": "188",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "892",
-          "y": "3319",
+          "x": "902",
+          "y": "3329",
           "properties": {
             "controlName": "102-scalability:mitigation-strategies:backpressure"
           },
@@ -11277,15 +11277,15 @@
           }
         },
         {
-          "ID": "2569",
+          "ID": "3561",
           "typeID": "__group__",
           "zOrder": "189",
           "measuredW": "199",
           "measuredH": "40",
           "w": "199",
           "h": "40",
-          "x": "892",
-          "y": "3363",
+          "x": "902",
+          "y": "3373",
           "properties": {
             "controlName": "103-scalability:mitigation-strategies:loadshifting"
           },
@@ -11324,15 +11324,15 @@
           }
         },
         {
-          "ID": "2570",
+          "ID": "3562",
           "typeID": "__group__",
           "zOrder": "190",
           "measuredW": "197",
           "measuredH": "40",
           "w": "197",
           "h": "40",
-          "x": "892",
-          "y": "3407",
+          "x": "902",
+          "y": "3417",
           "properties": {
             "controlName": "104-scalability:mitigation-strategies:circuit-breaker"
           },
@@ -11371,15 +11371,15 @@
           }
         },
         {
-          "ID": "2571",
+          "ID": "3563",
           "typeID": "__group__",
           "zOrder": "191",
           "measuredW": "215",
           "measuredH": "40",
           "w": "215",
           "h": "40",
-          "x": "672",
-          "y": "2438",
+          "x": "682",
+          "y": "2448",
           "properties": {
             "controlName": "105-more-about-databases:failure-modes"
           },
@@ -11450,15 +11450,15 @@
           }
         },
         {
-          "ID": "2572",
+          "ID": "3564",
           "typeID": "__group__",
           "zOrder": "192",
           "measuredW": "215",
           "measuredH": "40",
           "w": "215",
           "h": "40",
-          "x": "672",
-          "y": "2482",
+          "x": "682",
+          "y": "2492",
           "properties": {
             "controlName": "106-more-about-databases:profiling-performance"
           },
@@ -11529,39 +11529,39 @@
           }
         },
         {
-          "ID": "2573",
+          "ID": "3565",
           "typeID": "TextArea",
           "zOrder": "193",
           "w": "337",
           "h": "124",
           "measuredW": "200",
           "measuredH": "140",
-          "x": "1133",
-          "y": "3683"
+          "x": "1143",
+          "y": "3693"
         },
         {
-          "ID": "2574",
+          "ID": "3566",
           "typeID": "Label",
           "zOrder": "194",
           "measuredW": "285",
           "measuredH": "25",
-          "x": "1154",
-          "y": "3703",
+          "x": "1164",
+          "y": "3713",
           "properties": {
             "size": "17",
             "text": "Have a look at the DevOps Roadmap"
           }
         },
         {
-          "ID": "2575",
+          "ID": "3567",
           "typeID": "__group__",
           "zOrder": "195",
           "measuredW": "292",
           "measuredH": "44",
           "w": "292",
           "h": "44",
-          "x": "1154",
-          "y": "3738",
+          "x": "1164",
+          "y": "3748",
           "properties": {
             "controlName": "ext_link:roadmap.sh/devops"
           },
@@ -11600,15 +11600,15 @@
           }
         },
         {
-          "ID": "2576",
+          "ID": "3568",
           "typeID": "__group__",
           "zOrder": "196",
           "measuredW": "148",
           "measuredH": "44",
           "w": "148",
           "h": "44",
-          "x": "1661",
-          "y": "1987",
+          "x": "1671",
+          "y": "1997",
           "properties": {
             "controlName": "106-web-security-knowledge:server-security"
           },
@@ -11647,15 +11647,15 @@
           }
         },
         {
-          "ID": "2577",
+          "ID": "3569",
           "typeID": "__group__",
           "zOrder": "197",
           "measuredW": "242",
           "measuredH": "47",
           "w": "242",
           "h": "47",
-          "x": "1568",
-          "y": "2039",
+          "x": "1578",
+          "y": "2049",
           "properties": {
             "controlName": "ext_link:roadmap.sh/best-practices/api-security"
           },
@@ -11696,15 +11696,15 @@
           }
         },
         {
-          "ID": "2578",
+          "ID": "3570",
           "typeID": "__group__",
           "zOrder": "198",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1729",
+          "x": "985",
+          "y": "1739",
           "properties": {
             "controlName": "102-apis:authentication:basic-authentication"
           },
@@ -11775,15 +11775,15 @@
           }
         },
         {
-          "ID": "2579",
+          "ID": "3571",
           "typeID": "__group__",
           "zOrder": "199",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1766",
+          "x": "985",
+          "y": "1776",
           "properties": {
             "controlName": "103-apis:authentication:token-authentication"
           },
@@ -11854,15 +11854,15 @@
           }
         },
         {
-          "ID": "2580",
+          "ID": "3572",
           "typeID": "__group__",
           "zOrder": "200",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1803",
+          "x": "985",
+          "y": "1813",
           "properties": {
             "controlName": "101-apis:authentication:oauth"
           },
@@ -11933,15 +11933,15 @@
           }
         },
         {
-          "ID": "2581",
+          "ID": "3573",
           "typeID": "__group__",
           "zOrder": "201",
           "measuredW": "178",
           "measuredH": "40",
           "w": "178",
           "h": "40",
-          "x": "976",
-          "y": "1840",
+          "x": "986",
+          "y": "1850",
           "properties": {
             "controlName": "100-apis:authentication:cookie-based"
           },
@@ -12012,15 +12012,15 @@
           }
         },
         {
-          "ID": "2582",
+          "ID": "3574",
           "typeID": "__group__",
           "zOrder": "202",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1877",
+          "x": "985",
+          "y": "1887",
           "properties": {
             "controlName": "105-apis:authentication:openid"
           },
@@ -12091,15 +12091,15 @@
           }
         },
         {
-          "ID": "2583",
+          "ID": "3575",
           "typeID": "__group__",
           "zOrder": "203",
           "measuredW": "179",
           "measuredH": "40",
           "w": "179",
           "h": "40",
-          "x": "975",
-          "y": "1913",
+          "x": "985",
+          "y": "1923",
           "properties": {
             "controlName": "105-apis:authentication:saml"
           },
@@ -12170,15 +12170,15 @@
           }
         },
         {
-          "ID": "2584",
+          "ID": "3576",
           "typeID": "Arrow",
           "zOrder": "204",
           "w": "1",
           "h": "211",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1391",
-          "y": "1801",
+          "x": "1401",
+          "y": "1811",
           "properties": {
             "color": "2848996",
             "direction": "bottom",
@@ -12199,15 +12199,15 @@
           }
         },
         {
-          "ID": "2585",
+          "ID": "3577",
           "typeID": "__group__",
           "zOrder": "205",
           "measuredW": "195",
           "measuredH": "50",
           "w": "195",
           "h": "50",
-          "x": "1293",
-          "y": "2008",
+          "x": "1303",
+          "y": "2018",
           "properties": {
             "controlName": "112-testing"
           },
@@ -12246,15 +12246,15 @@
           }
         },
         {
-          "ID": "2586",
+          "ID": "3578",
           "typeID": "__group__",
           "zOrder": "206",
           "measuredW": "223",
           "measuredH": "40",
           "w": "223",
           "h": "40",
-          "x": "1278",
-          "y": "2093",
+          "x": "1288",
+          "y": "2103",
           "properties": {
             "controlName": "100-testing:integration-testing"
           },
@@ -12326,15 +12326,15 @@
           }
         },
         {
-          "ID": "2587",
+          "ID": "3579",
           "typeID": "__group__",
           "zOrder": "207",
           "measuredW": "224",
           "measuredH": "37",
           "w": "224",
           "h": "37",
-          "x": "1276",
-          "y": "2136",
+          "x": "1286",
+          "y": "2146",
           "properties": {
             "controlName": "101-testing:unit-testing"
           },
@@ -12406,15 +12406,15 @@
           }
         },
         {
-          "ID": "2588",
+          "ID": "3580",
           "typeID": "__group__",
           "zOrder": "208",
           "measuredW": "225",
           "measuredH": "37",
           "w": "225",
           "h": "37",
-          "x": "1276",
-          "y": "2175",
+          "x": "1286",
+          "y": "2185",
           "properties": {
             "controlName": "102-testing:functional-testing"
           },
@@ -12486,15 +12486,15 @@
           }
         },
         {
-          "ID": "2589",
+          "ID": "3581",
           "typeID": "__group__",
           "zOrder": "209",
           "measuredW": "218",
           "measuredH": "40",
           "w": "218",
           "h": "40",
-          "x": "670",
-          "y": "1852",
+          "x": "680",
+          "y": "1862",
           "properties": {
             "controlName": "101-scaling-databases:data-replication"
           },
@@ -12566,15 +12566,15 @@
           }
         },
         {
-          "ID": "2590",
+          "ID": "3582",
           "typeID": "__group__",
           "zOrder": "210",
           "measuredW": "215",
           "measuredH": "40",
           "w": "215",
           "h": "40",
-          "x": "672",
-          "y": "1895",
+          "x": "682",
+          "y": "1905",
           "properties": {
             "controlName": "102-scaling-databases:sharding-strategies"
           },
@@ -12646,15 +12646,15 @@
           }
         },
         {
-          "ID": "2591",
+          "ID": "3583",
           "typeID": "__group__",
           "zOrder": "211",
           "measuredW": "216",
           "measuredH": "40",
           "w": "216",
           "h": "40",
-          "x": "672",
-          "y": "1938",
+          "x": "682",
+          "y": "1948",
           "properties": {
             "controlName": "103-scaling-databases:cap-theorem"
           },
@@ -12726,15 +12726,15 @@
           }
         },
         {
-          "ID": "2592",
+          "ID": "3584",
           "typeID": "__group__",
           "zOrder": "212",
           "measuredW": "200",
           "measuredH": "50",
           "w": "200",
           "h": "50",
-          "x": "674",
-          "y": "3019",
+          "x": "684",
+          "y": "3029",
           "properties": {
             "controlName": "121-web-sockets"
           },
@@ -12772,15 +12772,15 @@
           }
         },
         {
-          "ID": "2593",
+          "ID": "3585",
           "typeID": "__group__",
           "zOrder": "213",
           "measuredW": "200",
           "measuredH": "50",
           "w": "200",
           "h": "50",
-          "x": "674",
-          "y": "3065",
+          "x": "684",
+          "y": "3075",
           "properties": {
             "controlName": "123-long-polling"
           },
@@ -12818,15 +12818,15 @@
           }
         },
         {
-          "ID": "2594",
+          "ID": "3586",
           "typeID": "__group__",
           "zOrder": "214",
           "measuredW": "200",
           "measuredH": "50",
           "w": "200",
           "h": "50",
-          "x": "674",
-          "y": "3111",
+          "x": "684",
+          "y": "3121",
           "properties": {
             "controlName": "124-short-polling"
           },
@@ -12864,15 +12864,15 @@
           }
         },
         {
-          "ID": "2595",
+          "ID": "3587",
           "typeID": "__group__",
           "zOrder": "215",
           "measuredW": "212",
           "measuredH": "41",
           "w": "212",
           "h": "41",
-          "x": "671",
-          "y": "3220",
+          "x": "681",
+          "y": "3230",
           "properties": {
             "controlName": "103-scalability:horizontal-vertical-scaling"
           },
@@ -12911,15 +12911,15 @@
           }
         },
         {
-          "ID": "2596",
+          "ID": "3588",
           "typeID": "__group__",
           "zOrder": "216",
           "measuredW": "432",
           "measuredH": "124",
           "w": "432",
           "h": "124",
-          "x": "670",
-          "y": "3491",
+          "x": "680",
+          "y": "3501",
           "properties": {
             "controlName": "104-scalability:observability"
           },
@@ -12984,15 +12984,15 @@
           }
         },
         {
-          "ID": "2597",
+          "ID": "3589",
           "typeID": "__group__",
           "zOrder": "217",
           "measuredW": "239",
           "measuredH": "50",
           "w": "239",
           "h": "50",
-          "x": "1184",
-          "y": "3447",
+          "x": "1194",
+          "y": "3457",
           "properties": {
             "controlName": "ext_link:roadmap.sh/devops?r=devops-beginner"
           },
@@ -13033,15 +13033,15 @@
           }
         },
         {
-          "ID": "2598",
+          "ID": "3590",
           "typeID": "Arrow",
           "zOrder": "218",
           "w": "3",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1848",
-          "y": "829",
+          "x": "1858",
+          "y": "839",
           "properties": {
             "direction": "bottom",
             "leftArrow": "false",
@@ -13062,15 +13062,15 @@
           }
         },
         {
-          "ID": "2599",
+          "ID": "3591",
           "typeID": "Arrow",
           "zOrder": "219",
           "w": "3",
           "h": "3",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "648",
-          "y": "882",
+          "x": "658",
+          "y": "892",
           "properties": {
             "direction": "bottom",
             "leftArrow": "false",
@@ -13091,15 +13091,15 @@
           }
         },
         {
-          "ID": "2600",
+          "ID": "3592",
           "typeID": "Arrow",
           "zOrder": "220",
           "w": "3",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1369",
-          "y": "643",
+          "x": "1379",
+          "y": "653",
           "properties": {
             "direction": "bottom",
             "leftArrow": "false",
@@ -13120,48 +13120,65 @@
           }
         },
         {
-          "ID": "2601",
+          "ID": "3594",
           "typeID": "__group__",
           "zOrder": "221",
           "measuredW": "410",
           "measuredH": "47",
           "w": "410",
           "h": "47",
-          "x": "665",
-          "y": "831",
-          "properties": {
-            "controlName": "json:backend-beginner.json"
-          },
+          "x": "675",
+          "y": "841",
           "children": {
             "controls": {
               "control": [
                 {
                   "ID": "0",
-                  "typeID": "Canvas",
+                  "typeID": "__group__",
                   "zOrder": "0",
+                  "measuredW": "410",
+                  "measuredH": "47",
                   "w": "410",
                   "h": "47",
-                  "measuredW": "100",
-                  "measuredH": "70",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "3355443",
-                    "borderColor": "3355443"
-                  }
-                },
-                {
-                  "ID": "1",
-                  "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "210",
-                  "measuredH": "26",
-                  "x": "100",
-                  "y": "11",
-                  "properties": {
-                    "color": "16777215",
-                    "size": "18",
-                    "text": "Visit the Beginner Version"
+                    "controlName": "json:backend-beginner.json"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Canvas",
+                          "zOrder": "0",
+                          "w": "410",
+                          "h": "47",
+                          "measuredW": "100",
+                          "measuredH": "70",
+                          "x": "0",
+                          "y": "0",
+                          "properties": {
+                            "color": "3355443",
+                            "borderColor": "3355443"
+                          }
+                        },
+                        {
+                          "ID": "1",
+                          "typeID": "Label",
+                          "zOrder": "1",
+                          "measuredW": "210",
+                          "measuredH": "26",
+                          "x": "100",
+                          "y": "11",
+                          "properties": {
+                            "color": "16777215",
+                            "size": "18",
+                            "text": "Visit the Beginner Version"
+                          }
+                        }
+                      ]
+                    }
                   }
                 }
               ]
@@ -13180,8 +13197,8 @@
     "resourceID": "DAF9FB64-BA77-40D4-BCEF-EEE21C480971",
     "mockupH": "3227",
     "mockupW": "1203",
-    "measuredW": "1851",
-    "measuredH": "3870",
+    "measuredW": "1861",
+    "measuredH": "3880",
     "version": "1.0"
   },
   "groupOffset": {
diff --git a/src/data/roadmaps/mlops/mlops.json b/src/data/roadmaps/mlops/mlops.json
index 6fc0c00e5..ac36c842f 100644
--- a/src/data/roadmaps/mlops/mlops.json
+++ b/src/data/roadmaps/mlops/mlops.json
@@ -3,824 +3,254 @@
     "controls": {
       "control": [
         {
-          "ID": "2199",
-          "typeID": "Label",
-          "zOrder": "30",
-          "measuredW": "104",
-          "measuredH": "40",
-          "x": "1250",
-          "y": "789",
-          "properties": {
-            "size": "32",
-            "text": "MLOps"
-          }
-        },
-        {
-          "ID": "2200",
+          "ID": "3294",
           "typeID": "Arrow",
-          "zOrder": "31",
-          "w": "1",
-          "h": "75",
+          "zOrder": "0",
+          "w": "226",
+          "h": "145",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1301",
-          "y": "702",
+          "x": "1158",
+          "y": "1884",
           "properties": {
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
+            "color": "10027263",
             "stroke": "dotted",
             "p0": {
-              "x": 0.43268541466795796,
-              "y": -0.4292144763719534
+              "x": 226.47706272280266,
+              "y": 145.09752175520043
             },
             "p1": {
-              "x": 0.4673783006670677,
-              "y": -0.0036060514395746665
+              "x": 0.48716510424745796,
+              "y": -0.09050463451557213
             },
             "p2": {
-              "x": 0.08850738176079176,
-              "y": 74.41806720423438
-            },
-            "color": "10027263"
-          }
-        },
-        {
-          "ID": "2201",
-          "typeID": "__group__",
-          "zOrder": "32",
-          "measuredW": "350",
-          "measuredH": "141",
-          "w": "350",
-          "h": "141",
-          "x": "1473",
-          "y": "670",
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Canvas",
-                  "zOrder": "0",
-                  "w": "350",
-                  "h": "141",
-                  "measuredW": "100",
-                  "measuredH": "70",
-                  "x": "0",
-                  "y": "0"
-                },
-                {
-                  "ID": "1",
-                  "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "314",
-                  "measuredH": "25",
-                  "x": "14",
-                  "y": "17",
-                  "properties": {
-                    "size": "17",
-                    "text": "Find the detailed version of this roadmap"
-                  }
-                },
-                {
-                  "ID": "2",
-                  "typeID": "Label",
-                  "zOrder": "2",
-                  "measuredW": "319",
-                  "measuredH": "25",
-                  "x": "14",
-                  "y": "45",
-                  "properties": {
-                    "size": "17",
-                    "text": "along with resources and other roadmaps"
-                  }
-                },
-                {
-                  "ID": "3",
-                  "typeID": "__group__",
-                  "zOrder": "3",
-                  "measuredW": "320",
-                  "measuredH": "45",
-                  "w": "320",
-                  "h": "45",
-                  "x": "15",
-                  "y": "81",
-                  "properties": {
-                    "controlName": "ext_link:roadmap.sh"
-                  },
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Canvas",
-                          "zOrder": "0",
-                          "w": "320",
-                          "h": "45",
-                          "measuredW": "100",
-                          "measuredH": "70",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "borderColor": "4273622",
-                            "color": "4273622"
-                          }
-                        },
-                        {
-                          "ID": "1",
-                          "typeID": "Label",
-                          "zOrder": "1",
-                          "measuredW": "105",
-                          "measuredH": "28",
-                          "x": "141",
-                          "y": "8",
-                          "properties": {
-                            "color": "16777215",
-                            "size": "20",
-                            "text": "roadmap.sh"
-                          }
-                        },
-                        {
-                          "ID": "2",
-                          "typeID": "Label",
-                          "zOrder": "2",
-                          "measuredW": "45",
-                          "measuredH": "28",
-                          "x": "66",
-                          "y": "8",
-                          "properties": {
-                            "color": "16777215",
-                            "size": "20",
-                            "text": "https"
-                          }
-                        },
-                        {
-                          "ID": "3",
-                          "typeID": "Label",
-                          "zOrder": "3",
-                          "measuredW": "5",
-                          "measuredH": "28",
-                          "x": "113",
-                          "y": "8",
-                          "properties": {
-                            "bold": "true",
-                            "color": "16777215",
-                            "size": "20",
-                            "text": ":"
-                          }
-                        },
-                        {
-                          "ID": "4",
-                          "typeID": "Label",
-                          "zOrder": "4",
-                          "measuredW": "10",
-                          "measuredH": "28",
-                          "x": "120",
-                          "y": "9",
-                          "properties": {
-                            "color": "16777215",
-                            "size": "20",
-                            "text": "/"
-                          }
-                        },
-                        {
-                          "ID": "5",
-                          "typeID": "Label",
-                          "zOrder": "5",
-                          "measuredW": "10",
-                          "measuredH": "28",
-                          "x": "128",
-                          "y": "9",
-                          "properties": {
-                            "color": "16777215",
-                            "size": "20",
-                            "text": "/"
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              ]
+              "x": 0.2240318781412043,
+              "y": 0.17641653110717925
             }
           }
         },
         {
-          "ID": "2221",
+          "ID": "3295",
           "typeID": "Arrow",
-          "zOrder": "34",
-          "w": "3",
-          "h": "1",
+          "zOrder": "1",
+          "w": "226",
+          "h": "95",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1848",
-          "y": "829",
+          "x": "1160",
+          "y": "1882",
           "properties": {
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "16777215",
+            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 0.14652915468354877,
-              "y": 0.452028801972574
+              "x": 225.2491412605234,
+              "y": 94.57035639603009
             },
             "p1": {
-              "x": 0.47345427259831346,
-              "y": -0.00011162392477928299
+              "x": 0.5112460408552416,
+              "y": -0.07415022000257976
             },
             "p2": {
-              "x": 2.7298768229543384,
-              "y": 0.452028801972574
+              "x": -0.45605469521706254,
+              "y": -0.4634103221762871
             }
           }
         },
         {
-          "ID": "2223",
+          "ID": "3296",
           "typeID": "Arrow",
-          "zOrder": "35",
-          "w": "3",
-          "h": "1",
+          "zOrder": "2",
+          "w": "213",
+          "h": "44",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1369",
-          "y": "637",
+          "x": "1174",
+          "y": "1876",
           "properties": {
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "16777215",
+            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 0.14652915468354877,
-              "y": 0.452028801972574
+              "x": 212.56905468716513,
+              "y": 43.81407905043466
             },
             "p1": {
-              "x": 0.47345427259831346,
-              "y": -0.00011162392477928299
+              "x": 0.5075193151706439,
+              "y": -0.04906393850575839
             },
             "p2": {
-              "x": 2.7298768229543384,
-              "y": 0.452028801972574
+              "x": 0.06299299784222967,
+              "y": 0.25693597125678025
             }
           }
         },
         {
-          "ID": "2328",
+          "ID": "3297",
           "typeID": "Arrow",
-          "zOrder": "27",
-          "w": "129",
-          "h": "24",
-          "measuredW": "150",
+          "zOrder": "3",
+          "w": "219",
+          "h": "1",
+          "measuredW": "150",
           "measuredH": "100",
-          "x": "1412",
-          "y": "939",
+          "x": "1177",
+          "y": "1864",
           "properties": {
-            "color": "2848996",
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
+            "color": "10027263",
             "stroke": "dotted",
             "p0": {
-              "x": 128.95319991843417,
-              "y": 0.21734292549183465
+              "x": 218.47706272280266,
+              "y": 0.09752175520043238
             },
             "p1": {
-              "x": 0.4823277909738713,
-              "y": 0.06750593824228046
+              "x": 0.49999999999999983,
+              "y": 0
             },
             "p2": {
-              "x": 0.32818075168870564,
-              "y": 23.140613668080164
-            }
-          }
-        },
-        {
-          "ID": "2372",
-          "typeID": "__group__",
-          "zOrder": "50",
-          "measuredW": "473",
-          "measuredH": "147",
-          "w": "473",
-          "h": "147",
-          "x": "600",
-          "y": "660",
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Canvas",
-                  "zOrder": "0",
-                  "w": "473",
-                  "h": "147",
-                  "measuredW": "100",
-                  "measuredH": "70",
-                  "x": "0",
-                  "y": "0"
-                },
-                {
-                  "ID": "1",
-                  "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "238",
-                  "measuredH": "26",
-                  "x": "21",
-                  "y": "65",
-                  "properties": {
-                    "size": "18",
-                    "text": "This roadmap was created by"
-                  }
-                },
-                {
-                  "ID": "2",
-                  "typeID": "Label",
-                  "zOrder": "2",
-                  "measuredW": "37",
-                  "measuredH": "26",
-                  "x": "21",
-                  "y": "97",
-                  "properties": {
-                    "size": "18",
-                    "text": "from"
-                  }
-                },
-                {
-                  "ID": "6",
-                  "typeID": "__group__",
-                  "zOrder": "3",
-                  "measuredW": "151",
-                  "measuredH": "26",
-                  "w": "151",
-                  "h": "26",
-                  "x": "265",
-                  "y": "65",
-                  "properties": {
-                    "controlName": "ext_link:bit.ly/maria-mlops"
-                  },
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Label",
-                          "zOrder": "0",
-                          "measuredW": "151",
-                          "measuredH": "26",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "size": "18",
-                            "color": "10027263",
-                            "text": "Maria Vechtomova"
-                          }
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  "ID": "8",
-                  "typeID": "__group__",
-                  "zOrder": "4",
-                  "measuredW": "148",
-                  "measuredH": "26",
-                  "w": "148",
-                  "h": "26",
-                  "x": "65",
-                  "y": "97",
-                  "properties": {
-                    "controlName": "ext_link:bit.ly/marvelousmlops-mlops"
-                  },
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Label",
-                          "zOrder": "0",
-                          "measuredW": "148",
-                          "measuredH": "26",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "10027263",
-                            "size": "18",
-                            "text": "Marvelous MLOps"
-                          }
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  "ID": "9",
-                  "typeID": "Label",
-                  "zOrder": "5",
-                  "measuredW": "166",
-                  "measuredH": "26",
-                  "x": "220",
-                  "y": "97",
-                  "properties": {
-                    "size": "18",
-                    "text": ". Do check them out!"
-                  }
-                },
-                {
-                  "ID": "10",
-                  "typeID": "Label",
-                  "zOrder": "6",
-                  "measuredW": "163",
-                  "measuredH": "32",
-                  "x": "21",
-                  "y": "23",
-                  "properties": {
-                    "size": "24",
-                    "text": "Special thanks!"
-                  }
-                }
-              ]
-            }
-          }
-        },
-        {
-          "ID": "2377",
-          "typeID": "__group__",
-          "zOrder": "29",
-          "measuredW": "473",
-          "measuredH": "127",
-          "w": "473",
-          "h": "127",
-          "x": "600",
-          "y": "802",
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Canvas",
-                  "zOrder": "0",
-                  "w": "473",
-                  "h": "127",
-                  "measuredW": "100",
-                  "measuredH": "70",
-                  "x": "0",
-                  "y": "0"
-                },
-                {
-                  "ID": "1",
-                  "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "382",
-                  "measuredH": "26",
-                  "x": "21",
-                  "y": "22",
-                  "properties": {
-                    "size": "18",
-                    "text": "This roadmap is meant for beginners. If you are"
-                  }
-                },
-                {
-                  "ID": "2",
-                  "typeID": "Label",
-                  "zOrder": "2",
-                  "measuredW": "425",
-                  "measuredH": "26",
-                  "x": "21",
-                  "y": "51",
-                  "properties": {
-                    "size": "18",
-                    "text": "transitioning from DataScience/DevOps background"
-                  }
-                },
-                {
-                  "ID": "3",
-                  "typeID": "Label",
-                  "zOrder": "3",
-                  "measuredW": "215",
-                  "measuredH": "26",
-                  "x": "21",
-                  "y": "80",
-                  "properties": {
-                    "size": "18",
-                    "text": "you might skip some parts."
-                  }
-                }
-              ]
+              "x": -0.2971801488740766,
+              "y": 0.09752175520043238
             }
           }
         },
         {
-          "ID": "2378",
-          "typeID": "Canvas",
-          "zOrder": "28",
-          "w": "473",
-          "h": "175",
-          "measuredW": "100",
-          "measuredH": "70",
-          "x": "600",
-          "y": "922"
-        },
-        {
-          "ID": "2380",
-          "typeID": "__group__",
-          "zOrder": "51",
-          "measuredW": "287",
-          "measuredH": "27",
-          "w": "287",
-          "h": "27",
-          "x": "626",
-          "y": "1001",
+          "ID": "3298",
+          "typeID": "Arrow",
+          "zOrder": "4",
+          "w": "201",
+          "h": "46",
+          "measuredW": "150",
+          "measuredH": "100",
+          "x": "1186",
+          "y": "1806",
           "properties": {
-            "controlName": "ext_link:roadmap.sh/ai-data-scientist"
-          },
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Label",
-                  "zOrder": "0",
-                  "measuredW": "254",
-                  "measuredH": "26",
-                  "x": "33",
-                  "y": "0",
-                  "properties": {
-                    "size": "18",
-                    "text": "AI and Data Scientist Roadmap"
-                  }
-                },
-                {
-                  "ID": "1",
-                  "typeID": "__group__",
-                  "zOrder": "1",
-                  "measuredW": "24",
-                  "measuredH": "24",
-                  "w": "24",
-                  "h": "24",
-                  "x": "0",
-                  "y": "3",
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Icon",
-                          "zOrder": "0",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "16777215",
-                            "icon": {
-                              "ID": "circle",
-                              "size": "small"
-                            }
-                          }
-                        },
-                        {
-                          "ID": "1",
-                          "typeID": "Icon",
-                          "zOrder": "1",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "10066329",
-                            "icon": {
-                              "ID": "check-circle",
-                              "size": "small"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              ]
+            "curvature": "0",
+            "leftArrow": "false",
+            "rightArrow": "false",
+            "color": "10027263",
+            "stroke": "dotted",
+            "p0": {
+              "x": 200.56905468716513,
+              "y": 0.30152435924355814
+            },
+            "p1": {
+              "x": 0.4723739008968917,
+              "y": 0.03172772602757116
+            },
+            "p2": {
+              "x": -0.05778616238194445,
+              "y": 46.49849429170513
             }
           }
         },
         {
-          "ID": "2381",
-          "typeID": "Label",
-          "zOrder": "52",
-          "measuredW": "209",
-          "measuredH": "32",
-          "x": "626",
-          "y": "956",
-          "properties": {
-            "size": "24",
-            "text": "Related Roadmaps"
-          }
-        },
-        {
-          "ID": "2382",
-          "typeID": "__group__",
-          "zOrder": "53",
-          "measuredW": "183",
-          "measuredH": "27",
-          "w": "183",
-          "h": "27",
-          "x": "626",
-          "y": "1039",
+          "ID": "3299",
+          "typeID": "Arrow",
+          "zOrder": "5",
+          "w": "216",
+          "h": "90",
+          "measuredW": "150",
+          "measuredH": "100",
+          "x": "1169",
+          "y": "1756",
           "properties": {
-            "controlName": "ext_link:roadmap.sh/devops"
-          },
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Label",
-                  "zOrder": "0",
-                  "measuredW": "150",
-                  "measuredH": "26",
-                  "x": "33",
-                  "y": "0",
-                  "properties": {
-                    "size": "18",
-                    "text": "DevOps Roadmap"
-                  }
-                },
-                {
-                  "ID": "1",
-                  "typeID": "__group__",
-                  "zOrder": "1",
-                  "measuredW": "24",
-                  "measuredH": "24",
-                  "w": "24",
-                  "h": "24",
-                  "x": "0",
-                  "y": "3",
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Icon",
-                          "zOrder": "0",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "16777215",
-                            "icon": {
-                              "ID": "circle",
-                              "size": "small"
-                            }
-                          }
-                        },
-                        {
-                          "ID": "1",
-                          "typeID": "Icon",
-                          "zOrder": "1",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "10066329",
-                            "icon": {
-                              "ID": "check-circle",
-                              "size": "small"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              ]
+            "curvature": "0",
+            "leftArrow": "false",
+            "rightArrow": "false",
+            "color": "10027263",
+            "stroke": "dotted",
+            "p0": {
+              "x": 216.2491412605234,
+              "y": 0.14481414685678828
+            },
+            "p1": {
+              "x": 0.5158288215391025,
+              "y": 0.059454538465246405
+            },
+            "p2": {
+              "x": -0.216660708724703,
+              "y": 89.89892715849624
             }
           }
         },
         {
-          "ID": "2383",
-          "typeID": "__group__",
-          "zOrder": "54",
-          "measuredW": "189",
-          "measuredH": "27",
-          "w": "189",
-          "h": "27",
-          "x": "835",
-          "y": "1039",
+          "ID": "3300",
+          "typeID": "Arrow",
+          "zOrder": "6",
+          "w": "1",
+          "h": "517",
+          "measuredW": "150",
+          "measuredH": "100",
+          "x": "1053",
+          "y": "1591",
           "properties": {
-            "controlName": "ext_link:roadmap.sh/backend"
-          },
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "Label",
-                  "zOrder": "0",
-                  "measuredW": "156",
-                  "measuredH": "26",
-                  "x": "33",
-                  "y": "0",
-                  "properties": {
-                    "size": "18",
-                    "text": "Backend Roadmap"
-                  }
-                },
-                {
-                  "ID": "1",
-                  "typeID": "__group__",
-                  "zOrder": "1",
-                  "measuredW": "24",
-                  "measuredH": "24",
-                  "w": "24",
-                  "h": "24",
-                  "x": "0",
-                  "y": "3",
-                  "children": {
-                    "controls": {
-                      "control": [
-                        {
-                          "ID": "0",
-                          "typeID": "Icon",
-                          "zOrder": "0",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "16777215",
-                            "icon": {
-                              "ID": "circle",
-                              "size": "small"
-                            }
-                          }
-                        },
-                        {
-                          "ID": "1",
-                          "typeID": "Icon",
-                          "zOrder": "1",
-                          "measuredW": "24",
-                          "measuredH": "24",
-                          "x": "0",
-                          "y": "0",
-                          "properties": {
-                            "color": "10066329",
-                            "icon": {
-                              "ID": "check-circle",
-                              "size": "small"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              ]
+            "curvature": "0",
+            "leftArrow": "false",
+            "rightArrow": "false",
+            "color": "10027263",
+            "p0": {
+              "x": 0,
+              "y": 517.5616990602057
+            },
+            "p1": {
+              "x": 0.4999999999999998,
+              "y": 0
+            },
+            "p2": {
+              "x": 0,
+              "y": 0.10948518400027751
             }
           }
         },
         {
-          "ID": "2384",
+          "ID": "3301",
           "typeID": "Arrow",
-          "zOrder": "26",
-          "w": "129",
-          "h": "28",
+          "zOrder": "7",
+          "w": "235",
+          "h": "148",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1414",
-          "y": "976",
+          "x": "1154",
+          "y": "1698",
           "properties": {
-            "color": "2848996",
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "stroke": "dotted",
+            "color": "10027263",
             "p0": {
-              "x": 128.22671495968893,
-              "y": 28.16661002949195
+              "x": 235.2088815404486,
+              "y": 0.06862337461961943
             },
             "p1": {
-              "x": 0.38104819840898435,
-              "y": -0.0902667290594294
+              "x": 0.48837869822485236,
+              "y": 0.08549112426035499
             },
             "p2": {
-              "x": -0.39830420705629876,
-              "y": 0.1492791218840921
-            }
+              "x": 0.2642915982160048,
+              "y": 147.89892715849624
+            },
+            "stroke": "dotted"
           }
         },
         {
-          "ID": "2391",
+          "ID": "3302",
           "typeID": "Arrow",
-          "zOrder": "25",
+          "zOrder": "8",
           "w": "1",
-          "h": "278",
+          "h": "218",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1301",
-          "y": "846",
+          "x": "1393",
+          "y": "1362",
           "properties": {
             "curvature": "0",
             "leftArrow": "false",
@@ -828,269 +258,202 @@
             "color": "10027263",
             "p0": {
               "x": 0,
-              "y": 0
+              "y": 217.77529435680026
             },
             "p1": {
-              "x": 0.49999999999999983,
+              "x": 0.4999999999999997,
               "y": 0
             },
             "p2": {
               "x": 0,
-              "y": 278.1094851840003
+              "y": 0.10948518400027751
             }
           }
         },
         {
-          "ID": "2396",
+          "ID": "3303",
           "typeID": "Arrow",
-          "zOrder": "23",
-          "w": "129",
-          "h": "28",
+          "zOrder": "9",
+          "w": "92",
+          "h": "51",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1418",
-          "y": "1361",
+          "x": "831",
+          "y": "1600",
           "properties": {
-            "color": "2848996",
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
             "stroke": "dotted",
+            "color": "10027263",
             "p0": {
-              "x": 128.22671495968893,
-              "y": 28.16661002949195
+              "x": 92.37564854400023,
+              "y": -0.1653379887995925
             },
             "p1": {
-              "x": 0.38104819840898435,
-              "y": -0.0902667290594294
+              "x": 0.5433258631800256,
+              "y": -0.1351620229829188
             },
             "p2": {
-              "x": -0.39830420705629876,
-              "y": 0.1492791218840921
+              "x": 0.038083689600171056,
+              "y": 50.68723396000041
             }
           }
         },
         {
-          "ID": "2397",
+          "ID": "3304",
           "typeID": "Arrow",
-          "zOrder": "24",
-          "w": "129",
-          "h": "24",
+          "zOrder": "10",
+          "w": "110",
+          "h": "4",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1416",
-          "y": "1324",
+          "x": "817",
+          "y": "1590",
           "properties": {
-            "color": "2848996",
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
             "stroke": "dotted",
+            "color": "10027263",
             "p0": {
-              "x": 128.95319991843417,
-              "y": 0.21734292549183465
+              "x": 110.39032527680024,
+              "y": -0.2520769391996964
             },
             "p1": {
-              "x": 0.4823277909738713,
-              "y": 0.06750593824228046
+              "x": 0.46737830066706804,
+              "y": -0.0036060514395746695
             },
             "p2": {
-              "x": 0.32818075168870564,
-              "y": 23.140613668080164
+              "x": 0.08850738176079176,
+              "y": 3.418067204234376
             }
           }
         },
         {
-          "ID": "2408",
-          "typeID": "Label",
-          "zOrder": "21",
-          "measuredW": "161",
-          "measuredH": "32",
-          "x": "972",
-          "y": "2122",
-          "properties": {
-            "text": "Keep Learning",
-            "size": "24"
-          }
-        },
-        {
-          "ID": "2409",
+          "ID": "3305",
           "typeID": "Arrow",
-          "zOrder": "22",
-          "w": "1",
-          "h": "63",
+          "zOrder": "11",
+          "w": "95",
+          "h": "48",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1052",
-          "y": "2165",
+          "x": "827",
+          "y": "1528",
           "properties": {
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
+            "stroke": "dotted",
             "color": "10027263",
             "p0": {
-              "x": 0,
-              "y": -0.053257099628808646
+              "x": 95.03742296640019,
+              "y": 47.74660161440033
             },
             "p1": {
-              "x": 0.4438624012549728,
-              "y": -0.00008403832147459168
+              "x": 0.5329020041028875,
+              "y": 0.14344326968597146
             },
             "p2": {
-              "x": 0,
-              "y": 63
-            },
-            "stroke": "dotted"
-          }
-        },
-        {
-          "ID": "2410",
-          "typeID": "Label",
-          "zOrder": "57",
-          "measuredW": "267",
-          "measuredH": "32",
-          "x": "600",
-          "y": "1138",
-          "properties": {
-            "size": "24",
-            "text": "ML vs MLOps Engineers"
-          }
-        },
-        {
-          "ID": "2411",
-          "typeID": "Label",
-          "zOrder": "58",
-          "measuredW": "460",
-          "measuredH": "26",
-          "x": "601",
-          "y": "1179",
-          "properties": {
-            "size": "18",
-            "text": "ML engineers develop models; MLOps engineers deploy"
-          }
-        },
-        {
-          "ID": "2416",
-          "typeID": "Label",
-          "zOrder": "59",
-          "measuredW": "449",
-          "measuredH": "26",
-          "x": "601",
-          "y": "1209",
-          "properties": {
-            "size": "18",
-            "text": "and manage them in production, ensuring reliability and"
-          }
-        },
-        {
-          "ID": "2417",
-          "typeID": "Label",
-          "zOrder": "60",
-          "measuredW": "81",
-          "measuredH": "26",
-          "x": "601",
-          "y": "1239",
-          "properties": {
-            "size": "18",
-            "text": "scalability."
+              "x": 0.023406956800158696,
+              "y": -0.4295191791995876
+            }
           }
         },
         {
-          "ID": "2426",
+          "ID": "3306",
           "typeID": "Arrow",
-          "zOrder": "17",
-          "w": "129",
-          "h": "28",
+          "zOrder": "12",
+          "w": "330",
+          "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1414",
-          "y": "1129",
+          "x": "1136",
+          "y": "1589",
           "properties": {
-            "color": "2848996",
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "stroke": "dotted",
-            "p0": {
-              "x": 128.22671495968893,
-              "y": 28.16661002949195
+            "color": "10027263",
+            "p0": {
+              "x": 330.0261202608003,
+              "y": 0.10948518400027751
             },
             "p1": {
-              "x": 0.38104819840898435,
-              "y": -0.0902667290594294
+              "x": 0.4999999999999997,
+              "y": 0
             },
             "p2": {
-              "x": -0.39830420705629876,
-              "y": 0.1492791218840921
+              "x": 0,
+              "y": 0.10948518400027751
             }
           }
         },
         {
-          "ID": "2427",
+          "ID": "3307",
           "typeID": "Arrow",
-          "zOrder": "18",
-          "w": "129",
-          "h": "24",
+          "zOrder": "13",
+          "w": "211",
+          "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1412",
-          "y": "1092",
+          "x": "1104",
+          "y": "1352",
           "properties": {
-            "color": "2848996",
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "stroke": "dotted",
+            "color": "10027263",
             "p0": {
-              "x": 128.95319991843417,
-              "y": 0.21734292549183465
+              "x": 210.56248173120025,
+              "y": 0.10948518400027751
             },
             "p1": {
-              "x": 0.4823277909738713,
-              "y": 0.06750593824228046
+              "x": 0.4999999999999997,
+              "y": 0
             },
             "p2": {
-              "x": 0.32818075168870564,
-              "y": 23.140613668080164
+              "x": 0,
+              "y": 0.10948518400027751
             }
           }
         },
         {
-          "ID": "2432",
+          "ID": "3308",
           "typeID": "Arrow",
-          "zOrder": "16",
-          "w": "202",
-          "h": "207",
+          "zOrder": "14",
+          "w": "86",
+          "h": "48",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1097",
-          "y": "1131",
+          "x": "828",
+          "y": "1355",
           "properties": {
-            "curvature": "0",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
+            "stroke": "dotted",
             "color": "10027263",
             "p0": {
-              "x": 202.41703584960032,
-              "y": 0.4697258608002812
+              "x": 86.00806950080016,
+              "y": -0.193370007999647
             },
             "p1": {
-              "x": 0.47994703797035837,
-              "y": 0.21594840473241347
+              "x": 0.49913203574984505,
+              "y": -0.12569866906689672
             },
             "p2": {
-              "x": 0.3449736320003467,
-              "y": 207.8946903888002
+              "x": 0.3616325344002007,
+              "y": 47.982750785600274
             }
           }
         },
         {
-          "ID": "2439",
+          "ID": "3309",
           "typeID": "Arrow",
           "zOrder": "15",
           "w": "110",
@@ -1121,197 +484,306 @@
           }
         },
         {
-          "ID": "2440",
+          "ID": "3310",
           "typeID": "Arrow",
-          "zOrder": "14",
-          "w": "86",
-          "h": "48",
+          "zOrder": "16",
+          "w": "202",
+          "h": "207",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "828",
-          "y": "1355",
+          "x": "1097",
+          "y": "1131",
           "properties": {
-            "curvature": "-1",
-            "direction": "bottom",
+            "curvature": "0",
             "leftArrow": "false",
             "rightArrow": "false",
-            "stroke": "dotted",
             "color": "10027263",
             "p0": {
-              "x": 86.00806950080016,
-              "y": -0.193370007999647
+              "x": 202.41703584960032,
+              "y": 0.4697258608002812
             },
             "p1": {
-              "x": 0.49913203574984505,
-              "y": -0.12569866906689672
+              "x": 0.47994703797035837,
+              "y": 0.21594840473241347
             },
             "p2": {
-              "x": 0.3616325344002007,
-              "y": 47.982750785600274
+              "x": 0.3449736320003467,
+              "y": 207.8946903888002
             }
           }
         },
         {
-          "ID": "2443",
+          "ID": "3311",
           "typeID": "Arrow",
-          "zOrder": "13",
-          "w": "211",
-          "h": "1",
+          "zOrder": "17",
+          "w": "129",
+          "h": "28",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1104",
-          "y": "1352",
+          "x": "1414",
+          "y": "1129",
           "properties": {
-            "curvature": "0",
+            "color": "2848996",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 210.56248173120025,
-              "y": 0.10948518400027751
+              "x": 128.22671495968893,
+              "y": 28.16661002949195
             },
             "p1": {
-              "x": 0.4999999999999997,
-              "y": 0
+              "x": 0.38104819840898435,
+              "y": -0.0902667290594294
             },
             "p2": {
-              "x": 0,
-              "y": 0.10948518400027751
+              "x": -0.39830420705629876,
+              "y": 0.1492791218840921
             }
           }
         },
         {
-          "ID": "2444",
+          "ID": "3312",
           "typeID": "Arrow",
-          "zOrder": "12",
-          "w": "330",
-          "h": "1",
+          "zOrder": "18",
+          "w": "129",
+          "h": "24",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1136",
-          "y": "1589",
+          "x": "1412",
+          "y": "1092",
           "properties": {
-            "curvature": "0",
+            "color": "2848996",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 330.0261202608003,
-              "y": 0.10948518400027751
+              "x": 128.95319991843417,
+              "y": 0.21734292549183465
             },
             "p1": {
-              "x": 0.4999999999999997,
-              "y": 0
+              "x": 0.4823277909738713,
+              "y": 0.06750593824228046
             },
             "p2": {
-              "x": 0,
-              "y": 0.10948518400027751
+              "x": 0.32818075168870564,
+              "y": 23.140613668080164
+            }
+          }
+        },
+        {
+          "ID": "3313",
+          "typeID": "__group__",
+          "zOrder": "19",
+          "measuredW": "163",
+          "measuredH": "49",
+          "w": "163",
+          "h": "49",
+          "x": "1533",
+          "y": "1070",
+          "properties": {
+            "controlName": "100-version-control-systems:git"
+          },
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "TextArea",
+                  "zOrder": "0",
+                  "w": "163",
+                  "h": "49",
+                  "measuredW": "200",
+                  "measuredH": "140",
+                  "x": "0",
+                  "y": "0",
+                  "properties": {
+                    "color": "16770457"
+                  }
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "22",
+                  "measuredH": "25",
+                  "x": "71",
+                  "y": "12",
+                  "properties": {
+                    "size": "17",
+                    "text": "Git"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        {
+          "ID": "3314",
+          "typeID": "__group__",
+          "zOrder": "20",
+          "measuredW": "163",
+          "measuredH": "49",
+          "w": "163",
+          "h": "49",
+          "x": "1533",
+          "y": "1124",
+          "properties": {
+            "controlName": "101-version-control-systems:github"
+          },
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "TextArea",
+                  "zOrder": "0",
+                  "w": "163",
+                  "h": "49",
+                  "measuredW": "200",
+                  "measuredH": "140",
+                  "x": "0",
+                  "y": "0",
+                  "properties": {
+                    "color": "16770457"
+                  }
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "54",
+                  "measuredH": "25",
+                  "x": "55",
+                  "y": "12",
+                  "properties": {
+                    "size": "17",
+                    "text": "GitHub"
+                  }
+                }
+              ]
             }
           }
         },
         {
-          "ID": "2453",
+          "ID": "3315",
+          "typeID": "Label",
+          "zOrder": "21",
+          "measuredW": "161",
+          "measuredH": "32",
+          "x": "972",
+          "y": "2122",
+          "properties": {
+            "text": "Keep Learning",
+            "size": "24"
+          }
+        },
+        {
+          "ID": "3316",
           "typeID": "Arrow",
-          "zOrder": "11",
-          "w": "95",
-          "h": "48",
+          "zOrder": "22",
+          "w": "1",
+          "h": "63",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "827",
-          "y": "1528",
+          "x": "1052",
+          "y": "2165",
           "properties": {
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "stroke": "dotted",
             "color": "10027263",
             "p0": {
-              "x": 95.03742296640019,
-              "y": 47.74660161440033
+              "x": 0,
+              "y": -0.053257099628808646
             },
             "p1": {
-              "x": 0.5329020041028875,
-              "y": 0.14344326968597146
+              "x": 0.4438624012549728,
+              "y": -0.00008403832147459168
             },
             "p2": {
-              "x": 0.023406956800158696,
-              "y": -0.4295191791995876
-            }
+              "x": 0,
+              "y": 63
+            },
+            "stroke": "dotted"
           }
         },
         {
-          "ID": "2454",
+          "ID": "3317",
           "typeID": "Arrow",
-          "zOrder": "10",
-          "w": "110",
-          "h": "4",
+          "zOrder": "23",
+          "w": "129",
+          "h": "28",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "817",
-          "y": "1590",
+          "x": "1418",
+          "y": "1361",
           "properties": {
+            "color": "2848996",
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
             "stroke": "dotted",
-            "color": "10027263",
             "p0": {
-              "x": 110.39032527680024,
-              "y": -0.2520769391996964
+              "x": 128.22671495968893,
+              "y": 28.16661002949195
             },
             "p1": {
-              "x": 0.46737830066706804,
-              "y": -0.0036060514395746695
+              "x": 0.38104819840898435,
+              "y": -0.0902667290594294
             },
             "p2": {
-              "x": 0.08850738176079176,
-              "y": 3.418067204234376
+              "x": -0.39830420705629876,
+              "y": 0.1492791218840921
             }
           }
         },
         {
-          "ID": "2455",
+          "ID": "3318",
           "typeID": "Arrow",
-          "zOrder": "9",
-          "w": "92",
-          "h": "51",
+          "zOrder": "24",
+          "w": "129",
+          "h": "24",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "831",
-          "y": "1600",
+          "x": "1416",
+          "y": "1324",
           "properties": {
+            "color": "2848996",
             "curvature": "-1",
             "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
             "stroke": "dotted",
-            "color": "10027263",
             "p0": {
-              "x": 92.37564854400023,
-              "y": -0.1653379887995925
+              "x": 128.95319991843417,
+              "y": 0.21734292549183465
             },
             "p1": {
-              "x": 0.5433258631800256,
-              "y": -0.1351620229829188
+              "x": 0.4823277909738713,
+              "y": 0.06750593824228046
             },
             "p2": {
-              "x": 0.038083689600171056,
-              "y": 50.68723396000041
+              "x": 0.32818075168870564,
+              "y": 23.140613668080164
             }
           }
         },
         {
-          "ID": "2458",
+          "ID": "3319",
           "typeID": "Arrow",
-          "zOrder": "8",
+          "zOrder": "25",
           "w": "1",
-          "h": "218",
+          "h": "278",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1393",
-          "y": "1362",
+          "x": "1301",
+          "y": "846",
           "properties": {
             "curvature": "0",
             "leftArrow": "false",
@@ -1319,267 +791,437 @@
             "color": "10027263",
             "p0": {
               "x": 0,
-              "y": 217.77529435680026
+              "y": 0
             },
             "p1": {
-              "x": 0.4999999999999997,
+              "x": 0.49999999999999983,
               "y": 0
             },
             "p2": {
               "x": 0,
-              "y": 0.10948518400027751
+              "y": 278.1094851840003
             }
           }
         },
         {
-          "ID": "2461",
+          "ID": "3320",
           "typeID": "Arrow",
-          "zOrder": "7",
-          "w": "235",
-          "h": "148",
+          "zOrder": "26",
+          "w": "129",
+          "h": "28",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1154",
-          "y": "1698",
+          "x": "1414",
+          "y": "976",
           "properties": {
-            "curvature": "0",
+            "color": "2848996",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 235.2088815404486,
-              "y": 0.06862337461961943
+              "x": 128.22671495968893,
+              "y": 28.16661002949195
             },
             "p1": {
-              "x": 0.48837869822485236,
-              "y": 0.08549112426035499
+              "x": 0.38104819840898435,
+              "y": -0.0902667290594294
             },
             "p2": {
-              "x": 0.2642915982160048,
-              "y": 147.89892715849624
-            },
-            "stroke": "dotted"
+              "x": -0.39830420705629876,
+              "y": 0.1492791218840921
+            }
           }
         },
         {
-          "ID": "2463",
+          "ID": "3321",
           "typeID": "Arrow",
-          "zOrder": "6",
-          "w": "1",
-          "h": "517",
+          "zOrder": "27",
+          "w": "129",
+          "h": "24",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1053",
-          "y": "1591",
+          "x": "1412",
+          "y": "939",
           "properties": {
-            "curvature": "0",
+            "color": "2848996",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
+            "stroke": "dotted",
             "p0": {
-              "x": 0,
-              "y": 517.5616990602057
+              "x": 128.95319991843417,
+              "y": 0.21734292549183465
             },
             "p1": {
-              "x": 0.4999999999999998,
-              "y": 0
+              "x": 0.4823277909738713,
+              "y": 0.06750593824228046
             },
             "p2": {
-              "x": 0,
-              "y": 0.10948518400027751
+              "x": 0.32818075168870564,
+              "y": 23.140613668080164
             }
           }
         },
         {
-          "ID": "2465",
-          "typeID": "Arrow",
-          "zOrder": "5",
-          "w": "216",
-          "h": "90",
-          "measuredW": "150",
-          "measuredH": "100",
-          "x": "1169",
-          "y": "1756",
-          "properties": {
-            "curvature": "0",
-            "leftArrow": "false",
-            "rightArrow": "false",
-            "color": "10027263",
-            "stroke": "dotted",
-            "p0": {
-              "x": 216.2491412605234,
-              "y": 0.14481414685678828
-            },
-            "p1": {
-              "x": 0.5158288215391025,
-              "y": 0.059454538465246405
-            },
-            "p2": {
-              "x": -0.216660708724703,
-              "y": 89.89892715849624
+          "ID": "3323",
+          "typeID": "__group__",
+          "zOrder": "29",
+          "measuredW": "473",
+          "measuredH": "127",
+          "w": "473",
+          "h": "127",
+          "x": "600",
+          "y": "802",
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "Canvas",
+                  "zOrder": "0",
+                  "w": "473",
+                  "h": "127",
+                  "measuredW": "100",
+                  "measuredH": "70",
+                  "x": "0",
+                  "y": "0"
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "382",
+                  "measuredH": "26",
+                  "x": "21",
+                  "y": "22",
+                  "properties": {
+                    "size": "18",
+                    "text": "This roadmap is meant for beginners. If you are"
+                  }
+                },
+                {
+                  "ID": "2",
+                  "typeID": "Label",
+                  "zOrder": "2",
+                  "measuredW": "425",
+                  "measuredH": "26",
+                  "x": "21",
+                  "y": "51",
+                  "properties": {
+                    "size": "18",
+                    "text": "transitioning from DataScience/DevOps background"
+                  }
+                },
+                {
+                  "ID": "3",
+                  "typeID": "Label",
+                  "zOrder": "3",
+                  "measuredW": "215",
+                  "measuredH": "26",
+                  "x": "21",
+                  "y": "80",
+                  "properties": {
+                    "size": "18",
+                    "text": "you might skip some parts."
+                  }
+                }
+              ]
             }
           }
         },
         {
-          "ID": "2466",
-          "typeID": "Arrow",
-          "zOrder": "4",
-          "w": "201",
-          "h": "46",
-          "measuredW": "150",
-          "measuredH": "100",
-          "x": "1186",
-          "y": "1806",
-          "properties": {
-            "curvature": "0",
-            "leftArrow": "false",
-            "rightArrow": "false",
-            "color": "10027263",
-            "stroke": "dotted",
-            "p0": {
-              "x": 200.56905468716513,
-              "y": 0.30152435924355814
-            },
-            "p1": {
-              "x": 0.4723739008968917,
-              "y": 0.03172772602757116
-            },
-            "p2": {
-              "x": -0.05778616238194445,
-              "y": 46.49849429170513
-            }
+          "ID": "3324",
+          "typeID": "Label",
+          "zOrder": "30",
+          "measuredW": "104",
+          "measuredH": "40",
+          "x": "1250",
+          "y": "789",
+          "properties": {
+            "size": "32",
+            "text": "MLOps"
           }
         },
         {
-          "ID": "2467",
+          "ID": "3325",
           "typeID": "Arrow",
-          "zOrder": "3",
-          "w": "219",
-          "h": "1",
+          "zOrder": "31",
+          "w": "1",
+          "h": "75",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1177",
-          "y": "1864",
+          "x": "1301",
+          "y": "702",
           "properties": {
-            "curvature": "0",
+            "curvature": "-1",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
             "stroke": "dotted",
             "p0": {
-              "x": 218.47706272280266,
-              "y": 0.09752175520043238
+              "x": 0.43268541466795796,
+              "y": -0.4292144763719534
             },
             "p1": {
-              "x": 0.49999999999999983,
-              "y": 0
+              "x": 0.4673783006670677,
+              "y": -0.0036060514395746665
             },
             "p2": {
-              "x": -0.2971801488740766,
-              "y": 0.09752175520043238
-            }
+              "x": 0.08850738176079176,
+              "y": 74.41806720423438
+            },
+            "color": "10027263"
           }
         },
         {
-          "ID": "2468",
-          "typeID": "Arrow",
-          "zOrder": "2",
-          "w": "213",
-          "h": "44",
-          "measuredW": "150",
-          "measuredH": "100",
-          "x": "1174",
-          "y": "1876",
-          "properties": {
-            "curvature": "0",
-            "leftArrow": "false",
-            "rightArrow": "false",
-            "color": "10027263",
-            "stroke": "dotted",
-            "p0": {
-              "x": 212.56905468716513,
-              "y": 43.81407905043466
-            },
-            "p1": {
-              "x": 0.5075193151706439,
-              "y": -0.04906393850575839
-            },
-            "p2": {
-              "x": 0.06299299784222967,
-              "y": 0.25693597125678025
+          "ID": "3326",
+          "typeID": "__group__",
+          "zOrder": "32",
+          "measuredW": "350",
+          "measuredH": "141",
+          "w": "350",
+          "h": "141",
+          "x": "1473",
+          "y": "670",
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "Canvas",
+                  "zOrder": "0",
+                  "w": "350",
+                  "h": "141",
+                  "measuredW": "100",
+                  "measuredH": "70",
+                  "x": "0",
+                  "y": "0"
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "314",
+                  "measuredH": "25",
+                  "x": "14",
+                  "y": "17",
+                  "properties": {
+                    "size": "17",
+                    "text": "Find the detailed version of this roadmap"
+                  }
+                },
+                {
+                  "ID": "2",
+                  "typeID": "Label",
+                  "zOrder": "2",
+                  "measuredW": "319",
+                  "measuredH": "25",
+                  "x": "14",
+                  "y": "45",
+                  "properties": {
+                    "size": "17",
+                    "text": "along with resources and other roadmaps"
+                  }
+                },
+                {
+                  "ID": "3",
+                  "typeID": "__group__",
+                  "zOrder": "3",
+                  "measuredW": "320",
+                  "measuredH": "45",
+                  "w": "320",
+                  "h": "45",
+                  "x": "15",
+                  "y": "81",
+                  "properties": {
+                    "controlName": "ext_link:roadmap.sh"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Canvas",
+                          "zOrder": "0",
+                          "w": "320",
+                          "h": "45",
+                          "measuredW": "100",
+                          "measuredH": "70",
+                          "x": "0",
+                          "y": "0",
+                          "properties": {
+                            "borderColor": "4273622",
+                            "color": "4273622"
+                          }
+                        },
+                        {
+                          "ID": "1",
+                          "typeID": "Label",
+                          "zOrder": "1",
+                          "measuredW": "105",
+                          "measuredH": "28",
+                          "x": "141",
+                          "y": "8",
+                          "properties": {
+                            "color": "16777215",
+                            "size": "20",
+                            "text": "roadmap.sh"
+                          }
+                        },
+                        {
+                          "ID": "2",
+                          "typeID": "Label",
+                          "zOrder": "2",
+                          "measuredW": "45",
+                          "measuredH": "28",
+                          "x": "66",
+                          "y": "8",
+                          "properties": {
+                            "color": "16777215",
+                            "size": "20",
+                            "text": "https"
+                          }
+                        },
+                        {
+                          "ID": "3",
+                          "typeID": "Label",
+                          "zOrder": "3",
+                          "measuredW": "5",
+                          "measuredH": "28",
+                          "x": "113",
+                          "y": "8",
+                          "properties": {
+                            "bold": "true",
+                            "color": "16777215",
+                            "size": "20",
+                            "text": ":"
+                          }
+                        },
+                        {
+                          "ID": "4",
+                          "typeID": "Label",
+                          "zOrder": "4",
+                          "measuredW": "10",
+                          "measuredH": "28",
+                          "x": "120",
+                          "y": "9",
+                          "properties": {
+                            "color": "16777215",
+                            "size": "20",
+                            "text": "/"
+                          }
+                        },
+                        {
+                          "ID": "5",
+                          "typeID": "Label",
+                          "zOrder": "5",
+                          "measuredW": "10",
+                          "measuredH": "28",
+                          "x": "128",
+                          "y": "9",
+                          "properties": {
+                            "color": "16777215",
+                            "size": "20",
+                            "text": "/"
+                          }
+                        }
+                      ]
+                    }
+                  }
+                }
+              ]
             }
           }
         },
         {
-          "ID": "2469",
-          "typeID": "Arrow",
-          "zOrder": "1",
-          "w": "226",
-          "h": "95",
-          "measuredW": "150",
-          "measuredH": "100",
-          "x": "1160",
-          "y": "1882",
+          "ID": "3327",
+          "typeID": "__group__",
+          "zOrder": "33",
+          "measuredW": "295",
+          "measuredH": "50",
+          "w": "295",
+          "h": "50",
+          "x": "1152",
+          "y": "944",
           "properties": {
-            "curvature": "0",
-            "leftArrow": "false",
-            "rightArrow": "false",
-            "color": "10027263",
-            "stroke": "dotted",
-            "p0": {
-              "x": 225.2491412605234,
-              "y": 94.57035639603009
-            },
-            "p1": {
-              "x": 0.5112460408552416,
-              "y": -0.07415022000257976
-            },
-            "p2": {
-              "x": -0.45605469521706254,
-              "y": -0.4634103221762871
+            "controlName": "100-programming-fundamentals"
+          },
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "TextArea",
+                  "zOrder": "0",
+                  "w": "295",
+                  "h": "50",
+                  "measuredW": "200",
+                  "measuredH": "140",
+                  "x": "0",
+                  "y": "0",
+                  "properties": {
+                    "color": "16776960"
+                  }
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "217",
+                  "measuredH": "25",
+                  "x": "39",
+                  "y": "12",
+                  "properties": {
+                    "size": "17",
+                    "text": "Programming Fundamentals"
+                  }
+                }
+              ]
             }
           }
         },
         {
-          "ID": "2470",
+          "ID": "3328",
           "typeID": "Arrow",
-          "zOrder": "0",
-          "w": "226",
-          "h": "145",
+          "zOrder": "34",
+          "w": "3",
+          "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1158",
-          "y": "1884",
+          "x": "1848",
+          "y": "829",
           "properties": {
-            "curvature": "0",
+            "direction": "bottom",
             "leftArrow": "false",
             "rightArrow": "false",
-            "color": "10027263",
-            "stroke": "dotted",
+            "color": "16777215",
             "p0": {
-              "x": 226.47706272280266,
-              "y": 145.09752175520043
+              "x": 0.14652915468354877,
+              "y": 0.452028801972574
             },
             "p1": {
-              "x": 0.48716510424745796,
-              "y": -0.09050463451557213
+              "x": 0.47345427259831346,
+              "y": -0.00011162392477928299
             },
             "p2": {
-              "x": 0.2240318781412043,
-              "y": 0.17641653110717925
+              "x": 2.7298768229543384,
+              "y": 0.452028801972574
             }
           }
         },
         {
-          "ID": "2471",
+          "ID": "3329",
           "typeID": "Arrow",
-          "zOrder": "69",
+          "zOrder": "35",
           "w": "3",
           "h": "1",
           "measuredW": "150",
           "measuredH": "100",
-          "x": "1061",
-          "y": "2263",
+          "x": "1369",
+          "y": "637",
           "properties": {
             "direction": "bottom",
             "leftArrow": "false",
@@ -1600,17 +1242,17 @@
           }
         },
         {
-          "ID": "2472",
+          "ID": "3330",
           "typeID": "__group__",
-          "zOrder": "33",
-          "measuredW": "295",
-          "measuredH": "50",
-          "w": "295",
-          "h": "50",
-          "x": "1152",
-          "y": "944",
+          "zOrder": "36",
+          "measuredW": "163",
+          "measuredH": "49",
+          "w": "163",
+          "h": "49",
+          "x": "1533",
+          "y": "917",
           "properties": {
-            "controlName": "100-programming-fundamentals"
+            "controlName": "100-programming-fundamentals:python"
           },
           "children": {
             "controls": {
@@ -1619,27 +1261,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "295",
-                  "h": "50",
+                  "w": "163",
+                  "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16776960"
+                    "color": "16770457"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "217",
+                  "measuredW": "53",
                   "measuredH": "25",
-                  "x": "39",
+                  "x": "55",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Programming Fundamentals"
+                    "text": "Python"
                   }
                 }
               ]
@@ -1647,17 +1289,17 @@
           }
         },
         {
-          "ID": "2473",
+          "ID": "3331",
           "typeID": "__group__",
-          "zOrder": "36",
+          "zOrder": "37",
           "measuredW": "163",
           "measuredH": "49",
           "w": "163",
           "h": "49",
           "x": "1533",
-          "y": "917",
+          "y": "971",
           "properties": {
-            "controlName": "100-programming-fundamentals:python"
+            "controlName": "101-programming-fundamentals:bash"
           },
           "children": {
             "controls": {
@@ -1680,13 +1322,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "53",
+                  "measuredW": "40",
                   "measuredH": "25",
-                  "x": "55",
+                  "x": "62",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Python"
+                    "text": "Bash"
                   }
                 }
               ]
@@ -1694,17 +1336,17 @@
           }
         },
         {
-          "ID": "2474",
+          "ID": "3332",
           "typeID": "__group__",
-          "zOrder": "37",
-          "measuredW": "163",
-          "measuredH": "49",
-          "w": "163",
-          "h": "49",
-          "x": "1533",
-          "y": "971",
+          "zOrder": "38",
+          "measuredW": "172",
+          "measuredH": "50",
+          "w": "172",
+          "h": "50",
+          "x": "1286",
+          "y": "1328",
           "properties": {
-            "controlName": "101-programming-fundamentals:bash"
+            "controlName": "103-containerization"
           },
           "children": {
             "controls": {
@@ -1713,27 +1355,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "163",
-                  "h": "49",
+                  "w": "172",
+                  "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "color": "16776960"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "40",
+                  "measuredW": "126",
                   "measuredH": "25",
-                  "x": "62",
+                  "x": "23",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Bash"
+                    "text": "Containerization"
                   }
                 }
               ]
@@ -1741,17 +1383,17 @@
           }
         },
         {
-          "ID": "2475",
+          "ID": "3333",
           "typeID": "__group__",
-          "zOrder": "61",
-          "measuredW": "295",
+          "zOrder": "39",
+          "measuredW": "164",
           "measuredH": "49",
-          "w": "295",
+          "w": "164",
           "h": "49",
-          "x": "1152",
-          "y": "1098",
+          "x": "1535",
+          "y": "1299",
           "properties": {
-            "controlName": "101-version-control-systems"
+            "controlName": "100-containerization:docker"
           },
           "children": {
             "controls": {
@@ -1760,27 +1402,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "295",
+                  "w": "164",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16776960"
+                    "color": "16770457"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "186",
+                  "measuredW": "56",
                   "measuredH": "25",
-                  "x": "55",
+                  "x": "54",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Version Control Systems"
+                    "text": "Docker"
                   }
                 }
               ]
@@ -1788,17 +1430,17 @@
           }
         },
         {
-          "ID": "2476",
+          "ID": "3334",
           "typeID": "__group__",
-          "zOrder": "19",
-          "measuredW": "163",
+          "zOrder": "40",
+          "measuredW": "164",
           "measuredH": "49",
-          "w": "163",
+          "w": "164",
           "h": "49",
-          "x": "1533",
-          "y": "1070",
+          "x": "1535",
+          "y": "1353",
           "properties": {
-            "controlName": "100-version-control-systems:git"
+            "controlName": "101-containerization:kubernetes"
           },
           "children": {
             "controls": {
@@ -1807,7 +1449,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "163",
+                  "w": "164",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -1821,13 +1463,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "22",
+                  "measuredW": "90",
                   "measuredH": "25",
-                  "x": "71",
+                  "x": "37",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Git"
+                    "text": "Kubernetes"
                   }
                 }
               ]
@@ -1835,17 +1477,17 @@
           }
         },
         {
-          "ID": "2477",
+          "ID": "3335",
           "typeID": "__group__",
-          "zOrder": "20",
-          "measuredW": "163",
-          "measuredH": "49",
-          "w": "163",
-          "h": "49",
-          "x": "1533",
-          "y": "1124",
+          "zOrder": "41",
+          "measuredW": "305",
+          "measuredH": "50",
+          "w": "305",
+          "h": "50",
+          "x": "905",
+          "y": "1730",
           "properties": {
-            "controlName": "101-version-control-systems:github"
+            "controlName": "106-mlops-principles"
           },
           "children": {
             "controls": {
@@ -1854,27 +1496,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "163",
-                  "h": "49",
+                  "w": "305",
+                  "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "color": "16776960"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "54",
+                  "measuredW": "136",
                   "measuredH": "25",
-                  "x": "55",
+                  "x": "85",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "GitHub"
+                    "text": "MLOps Principles"
                   }
                 }
               ]
@@ -1882,17 +1524,17 @@
           }
         },
         {
-          "ID": "2478",
+          "ID": "3336",
           "typeID": "__group__",
-          "zOrder": "62",
-          "measuredW": "205",
+          "zOrder": "42",
+          "measuredW": "299",
           "measuredH": "50",
-          "w": "205",
+          "w": "299",
           "h": "50",
-          "x": "905",
-          "y": "1318",
+          "x": "904",
+          "y": "1840",
           "properties": {
-            "controlName": "102-cloud-computing"
+            "controlName": "107-mlops-components"
           },
           "children": {
             "controls": {
@@ -1901,7 +1543,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "205",
+                  "w": "299",
                   "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -1915,13 +1557,60 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "133",
+                  "measuredW": "158",
+                  "measuredH": "25",
+                  "x": "71",
+                  "y": "12",
+                  "properties": {
+                    "size": "17",
+                    "text": "MLOps Components"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        {
+          "ID": "3337",
+          "typeID": "__group__",
+          "zOrder": "43",
+          "measuredW": "357",
+          "measuredH": "49",
+          "w": "357",
+          "h": "49",
+          "x": "1377",
+          "y": "1679",
+          "properties": {
+            "controlName": "100-mlops-components:version-control"
+          },
+          "children": {
+            "controls": {
+              "control": [
+                {
+                  "ID": "0",
+                  "typeID": "TextArea",
+                  "zOrder": "0",
+                  "w": "357",
+                  "h": "49",
+                  "measuredW": "200",
+                  "measuredH": "140",
+                  "x": "0",
+                  "y": "0",
+                  "properties": {
+                    "color": "16770457"
+                  }
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "118",
                   "measuredH": "25",
-                  "x": "36",
+                  "x": "120",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Cloud Computing"
+                    "text": "Version Control"
                   }
                 }
               ]
@@ -1929,17 +1618,17 @@
           }
         },
         {
-          "ID": "2479",
+          "ID": "3338",
           "typeID": "__group__",
-          "zOrder": "63",
-          "measuredW": "237",
+          "zOrder": "44",
+          "measuredW": "357",
           "measuredH": "49",
-          "w": "237",
+          "w": "357",
           "h": "49",
-          "x": "600",
-          "y": "1318",
+          "x": "1377",
+          "y": "1733",
           "properties": {
-            "controlName": "100-cloud-computing:aws-azure-gcp"
+            "controlName": "101-mlops-components:ci-cd"
           },
           "children": {
             "controls": {
@@ -1948,7 +1637,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "237",
+                  "w": "357",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -1962,13 +1651,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "149",
+                  "measuredW": "59",
                   "measuredH": "25",
-                  "x": "44",
+                  "x": "149",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "AWS / Azure / GCP"
+                    "text": "CI / CD"
                   }
                 }
               ]
@@ -1976,17 +1665,17 @@
           }
         },
         {
-          "ID": "2480",
+          "ID": "3339",
           "typeID": "__group__",
-          "zOrder": "64",
-          "measuredW": "237",
+          "zOrder": "45",
+          "measuredW": "358",
           "measuredH": "49",
-          "w": "237",
+          "w": "358",
           "h": "49",
-          "x": "600",
-          "y": "1373",
+          "x": "1377",
+          "y": "1787",
           "properties": {
-            "controlName": "101-cloud-computing:cloud-native-ml-services"
+            "controlName": "102-mlops-components:orchestration"
           },
           "children": {
             "controls": {
@@ -1995,7 +1684,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "237",
+                  "w": "358",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2009,13 +1698,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "197",
+                  "measuredW": "105",
                   "measuredH": "25",
-                  "x": "20",
+                  "x": "126",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Cloud-native ML Services"
+                    "text": "Orchestration"
                   }
                 }
               ]
@@ -2023,17 +1712,17 @@
           }
         },
         {
-          "ID": "2481",
+          "ID": "3340",
           "typeID": "__group__",
-          "zOrder": "38",
-          "measuredW": "172",
-          "measuredH": "50",
-          "w": "172",
-          "h": "50",
-          "x": "1286",
-          "y": "1328",
+          "zOrder": "46",
+          "measuredW": "358",
+          "measuredH": "49",
+          "w": "358",
+          "h": "49",
+          "x": "1377",
+          "y": "1841",
           "properties": {
-            "controlName": "103-containerization"
+            "controlName": "103-mlops-components:experiment-tracking"
           },
           "children": {
             "controls": {
@@ -2042,27 +1731,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "172",
-                  "h": "50",
+                  "w": "358",
+                  "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16776960"
+                    "color": "16770457"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "126",
+                  "measuredW": "313",
                   "measuredH": "25",
-                  "x": "23",
+                  "x": "22",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Containerization"
+                    "text": "Experiment Tracking and Model Registry"
                   }
                 }
               ]
@@ -2070,17 +1759,17 @@
           }
         },
         {
-          "ID": "2482",
+          "ID": "3341",
           "typeID": "__group__",
-          "zOrder": "39",
-          "measuredW": "164",
+          "zOrder": "47",
+          "measuredW": "358",
           "measuredH": "49",
-          "w": "164",
+          "w": "358",
           "h": "49",
-          "x": "1535",
-          "y": "1299",
+          "x": "1377",
+          "y": "1895",
           "properties": {
-            "controlName": "100-containerization:docker"
+            "controlName": "104-mlops-components:data-lineage"
           },
           "children": {
             "controls": {
@@ -2089,7 +1778,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "164",
+                  "w": "358",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2103,13 +1792,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "56",
+                  "measuredW": "256",
                   "measuredH": "25",
-                  "x": "54",
+                  "x": "51",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Docker"
+                    "text": "Data Lineage and Feature Stores"
                   }
                 }
               ]
@@ -2117,17 +1806,17 @@
           }
         },
         {
-          "ID": "2483",
+          "ID": "3342",
           "typeID": "__group__",
-          "zOrder": "40",
-          "measuredW": "164",
+          "zOrder": "48",
+          "measuredW": "358",
           "measuredH": "49",
-          "w": "164",
+          "w": "358",
           "h": "49",
-          "x": "1535",
-          "y": "1353",
+          "x": "1377",
+          "y": "1949",
           "properties": {
-            "controlName": "101-containerization:kubernetes"
+            "controlName": "105-mlops-components:model-training"
           },
           "children": {
             "controls": {
@@ -2136,7 +1825,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "164",
+                  "w": "358",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2150,13 +1839,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "90",
+                  "measuredW": "210",
                   "measuredH": "25",
-                  "x": "37",
+                  "x": "74",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Kubernetes"
+                    "text": "Model Training and Serving"
                   }
                 }
               ]
@@ -2164,17 +1853,17 @@
           }
         },
         {
-          "ID": "2484",
+          "ID": "3343",
           "typeID": "__group__",
-          "zOrder": "55",
-          "measuredW": "299",
-          "measuredH": "50",
-          "w": "299",
-          "h": "50",
-          "x": "1296",
-          "y": "1564",
+          "zOrder": "49",
+          "measuredW": "358",
+          "measuredH": "49",
+          "w": "358",
+          "h": "49",
+          "x": "1377",
+          "y": "2004",
           "properties": {
-            "controlName": "104-ml-fundamentals"
+            "controlName": "106-mlops-components:monitoring"
           },
           "children": {
             "controls": {
@@ -2183,27 +1872,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "299",
-                  "h": "50",
+                  "w": "358",
+                  "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16776960"
+                    "color": "16770457"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "253",
+                  "measuredW": "220",
                   "measuredH": "25",
-                  "x": "23",
+                  "x": "69",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Machine Learning Fundamentals"
+                    "text": "Monitoring and Observability"
                   }
                 }
               ]
@@ -2211,93 +1900,147 @@
           }
         },
         {
-          "ID": "2485",
+          "ID": "3344",
           "typeID": "__group__",
-          "zOrder": "65",
-          "measuredW": "305",
-          "measuredH": "50",
-          "w": "305",
-          "h": "50",
-          "x": "905",
-          "y": "1565",
-          "properties": {
-            "controlName": "105-data-eng-fundamentals"
-          },
+          "zOrder": "50",
+          "measuredW": "473",
+          "measuredH": "147",
+          "w": "473",
+          "h": "147",
+          "x": "600",
+          "y": "660",
           "children": {
             "controls": {
               "control": [
                 {
                   "ID": "0",
-                  "typeID": "TextArea",
+                  "typeID": "Canvas",
                   "zOrder": "0",
-                  "w": "305",
-                  "h": "50",
-                  "measuredW": "200",
-                  "measuredH": "140",
+                  "w": "473",
+                  "h": "147",
+                  "measuredW": "100",
+                  "measuredH": "70",
                   "x": "0",
-                  "y": "0",
+                  "y": "0"
+                },
+                {
+                  "ID": "1",
+                  "typeID": "Label",
+                  "zOrder": "1",
+                  "measuredW": "238",
+                  "measuredH": "26",
+                  "x": "21",
+                  "y": "65",
                   "properties": {
-                    "color": "16776960"
+                    "size": "18",
+                    "text": "This roadmap was created by"
+                  }
+                },
+                {
+                  "ID": "2",
+                  "typeID": "Label",
+                  "zOrder": "2",
+                  "measuredW": "37",
+                  "measuredH": "26",
+                  "x": "21",
+                  "y": "97",
+                  "properties": {
+                    "size": "18",
+                    "text": "from"
+                  }
+                },
+                {
+                  "ID": "6",
+                  "typeID": "__group__",
+                  "zOrder": "3",
+                  "measuredW": "151",
+                  "measuredH": "26",
+                  "w": "151",
+                  "h": "26",
+                  "x": "265",
+                  "y": "65",
+                  "properties": {
+                    "controlName": "ext_link:bit.ly/maria-mlops"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Label",
+                          "zOrder": "0",
+                          "measuredW": "151",
+                          "measuredH": "26",
+                          "x": "0",
+                          "y": "0",
+                          "properties": {
+                            "size": "18",
+                            "color": "10027263",
+                            "text": "Maria Vechtomova"
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "ID": "8",
+                  "typeID": "__group__",
+                  "zOrder": "4",
+                  "measuredW": "148",
+                  "measuredH": "26",
+                  "w": "148",
+                  "h": "26",
+                  "x": "65",
+                  "y": "97",
+                  "properties": {
+                    "controlName": "ext_link:bit.ly/marvelousmlops-mlops"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Label",
+                          "zOrder": "0",
+                          "measuredW": "148",
+                          "measuredH": "26",
+                          "x": "0",
+                          "y": "0",
+                          "properties": {
+                            "color": "10027263",
+                            "size": "18",
+                            "text": "Marvelous MLOps"
+                          }
+                        }
+                      ]
+                    }
                   }
                 },
                 {
-                  "ID": "1",
+                  "ID": "9",
                   "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "249",
-                  "measuredH": "25",
-                  "x": "28",
-                  "y": "12",
-                  "properties": {
-                    "size": "17",
-                    "text": "Data Engineering Fundamentals"
-                  }
-                }
-              ]
-            }
-          }
-        },
-        {
-          "ID": "2486",
-          "typeID": "__group__",
-          "zOrder": "66",
-          "measuredW": "237",
-          "measuredH": "49",
-          "w": "237",
-          "h": "49",
-          "x": "600",
-          "y": "1514",
-          "properties": {
-            "controlName": "100-data-eng-fundamentals:data-pipelines"
-          },
-          "children": {
-            "controls": {
-              "control": [
-                {
-                  "ID": "0",
-                  "typeID": "TextArea",
-                  "zOrder": "0",
-                  "w": "237",
-                  "h": "49",
-                  "measuredW": "200",
-                  "measuredH": "140",
-                  "x": "0",
-                  "y": "0",
+                  "zOrder": "5",
+                  "measuredW": "166",
+                  "measuredH": "26",
+                  "x": "220",
+                  "y": "97",
                   "properties": {
-                    "color": "16770457"
+                    "size": "18",
+                    "text": ". Do check them out!"
                   }
                 },
                 {
-                  "ID": "1",
+                  "ID": "10",
                   "typeID": "Label",
-                  "zOrder": "1",
-                  "measuredW": "112",
-                  "measuredH": "25",
-                  "x": "63",
-                  "y": "12",
+                  "zOrder": "6",
+                  "measuredW": "163",
+                  "measuredH": "32",
+                  "x": "21",
+                  "y": "23",
                   "properties": {
-                    "size": "17",
-                    "text": "Data Pipelines"
+                    "size": "24",
+                    "text": "Special thanks!"
                   }
                 }
               ]
@@ -2305,17 +2048,17 @@
           }
         },
         {
-          "ID": "2487",
+          "ID": "3349",
           "typeID": "__group__",
-          "zOrder": "67",
-          "measuredW": "237",
-          "measuredH": "49",
-          "w": "237",
-          "h": "49",
-          "x": "600",
-          "y": "1569",
+          "zOrder": "51",
+          "measuredW": "299",
+          "measuredH": "50",
+          "w": "299",
+          "h": "50",
+          "x": "1296",
+          "y": "1564",
           "properties": {
-            "controlName": "101-data-eng-fundamentals:data-lakes-warehouses"
+            "controlName": "104-ml-fundamentals"
           },
           "children": {
             "controls": {
@@ -2324,27 +2067,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "237",
-                  "h": "49",
+                  "w": "299",
+                  "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "color": "16776960"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "197",
+                  "measuredW": "253",
                   "measuredH": "25",
-                  "x": "20",
+                  "x": "23",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Data lakes & Warehouses"
+                    "text": "Machine Learning Fundamentals"
                   }
                 }
               ]
@@ -2352,17 +2095,17 @@
           }
         },
         {
-          "ID": "2488",
+          "ID": "3350",
           "typeID": "__group__",
-          "zOrder": "68",
-          "measuredW": "237",
-          "measuredH": "49",
-          "w": "237",
-          "h": "49",
-          "x": "600",
-          "y": "1623",
+          "zOrder": "52",
+          "measuredW": "299",
+          "measuredH": "50",
+          "w": "299",
+          "h": "50",
+          "x": "908",
+          "y": "1997",
           "properties": {
-            "controlName": "102-data-eng-fundamentals:spark-airflow-kafka"
+            "controlName": "108-infra-as-code"
           },
           "children": {
             "controls": {
@@ -2371,27 +2114,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "237",
-                  "h": "49",
+                  "w": "299",
+                  "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "color": "16776960"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "171",
+                  "measuredW": "174",
                   "measuredH": "25",
-                  "x": "33",
+                  "x": "63",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Spark / Airflow / Kafka"
+                    "text": "Infrastructure as Code"
                   }
                 }
               ]
@@ -2399,17 +2142,17 @@
           }
         },
         {
-          "ID": "2489",
+          "ID": "3355",
           "typeID": "__group__",
-          "zOrder": "41",
-          "measuredW": "305",
-          "measuredH": "50",
-          "w": "305",
-          "h": "50",
-          "x": "905",
-          "y": "1730",
+          "zOrder": "54",
+          "measuredW": "295",
+          "measuredH": "49",
+          "w": "295",
+          "h": "49",
+          "x": "1152",
+          "y": "1098",
           "properties": {
-            "controlName": "106-mlops-principles"
+            "controlName": "101-version-control-systems"
           },
           "children": {
             "controls": {
@@ -2418,8 +2161,8 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "305",
-                  "h": "50",
+                  "w": "295",
+                  "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
@@ -2432,13 +2175,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "136",
+                  "measuredW": "186",
                   "measuredH": "25",
-                  "x": "85",
+                  "x": "55",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "MLOps Principles"
+                    "text": "Version Control Systems"
                   }
                 }
               ]
@@ -2446,17 +2189,17 @@
           }
         },
         {
-          "ID": "2491",
+          "ID": "3356",
           "typeID": "__group__",
-          "zOrder": "42",
-          "measuredW": "299",
+          "zOrder": "55",
+          "measuredW": "205",
           "measuredH": "50",
-          "w": "299",
+          "w": "205",
           "h": "50",
-          "x": "904",
-          "y": "1840",
+          "x": "905",
+          "y": "1318",
           "properties": {
-            "controlName": "107-mlops-components"
+            "controlName": "102-cloud-computing"
           },
           "children": {
             "controls": {
@@ -2465,7 +2208,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "299",
+                  "w": "205",
                   "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2479,13 +2222,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "158",
+                  "measuredW": "133",
                   "measuredH": "25",
-                  "x": "71",
+                  "x": "36",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "MLOps Components"
+                    "text": "Cloud Computing"
                   }
                 }
               ]
@@ -2493,17 +2236,17 @@
           }
         },
         {
-          "ID": "2492",
+          "ID": "3357",
           "typeID": "__group__",
           "zOrder": "56",
-          "measuredW": "299",
-          "measuredH": "50",
-          "w": "299",
-          "h": "50",
-          "x": "908",
-          "y": "1997",
+          "measuredW": "237",
+          "measuredH": "49",
+          "w": "237",
+          "h": "49",
+          "x": "600",
+          "y": "1318",
           "properties": {
-            "controlName": "108-infra-as-code"
+            "controlName": "100-cloud-computing:aws-azure-gcp"
           },
           "children": {
             "controls": {
@@ -2512,27 +2255,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "299",
-                  "h": "50",
+                  "w": "237",
+                  "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16776960"
+                    "color": "16770457"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "174",
+                  "measuredW": "149",
                   "measuredH": "25",
-                  "x": "63",
+                  "x": "44",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Infrastructure as Code"
+                    "text": "AWS / Azure / GCP"
                   }
                 }
               ]
@@ -2540,17 +2283,17 @@
           }
         },
         {
-          "ID": "2493",
+          "ID": "3358",
           "typeID": "__group__",
-          "zOrder": "43",
-          "measuredW": "357",
+          "zOrder": "57",
+          "measuredW": "237",
           "measuredH": "49",
-          "w": "357",
+          "w": "237",
           "h": "49",
-          "x": "1377",
-          "y": "1679",
+          "x": "600",
+          "y": "1373",
           "properties": {
-            "controlName": "100-mlops-components:version-control"
+            "controlName": "101-cloud-computing:cloud-native-ml-services"
           },
           "children": {
             "controls": {
@@ -2559,7 +2302,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "357",
+                  "w": "237",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2573,13 +2316,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "118",
+                  "measuredW": "197",
                   "measuredH": "25",
-                  "x": "120",
+                  "x": "20",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Version Control"
+                    "text": "Cloud-native ML Services"
                   }
                 }
               ]
@@ -2587,17 +2330,17 @@
           }
         },
         {
-          "ID": "2494",
+          "ID": "3359",
           "typeID": "__group__",
-          "zOrder": "44",
-          "measuredW": "357",
-          "measuredH": "49",
-          "w": "357",
-          "h": "49",
-          "x": "1377",
-          "y": "1733",
+          "zOrder": "58",
+          "measuredW": "305",
+          "measuredH": "50",
+          "w": "305",
+          "h": "50",
+          "x": "905",
+          "y": "1565",
           "properties": {
-            "controlName": "101-mlops-components:ci-cd"
+            "controlName": "105-data-eng-fundamentals"
           },
           "children": {
             "controls": {
@@ -2606,27 +2349,27 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "357",
-                  "h": "49",
+                  "w": "305",
+                  "h": "50",
                   "measuredW": "200",
                   "measuredH": "140",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "color": "16776960"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "59",
+                  "measuredW": "249",
                   "measuredH": "25",
-                  "x": "149",
+                  "x": "28",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "CI / CD"
+                    "text": "Data Engineering Fundamentals"
                   }
                 }
               ]
@@ -2634,17 +2377,17 @@
           }
         },
         {
-          "ID": "2495",
+          "ID": "3360",
           "typeID": "__group__",
-          "zOrder": "45",
-          "measuredW": "358",
+          "zOrder": "59",
+          "measuredW": "237",
           "measuredH": "49",
-          "w": "358",
+          "w": "237",
           "h": "49",
-          "x": "1377",
-          "y": "1787",
+          "x": "600",
+          "y": "1514",
           "properties": {
-            "controlName": "102-mlops-components:orchestration"
+            "controlName": "100-data-eng-fundamentals:data-pipelines"
           },
           "children": {
             "controls": {
@@ -2653,7 +2396,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "358",
+                  "w": "237",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2667,13 +2410,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "105",
+                  "measuredW": "112",
                   "measuredH": "25",
-                  "x": "126",
+                  "x": "63",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Orchestration"
+                    "text": "Data Pipelines"
                   }
                 }
               ]
@@ -2681,17 +2424,17 @@
           }
         },
         {
-          "ID": "2496",
+          "ID": "3361",
           "typeID": "__group__",
-          "zOrder": "46",
-          "measuredW": "358",
+          "zOrder": "60",
+          "measuredW": "237",
           "measuredH": "49",
-          "w": "358",
+          "w": "237",
           "h": "49",
-          "x": "1377",
-          "y": "1841",
+          "x": "600",
+          "y": "1569",
           "properties": {
-            "controlName": "103-mlops-components:experiment-tracking"
+            "controlName": "101-data-eng-fundamentals:data-lakes-warehouses"
           },
           "children": {
             "controls": {
@@ -2700,7 +2443,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "358",
+                  "w": "237",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2714,13 +2457,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "313",
+                  "measuredW": "197",
                   "measuredH": "25",
-                  "x": "22",
+                  "x": "20",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Experiment Tracking and Model Registry"
+                    "text": "Data lakes & Warehouses"
                   }
                 }
               ]
@@ -2728,17 +2471,17 @@
           }
         },
         {
-          "ID": "2497",
+          "ID": "3362",
           "typeID": "__group__",
-          "zOrder": "47",
-          "measuredW": "358",
+          "zOrder": "61",
+          "measuredW": "237",
           "measuredH": "49",
-          "w": "358",
+          "w": "237",
           "h": "49",
-          "x": "1377",
-          "y": "1895",
+          "x": "600",
+          "y": "1623",
           "properties": {
-            "controlName": "104-mlops-components:data-lineage"
+            "controlName": "102-data-eng-fundamentals:spark-airflow-kafka"
           },
           "children": {
             "controls": {
@@ -2747,7 +2490,7 @@
                   "ID": "0",
                   "typeID": "TextArea",
                   "zOrder": "0",
-                  "w": "358",
+                  "w": "237",
                   "h": "49",
                   "measuredW": "200",
                   "measuredH": "140",
@@ -2761,13 +2504,13 @@
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "256",
+                  "measuredW": "171",
                   "measuredH": "25",
-                  "x": "51",
+                  "x": "33",
                   "y": "12",
                   "properties": {
                     "size": "17",
-                    "text": "Data Lineage and Feature Stores"
+                    "text": "Spark / Airflow / Kafka"
                   }
                 }
               ]
@@ -2775,46 +2518,315 @@
           }
         },
         {
-          "ID": "2498",
-          "typeID": "__group__",
-          "zOrder": "48",
-          "measuredW": "358",
-          "measuredH": "49",
-          "w": "358",
-          "h": "49",
-          "x": "1377",
-          "y": "1949",
+          "ID": "3363",
+          "typeID": "Arrow",
+          "zOrder": "62",
+          "w": "3",
+          "h": "1",
+          "measuredW": "150",
+          "measuredH": "100",
+          "x": "1061",
+          "y": "2263",
           "properties": {
-            "controlName": "105-mlops-components:model-training"
-          },
+            "direction": "bottom",
+            "leftArrow": "false",
+            "rightArrow": "false",
+            "color": "16777215",
+            "p0": {
+              "x": 0.14652915468354877,
+              "y": 0.452028801972574
+            },
+            "p1": {
+              "x": 0.47345427259831346,
+              "y": -0.00011162392477928299
+            },
+            "p2": {
+              "x": 2.7298768229543384,
+              "y": 0.452028801972574
+            }
+          }
+        },
+        {
+          "ID": "3370",
+          "typeID": "__group__",
+          "zOrder": "28",
+          "measuredW": "473",
+          "measuredH": "175",
+          "w": "473",
+          "h": "175",
+          "x": "600",
+          "y": "922",
           "children": {
             "controls": {
               "control": [
                 {
                   "ID": "0",
-                  "typeID": "TextArea",
+                  "typeID": "Canvas",
                   "zOrder": "0",
-                  "w": "358",
-                  "h": "49",
-                  "measuredW": "200",
-                  "measuredH": "140",
+                  "w": "473",
+                  "h": "175",
+                  "measuredW": "100",
+                  "measuredH": "70",
                   "x": "0",
-                  "y": "0",
-                  "properties": {
-                    "color": "16770457"
-                  }
+                  "y": "0"
                 },
                 {
                   "ID": "1",
-                  "typeID": "Label",
+                  "typeID": "__group__",
                   "zOrder": "1",
-                  "measuredW": "210",
-                  "measuredH": "25",
-                  "x": "74",
-                  "y": "12",
+                  "measuredW": "287",
+                  "measuredH": "27",
+                  "w": "287",
+                  "h": "27",
+                  "x": "26",
+                  "y": "79",
+                  "properties": {
+                    "controlName": "ext_link:roadmap.sh/ai-data-scientist"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Label",
+                          "zOrder": "0",
+                          "measuredW": "254",
+                          "measuredH": "26",
+                          "x": "33",
+                          "y": "0",
+                          "properties": {
+                            "size": "18",
+                            "text": "AI and Data Scientist Roadmap"
+                          }
+                        },
+                        {
+                          "ID": "1",
+                          "typeID": "__group__",
+                          "zOrder": "1",
+                          "measuredW": "24",
+                          "measuredH": "24",
+                          "w": "24",
+                          "h": "24",
+                          "x": "0",
+                          "y": "3",
+                          "children": {
+                            "controls": {
+                              "control": [
+                                {
+                                  "ID": "0",
+                                  "typeID": "Icon",
+                                  "zOrder": "0",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "16777215",
+                                    "icon": {
+                                      "ID": "circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                },
+                                {
+                                  "ID": "1",
+                                  "typeID": "Icon",
+                                  "zOrder": "1",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "10066329",
+                                    "icon": {
+                                      "ID": "check-circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "ID": "2",
+                  "typeID": "Label",
+                  "zOrder": "2",
+                  "measuredW": "209",
+                  "measuredH": "32",
+                  "x": "26",
+                  "y": "34",
                   "properties": {
-                    "size": "17",
-                    "text": "Model Training and Serving"
+                    "size": "24",
+                    "text": "Related Roadmaps"
+                  }
+                },
+                {
+                  "ID": "3",
+                  "typeID": "__group__",
+                  "zOrder": "3",
+                  "measuredW": "183",
+                  "measuredH": "27",
+                  "w": "183",
+                  "h": "27",
+                  "x": "26",
+                  "y": "117",
+                  "properties": {
+                    "controlName": "ext_link:roadmap.sh/devops"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Label",
+                          "zOrder": "0",
+                          "measuredW": "150",
+                          "measuredH": "26",
+                          "x": "33",
+                          "y": "0",
+                          "properties": {
+                            "size": "18",
+                            "text": "DevOps Roadmap"
+                          }
+                        },
+                        {
+                          "ID": "1",
+                          "typeID": "__group__",
+                          "zOrder": "1",
+                          "measuredW": "24",
+                          "measuredH": "24",
+                          "w": "24",
+                          "h": "24",
+                          "x": "0",
+                          "y": "3",
+                          "children": {
+                            "controls": {
+                              "control": [
+                                {
+                                  "ID": "0",
+                                  "typeID": "Icon",
+                                  "zOrder": "0",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "16777215",
+                                    "icon": {
+                                      "ID": "circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                },
+                                {
+                                  "ID": "1",
+                                  "typeID": "Icon",
+                                  "zOrder": "1",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "10066329",
+                                    "icon": {
+                                      "ID": "check-circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "ID": "4",
+                  "typeID": "__group__",
+                  "zOrder": "4",
+                  "measuredW": "189",
+                  "measuredH": "27",
+                  "w": "189",
+                  "h": "27",
+                  "x": "235",
+                  "y": "117",
+                  "properties": {
+                    "controlName": "ext_link:roadmap.sh/backend"
+                  },
+                  "children": {
+                    "controls": {
+                      "control": [
+                        {
+                          "ID": "0",
+                          "typeID": "Label",
+                          "zOrder": "0",
+                          "measuredW": "156",
+                          "measuredH": "26",
+                          "x": "33",
+                          "y": "0",
+                          "properties": {
+                            "size": "18",
+                            "text": "Backend Roadmap"
+                          }
+                        },
+                        {
+                          "ID": "1",
+                          "typeID": "__group__",
+                          "zOrder": "1",
+                          "measuredW": "24",
+                          "measuredH": "24",
+                          "w": "24",
+                          "h": "24",
+                          "x": "0",
+                          "y": "3",
+                          "children": {
+                            "controls": {
+                              "control": [
+                                {
+                                  "ID": "0",
+                                  "typeID": "Icon",
+                                  "zOrder": "0",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "16777215",
+                                    "icon": {
+                                      "ID": "circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                },
+                                {
+                                  "ID": "1",
+                                  "typeID": "Icon",
+                                  "zOrder": "1",
+                                  "measuredW": "24",
+                                  "measuredH": "24",
+                                  "x": "0",
+                                  "y": "0",
+                                  "properties": {
+                                    "color": "10066329",
+                                    "icon": {
+                                      "ID": "check-circle",
+                                      "size": "small"
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          }
+                        }
+                      ]
+                    }
                   }
                 }
               ]
@@ -2822,46 +2834,68 @@
           }
         },
         {
-          "ID": "2499",
+          "ID": "3371",
           "typeID": "__group__",
-          "zOrder": "49",
-          "measuredW": "358",
-          "measuredH": "49",
-          "w": "358",
-          "h": "49",
-          "x": "1377",
-          "y": "2004",
-          "properties": {
-            "controlName": "106-mlops-components:monitoring"
-          },
+          "zOrder": "53",
+          "measuredW": "461",
+          "measuredH": "127",
+          "w": "461",
+          "h": "127",
+          "x": "600",
+          "y": "1138",
           "children": {
             "controls": {
               "control": [
                 {
                   "ID": "0",
-                  "typeID": "TextArea",
+                  "typeID": "Label",
                   "zOrder": "0",
-                  "w": "358",
-                  "h": "49",
-                  "measuredW": "200",
-                  "measuredH": "140",
+                  "measuredW": "267",
+                  "measuredH": "32",
                   "x": "0",
                   "y": "0",
                   "properties": {
-                    "color": "16770457"
+                    "size": "24",
+                    "text": "ML vs MLOps Engineers"
                   }
                 },
                 {
                   "ID": "1",
                   "typeID": "Label",
                   "zOrder": "1",
-                  "measuredW": "220",
-                  "measuredH": "25",
-                  "x": "69",
-                  "y": "12",
+                  "measuredW": "460",
+                  "measuredH": "26",
+                  "x": "1",
+                  "y": "41",
                   "properties": {
-                    "size": "17",
-                    "text": "Monitoring and Observability"
+                    "size": "18",
+                    "text": "ML engineers develop models; MLOps engineers deploy"
+                  }
+                },
+                {
+                  "ID": "2",
+                  "typeID": "Label",
+                  "zOrder": "2",
+                  "measuredW": "449",
+                  "measuredH": "26",
+                  "x": "1",
+                  "y": "71",
+                  "properties": {
+                    "size": "18",
+                    "text": "and manage them in production, ensuring reliability and"
+                  }
+                },
+                {
+                  "ID": "3",
+                  "typeID": "Label",
+                  "zOrder": "3",
+                  "measuredW": "81",
+                  "measuredH": "26",
+                  "x": "1",
+                  "y": "101",
+                  "properties": {
+                    "size": "18",
+                    "text": "scalability."
                   }
                 }
               ]
@@ -2871,13 +2905,13 @@
       ]
     },
     "attributes": {
-      "name": "New Wireframe 1 copy 2",
-      "order": 1000018.3019863295,
+      "name": "New Wireframe 1 copy 6",
+      "order": 1000022.7193818908,
       "parentID": null,
       "notes": ""
     },
     "branchID": "Master",
-    "resourceID": "7BDB8D3D-BEB5-4A58-BF91-F519F8754661",
+    "resourceID": "DAF9FB64-BA77-40D4-BCEF-EEE21C480971",
     "mockupH": "1627",
     "mockupW": "1251",
     "measuredW": "1851",
diff --git a/src/lib/resource-progress.ts b/src/lib/resource-progress.ts
index 0b32c9236..bbb4f52d5 100644
--- a/src/lib/resource-progress.ts
+++ b/src/lib/resource-progress.ts
@@ -309,11 +309,11 @@ export async function renderResourceProgress(
 }
 
 function getMatchingElements(
-  quries: string[],
+  queries: string[],
   parentElement: Document | SVGElement | HTMLDivElement = document,
 ): Element[] {
   const matchingElements: Element[] = [];
-  quries.forEach((query) => {
+  queries.forEach((query) => {
     parentElement.querySelectorAll(query).forEach((element) => {
       matchingElements.push(element);
     });
diff --git a/src/pages/team/activity.astro b/src/pages/team/activity.astro
new file mode 100644
index 000000000..8e6789596
--- /dev/null
+++ b/src/pages/team/activity.astro
@@ -0,0 +1,15 @@
+---
+import { TeamSidebar } from '../../components/TeamSidebar';
+import { TeamActivityPage } from '../../components/TeamActivity/TeamActivityPage';
+import AccountLayout from '../../layouts/AccountLayout.astro';
+---
+
+<AccountLayout
+  title='Team Activities'
+  noIndex={true}
+  initialLoadingMessage='Loading activity'
+>
+  <TeamSidebar activePageId='activity' client:load>
+    <TeamActivityPage client:only='react' />
+  </TeamSidebar>
+</AccountLayout>
diff --git a/src/pages/team/progress.astro b/src/pages/team/progress.astro
index 3648d08ee..acdf0f19f 100644
--- a/src/pages/team/progress.astro
+++ b/src/pages/team/progress.astro
@@ -4,8 +4,12 @@ import { TeamProgressPage } from '../../components/TeamProgress/TeamProgressPage
 import AccountLayout from '../../layouts/AccountLayout.astro';
 ---
 
-<AccountLayout title='Team Progress' noIndex={true} initialLoadingMessage='Loading Progress'>
+<AccountLayout
+  title='Team Progress'
+  noIndex={true}
+  initialLoadingMessage='Loading Progress'
+>
   <TeamSidebar activePageId='progress' client:load>
-    <TeamProgressPage client:only="react" />
+    <TeamProgressPage client:only='react' />
   </TeamSidebar>
 </AccountLayout>