diff --git a/src/components/modal/congoptions.tsx b/src/components/modal/congoptions.tsx
index 16ee6834..3943e8b2 100644
--- a/src/components/modal/congoptions.tsx
+++ b/src/components/modal/congoptions.tsx
@@ -1,13 +1,6 @@
 import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
 import { useRollbar } from "@rollbar/react";
-import {
-  set,
-  ref,
-  get,
-  query,
-  orderByChild,
-  DataSnapshot
-} from "firebase/database";
+import { set, ref } from "firebase/database";
 import {
   useState,
   FormEvent,
@@ -35,12 +28,12 @@ import {
   HHOptionProps,
   UpdateCongregationOptionsModalProps
 } from "../../utils/interface";
-import pollingQueryFunction from "../../utils/helpers/pollingquery";
 import GenericInputField from "../form/input";
 import ModalSubmitButton from "../form/submit";
 import { confirmAlert } from "react-confirm-alert";
 import { flushSync } from "react-dom";
 import { usePostHog } from "posthog-js/react";
+import { getOptions } from "../../utils/helpers/getcongoptions";
 
 const UpdateCongregationOptions = NiceModal.create(
   ({ currentCongregation }: UpdateCongregationOptionsModalProps) => {
@@ -184,38 +177,16 @@ const UpdateCongregationOptions = NiceModal.create(
     );
 
     useEffect(() => {
-      const getOptions = async () => {
+      const getHHOptions = async () => {
         try {
-          const optionsSnapshot = await pollingQueryFunction(() =>
-            get(
-              query(
-                ref(
-                  database,
-                  `congregations/${currentCongregation}/options/list`
-                ),
-                orderByChild("sequence")
-              )
-            )
-          );
-          const optionValues: Array<HHOptionProps> = [];
-          optionsSnapshot.forEach((element: DataSnapshot) => {
-            const optionDetails = element.val();
-            const optionCode = element.key as string;
-            const option = {
-              code: optionCode,
-              description: optionDetails.description,
-              isCountable: optionDetails.isCountable || false,
-              isDefault: optionDetails.isDefault || false,
-              sequence: optionDetails.sequence
-            };
-            optionValues.push(option);
-          });
+          const optionValues: Array<HHOptionProps> =
+            await getOptions(currentCongregation);
           setOptions(optionValues);
         } catch (error) {
           errorHandler(error, rollbar);
         }
       };
-      getOptions();
+      getHHOptions();
     }, [currentCongregation]);
 
     return (
diff --git a/src/components/modal/inviteuser.tsx b/src/components/modal/inviteuser.tsx
index c05cd323..4bcf33f1 100644
--- a/src/components/modal/inviteuser.tsx
+++ b/src/components/modal/inviteuser.tsx
@@ -42,7 +42,7 @@ const InviteUser = NiceModal.create(
         }
         const getUserByEmail = httpsCallable(
           functions,
-          CLOUD_FUNCTIONS_CALLS.GET_USER_BY_EMAIL
+          `${import.meta.env.VITE_SYSTEM_ENVIRONMENT}-${CLOUD_FUNCTIONS_CALLS.GET_USER_BY_EMAIL}`
         );
         const user = await getUserByEmail({ email: userEmail });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -61,7 +61,7 @@ const InviteUser = NiceModal.create(
         }
         const updateUserAccess = httpsCallable(
           functions,
-          CLOUD_FUNCTIONS_CALLS.UPDATE_USER_ACCESS
+          `${import.meta.env.VITE_SYSTEM_ENVIRONMENT}-${CLOUD_FUNCTIONS_CALLS.UPDATE_USER_ACCESS}`
         );
         await updateUserAccess({
           uid: userId,
diff --git a/src/components/modal/newprivateadd.tsx b/src/components/modal/newprivateadd.tsx
index b5fdd36c..eaca6cc2 100644
--- a/src/components/modal/newprivateadd.tsx
+++ b/src/components/modal/newprivateadd.tsx
@@ -8,7 +8,8 @@ import {
   TERRITORY_TYPES,
   STATUS_CODES,
   NOT_HOME_STATUS_CODES,
-  WIKI_CATEGORIES
+  WIKI_CATEGORIES,
+  DEFAULT_AGGREGATES
 } from "../../utils/constants";
 import isValidPostal from "../../utils/helpers/checkvalidpostal";
 import isValidPostalSequence from "../../utils/helpers/checkvalidseq";
@@ -112,7 +113,9 @@ const NewPrivateAddress = NiceModal.create(
             location: location,
             units: floorDetails,
             type: TERRITORY_TYPES.PRIVATE,
-            coordinates: coordinates
+            coordinates: coordinates,
+            aggregates: DEFAULT_AGGREGATES,
+            delta: 0
           })
         );
         posthog?.capture("create_private_address", {
diff --git a/src/components/modal/newpublicadd.tsx b/src/components/modal/newpublicadd.tsx
index dbf9244d..3cc08a72 100644
--- a/src/components/modal/newpublicadd.tsx
+++ b/src/components/modal/newpublicadd.tsx
@@ -9,7 +9,8 @@ import {
   TERRITORY_TYPES,
   STATUS_CODES,
   NOT_HOME_STATUS_CODES,
-  WIKI_CATEGORIES
+  WIKI_CATEGORIES,
+  DEFAULT_AGGREGATES
 } from "../../utils/constants";
 import isValidPostal from "../../utils/helpers/checkvalidpostal";
 import isValidPostalSequence from "../../utils/helpers/checkvalidseq";
@@ -116,7 +117,9 @@ const NewPublicAddress = NiceModal.create(
             units: floorDetails,
             type: TERRITORY_TYPES.PUBLIC,
             location: location,
-            coordinates: coordinates
+            coordinates: coordinates,
+            aggregates: DEFAULT_AGGREGATES,
+            delta: 0
           })
         );
         posthog?.capture("create_public_address", {
diff --git a/src/components/modal/newterritorycd.tsx b/src/components/modal/newterritorycd.tsx
index 83abe5d5..da4fd009 100644
--- a/src/components/modal/newterritorycd.tsx
+++ b/src/components/modal/newterritorycd.tsx
@@ -4,7 +4,11 @@ import { child, ref, get, set } from "firebase/database";
 import { useState, FormEvent, ChangeEvent } from "react";
 import { Modal, Form } from "react-bootstrap";
 import { database } from "../../firebase";
-import { USER_ACCESS_LEVELS, WIKI_CATEGORIES } from "../../utils/constants";
+import {
+  DEFAULT_AGGREGATES,
+  USER_ACCESS_LEVELS,
+  WIKI_CATEGORIES
+} from "../../utils/constants";
 import pollingVoidFunction from "../../utils/helpers/pollingvoid";
 import errorHandler from "../../utils/helpers/errorhandler";
 import pollingQueryFunction from "../../utils/helpers/pollingquery";
@@ -45,7 +49,8 @@ const NewTerritoryCode = NiceModal.create(
         }
         await pollingVoidFunction(() =>
           set(territoryCodeReference, {
-            name: name
+            name: name,
+            aggregates: DEFAULT_AGGREGATES
           })
         );
         posthog?.capture("create_territory", {
diff --git a/src/components/modal/updatestatus.tsx b/src/components/modal/updatestatus.tsx
index 51ba903d..08225a19 100644
--- a/src/components/modal/updatestatus.tsx
+++ b/src/components/modal/updatestatus.tsx
@@ -47,6 +47,7 @@ import HelpButton from "../navigation/help";
 import ChangeAddressGeolocation from "./changegeolocation";
 import { getGenerativeModel } from "firebase/vertexai-preview";
 import { usePostHog } from "posthog-js/react";
+import updateAddressDelta from "../../utils/helpers/updateaddressdelta";
 
 const UpdateUnitStatus = NiceModal.create(
   ({
@@ -172,6 +173,7 @@ const UpdateUnitStatus = NiceModal.create(
         );
         const updatedStatusType = updateData.status as string;
         if (updatedStatusType !== status) {
+          await updateAddressDelta(congregation, postalCode);
           posthog?.capture(
             PH_STATUS_KEYS[updatedStatusType] || PH_STATUS_KEYS.DEFAULT,
             {
diff --git a/src/components/modal/updateuser.tsx b/src/components/modal/updateuser.tsx
index dcb4b98f..05cbd4df 100644
--- a/src/components/modal/updateuser.tsx
+++ b/src/components/modal/updateuser.tsx
@@ -36,7 +36,7 @@ const UpdateUser = NiceModal.create(
       try {
         const updateUserAccess = httpsCallable(
           functions,
-          CLOUD_FUNCTIONS_CALLS.UPDATE_USER_ACCESS
+          `${import.meta.env.VITE_SYSTEM_ENVIRONMENT}-${CLOUD_FUNCTIONS_CALLS.UPDATE_USER_ACCESS}`
         );
         await updateUserAccess({
           uid: uid,
diff --git a/src/components/navigation/aggrbadge.tsx b/src/components/navigation/aggrbadge.tsx
index 9f250604..cf9c83dd 100644
--- a/src/components/navigation/aggrbadge.tsx
+++ b/src/components/navigation/aggrbadge.tsx
@@ -1,9 +1,9 @@
 import { memo } from "react";
-import { Badge, Spinner } from "react-bootstrap";
-import { aggregateProp } from "../../utils/interface";
+import { Badge } from "react-bootstrap";
+import { aggregateBadgeProp } from "../../utils/interface";
 
 const AggregationBadge = memo(
-  ({ aggregate = 0, isDataFetched }: aggregateProp) => {
+  ({ aggregate = 0, width = "2.5rem" }: aggregateBadgeProp) => {
     let badgeStyle = "";
     let statusColor = "success";
     if (aggregate > 70 && aggregate <= 90) {
@@ -12,14 +12,15 @@ const AggregationBadge = memo(
     }
     if (aggregate > 90) statusColor = "danger";
     return (
-      <span style={{ marginRight: "0.25rem" }}>
-        {isDataFetched ? (
-          <Badge pill bg={statusColor} className={badgeStyle}>
-            {aggregate}%
-          </Badge>
-        ) : (
-          <Spinner as="span" animation="border" size="sm" aria-hidden="true" />
-        )}
+      <span style={{ margin: "0 0.25rem" }}>
+        <Badge
+          pill
+          bg={statusColor}
+          className={badgeStyle}
+          style={{ width: width }}
+        >
+          {aggregate}%
+        </Badge>
       </span>
     );
   }
diff --git a/src/components/navigation/territorylist.tsx b/src/components/navigation/territorylist.tsx
index 2e5281d7..0ea500f5 100644
--- a/src/components/navigation/territorylist.tsx
+++ b/src/components/navigation/territorylist.tsx
@@ -2,6 +2,7 @@ import { memo } from "react";
 import { Offcanvas, ListGroup } from "react-bootstrap";
 import { TERRITORY_SELECTOR_VIEWPORT_HEIGHT } from "../../utils/constants";
 import { TerritoryListingProps } from "../../utils/interface";
+import AggregationBadge from "./aggrbadge";
 
 const TerritoryListing = memo(
   ({
@@ -36,8 +37,15 @@ const TerritoryListing = memo(
                   key={`list-group-item-${element.code}`}
                   eventKey={element.code}
                   active={selectedTerritory === element.code}
+                  className="d-flex justify-content-between align-items-start"
                 >
-                  {element.code} - {element.name}
+                  <>
+                    {element.code} - {element.name}
+                  </>
+                  <AggregationBadge
+                    aggregate={element.aggregates}
+                    width="3rem"
+                  />
                 </ListGroup.Item>
               ))}
           </ListGroup>
diff --git a/src/components/table/admin.tsx b/src/components/table/admin.tsx
index 815a3ef8..e02db52e 100644
--- a/src/components/table/admin.tsx
+++ b/src/components/table/admin.tsx
@@ -3,7 +3,8 @@ import {
   TERRITORY_TYPES,
   USER_ACCESS_LEVELS,
   DEFAULT_FLOOR_PADDING,
-  DEFAULT_UNIT_DNC_MS_TIME
+  DEFAULT_UNIT_DNC_MS_TIME,
+  DEFAULT_AGGREGATES
 } from "../../utils/constants";
 import ZeroPad from "../../utils/helpers/zeropad";
 import { territoryTableProps } from "../../utils/interface";
@@ -15,7 +16,7 @@ const AdminTable = ({
   postalCode,
   floors,
   maxUnitNumberLength,
-  completedPercent,
+  aggregates,
   policy,
   adminUnitHeaderStyle,
   handleUnitNoUpdate,
@@ -30,7 +31,7 @@ const AdminTable = ({
         isAdmin={true}
         postalCode={postalCode}
         houses={floors[0]}
-        completedPercent={completedPercent}
+        aggregates={aggregates}
         handleHouseUpdate={handleUnitStatusUpdate}
         policy={policy}
       />
@@ -97,7 +98,7 @@ const AdminTable = ({
                 <td
                   className={`text-center align-middle inline-cell ${policy?.getUnitColor(
                     detailsElement,
-                    completedPercent.completedValue
+                    aggregates?.value || DEFAULT_AGGREGATES.value
                   )}`}
                   onClick={handleUnitStatusUpdate}
                   key={`${index}-${detailsElement.number}`}
diff --git a/src/components/table/privatetable.tsx b/src/components/table/privatetable.tsx
index 36ebc7bd..8a532ef4 100644
--- a/src/components/table/privatetable.tsx
+++ b/src/components/table/privatetable.tsx
@@ -1,11 +1,12 @@
 import { Row, Col, Card } from "react-bootstrap";
 import { territoryLandedProps } from "../../utils/interface";
 import UnitStatus from "./unit";
+import { DEFAULT_AGGREGATES } from "../../utils/constants";
 
 const PrivateTerritoryTable = ({
   isAdmin,
   houses,
-  completedPercent,
+  aggregates,
   policy: hhpolicy,
   handleHouseUpdate
 }: territoryLandedProps) => (
@@ -39,7 +40,7 @@ const PrivateTerritoryTable = ({
                 <div
                   className={`landed-unit fluid-bolding fluid-text ${hhpolicy?.getUnitColor(
                     element,
-                    completedPercent.completedValue
+                    aggregates?.value || DEFAULT_AGGREGATES.value
                   )}`}
                   style={{ padding: "0.3rem 0" }}
                 >
diff --git a/src/components/table/publictable.tsx b/src/components/table/publictable.tsx
index 25a8ed92..3420faa9 100644
--- a/src/components/table/publictable.tsx
+++ b/src/components/table/publictable.tsx
@@ -3,11 +3,12 @@ import { territoryTableProps } from "../../utils/interface";
 import TableHeader from "./header";
 import FloorHeader from "./floor";
 import UnitStatus from "./unit";
+import { DEFAULT_AGGREGATES } from "../../utils/constants";
 const PublicTerritoryTable = ({
   postalCode,
   floors,
   maxUnitNumberLength,
-  completedPercent,
+  aggregates,
   policy: hhPolicy,
   handleUnitStatusUpdate
 }: territoryTableProps) => (
@@ -29,7 +30,7 @@ const PublicTerritoryTable = ({
                 <td
                   className={`text-center align-middle inline-cell ${hhPolicy?.getUnitColor(
                     element,
-                    completedPercent.completedValue
+                    aggregates?.value || DEFAULT_AGGREGATES.value
                   )}`}
                   onClick={handleUnitStatusUpdate}
                   data-floor={item.floor}
diff --git a/src/components/table/publisher.tsx b/src/components/table/publisher.tsx
index bc96f41e..f5e3f7ab 100644
--- a/src/components/table/publisher.tsx
+++ b/src/components/table/publisher.tsx
@@ -7,7 +7,7 @@ const PublisherTerritoryTable = ({
   postalCode,
   floors,
   maxUnitNumberLength,
-  completedPercent,
+  aggregates,
   policy: policy,
   territoryType,
   handleUnitStatusUpdate
@@ -19,7 +19,7 @@ const PublisherTerritoryTable = ({
         postalCode={postalCode}
         houses={floors[0]}
         policy={policy}
-        completedPercent={completedPercent}
+        aggregates={aggregates}
         handleHouseUpdate={handleUnitStatusUpdate}
       />
     );
@@ -29,7 +29,7 @@ const PublisherTerritoryTable = ({
       postalCode={postalCode}
       floors={floors}
       maxUnitNumberLength={maxUnitNumberLength}
-      completedPercent={completedPercent}
+      aggregates={aggregates}
       handleUnitStatusUpdate={handleUnitStatusUpdate}
       policy={policy}
     />
diff --git a/src/pages/admin.tsx b/src/pages/admin.tsx
index dc97bd0e..dea29ee1 100644
--- a/src/pages/admin.tsx
+++ b/src/pages/admin.tsx
@@ -67,12 +67,8 @@ import errorHandler from "../utils/helpers/errorhandler";
 import ZeroPad from "../utils/helpers/zeropad";
 import assignmentMessage from "../utils/helpers/assignmentmsg";
 import getMaxUnitLength from "../utils/helpers/maxunitlength";
-import getCompletedPercent from "../utils/helpers/getcompletedpercent";
-import checkCongregationExpireHours from "../utils/helpers/checkcongexp";
 import SetPollerInterval from "../utils/helpers/pollinginterval";
 import pollingVoidFunction from "../utils/helpers/pollingvoid";
-import processCompletedPercentage from "../utils/helpers/processcompletedpercent";
-import checkCongregationMaxTries from "../utils/helpers/checkmaxtries";
 import TerritoryListing from "../components/navigation/territorylist";
 import UserListing from "../components/navigation/userlist";
 import NavBarBranding from "../components/navigation/branding";
@@ -99,20 +95,19 @@ import {
   DEFAULT_CONGREGATION_MAX_TRIES,
   DEFAULT_CONGREGATION_OPTION_IS_MULTIPLE,
   DEFAULT_MAP_DIRECTION_CONGREGATION_LOCATION,
-  CLOUD_FUNCTIONS_CALLS
+  CLOUD_FUNCTIONS_CALLS,
+  DEFAULT_AGGREGATES
 } from "../utils/constants";
 import ModalManager from "@ebay/nice-modal-react";
 import SuspenseComponent from "../components/utils/suspense";
-import getOptions from "../utils/helpers/getcongoptions";
+import { processOptions } from "../utils/helpers/getcongoptions";
 import GetDirection from "../utils/helpers/directiongenerator";
-import getOptionIsMultiSelect from "../utils/helpers/getoptionmultiselect";
-import getCongregationOrigin from "../utils/helpers/getcongorigin";
 import useLocalStorage from "../utils/helpers/storage";
 import CongListing from "../components/navigation/conglist";
-import getCongregationDetails from "../utils/helpers/getcongdetails";
 import setLink from "../utils/helpers/setlink";
 import getTerritoryData from "../utils/helpers/getterritorydetails";
 import { usePostHog } from "posthog-js/react";
+import updateAddressDelta from "../utils/helpers/updateaddressdelta";
 
 const UnauthorizedPage = SuspenseComponent(
   lazy(() => import("../components/statics/unauth"))
@@ -189,9 +184,7 @@ function Admin({ user }: adminProps) {
   const [territories, setTerritories] = useState(
     new Map<string, territoryDetails>()
   );
-  const [sortedAddressList, setSortedAddressList] = useState<
-    Array<territoryDetails>
-  >([]);
+  const [sortedAddressList, setSortedAddressList] = useState<Array<string>>([]);
   const [selectedTerritoryCode, setSelectedTerritoryCode] = useState<string>();
   const [selectedTerritoryName, setSelectedTerritoryName] = useState<string>();
   const [addressData, setAddressData] = useState(
@@ -247,7 +240,7 @@ function Admin({ user }: adminProps) {
   const getUsers = useCallback(async () => {
     const getCongregationUsers = httpsCallable(
       functions,
-      CLOUD_FUNCTIONS_CALLS.GET_CONGREGATION_USERS
+      `${import.meta.env.VITE_SYSTEM_ENVIRONMENT}-${CLOUD_FUNCTIONS_CALLS.GET_CONGREGATION_USERS}`
     );
     try {
       setIsShowingUserListing(true);
@@ -287,21 +280,22 @@ function Admin({ user }: adminProps) {
 
   const processSelectedTerritory = async (selectedTerritoryCode: string) => {
     try {
-      const { territoryAddsResult, territoryNameResult } =
-        await getTerritoryData(code, selectedTerritoryCode);
-
+      const territoryAddsResult = await getTerritoryData(
+        code,
+        selectedTerritoryCode
+      );
       setSelectedTerritoryCode(selectedTerritoryCode);
-      setSelectedTerritoryName(territoryNameResult.val());
-
+      setSelectedTerritoryName(territories.get(selectedTerritoryCode)?.name);
       refreshAddressState();
       unsubscribers.current = [] as Array<Unsubscribe>;
 
+      if (!territoryAddsResult) return;
       const detailsListing = getDetailsListing(territoryAddsResult);
       setSortedAddressList(detailsListing);
 
       const pollerId = SetPollerInterval();
 
-      await processDetailsListing(detailsListing, pollerId);
+      await processAddressListing(detailsListing, pollerId);
     } catch (error) {
       console.error("Error processing selected territory: ", error);
       errorHandler(error, rollbar);
@@ -309,40 +303,34 @@ function Admin({ user }: adminProps) {
   };
 
   const getDetailsListing = (territoryAddsResult: DataSnapshot) => {
-    const detailsListing = [] as Array<territoryDetails>;
+    const detailsListing = [] as Array<string>;
     territoryAddsResult.forEach((addElement: DataSnapshot) => {
-      detailsListing.push({
-        code: addElement.val(),
-        name: "",
-        addresses: ""
-      });
-      return false;
+      detailsListing.push(addElement.val());
     });
     return detailsListing;
   };
 
-  const processDetailsListing = async (
-    detailsListing: Array<territoryDetails>,
+  const processAddressListing = async (
+    addressCodeListing: Array<string>,
     pollerId: NodeJS.Timeout
   ) => {
-    for (const details of detailsListing) {
-      const postalCode = details.code;
-      setAccordionKeys((existingKeys) => [...existingKeys, postalCode]);
+    for (const addressCode of addressCodeListing) {
+      setAccordionKeys((existingKeys) => [...existingKeys, addressCode]);
       unsubscribers.current.push(
         onValue(
-          child(ref(database), `addresses/${code}/${postalCode}`),
+          child(ref(database), `addresses/${code}/${addressCode}`),
           async (snapshot) => {
             clearInterval(pollerId);
             if (snapshot.exists()) {
               const addressData = await getAddressData(
                 code,
-                postalCode,
+                addressCode,
                 snapshot.val()
               );
               setAddressData(
                 (existingAddresses) =>
                   new Map<string, addressDetails>(
-                    existingAddresses.set(postalCode, addressData)
+                    existingAddresses.set(addressCode, addressData)
                   )
               );
             }
@@ -374,7 +362,9 @@ function Admin({ user }: adminProps) {
       type: postalSnapshot.type,
       instructions: postalSnapshot.instructions,
       location: postalSnapshot.location,
-      coordinates: postalSnapshot.coordinates
+      coordinates: postalSnapshot.coordinates,
+      aggregates: postalSnapshot.aggregates,
+      maxUnitLength: getMaxUnitLength(floorData)
     };
   };
 
@@ -530,6 +520,7 @@ function Admin({ user }: adminProps) {
       });
       try {
         await pollingVoidFunction(() => update(ref(database), unitUpdates));
+        await updateAddressDelta(code, postalcode);
         posthog?.capture(`${lowerFloor ? "add_lower" : "add_upper"}_floor`, {
           mapId: postalcode
         });
@@ -589,6 +580,7 @@ function Admin({ user }: adminProps) {
       }
       try {
         await pollingVoidFunction(() => update(ref(database), unitUpdates));
+        await updateAddressDelta(code, postalcode);
         posthog?.capture("reset_block", {
           mapId: postalcode
         });
@@ -717,33 +709,28 @@ function Admin({ user }: adminProps) {
   };
 
   const processCongregationTerritories = (
-    snapshot: DataSnapshot | undefined
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    congregationTerritories: any
   ) => {
+    const territoryList = new Map<string, territoryDetails>();
     try {
-      if (!snapshot) return;
-      const data = snapshot.val();
-      if (!data) return;
-      document.title = data["name"] as string;
-      const congregationTerritories = data["territories"];
-      const territoryList = new Map<string, territoryDetails>();
+      if (!congregationTerritories) return territoryList;
       for (const territory in congregationTerritories) {
         const name = congregationTerritories[territory]["name"];
         const addresses = congregationTerritories[territory]["addresses"];
+        const aggregates =
+          congregationTerritories[territory]["aggregates"]?.value || 0;
         territoryList.set(territory, {
           code: territory,
           name: name,
-          addresses: addresses
+          addresses: addresses,
+          aggregates: aggregates
         });
       }
-      setTerritories(territoryList);
-      setName(data["name"] as string);
-      return territoryList;
     } catch (error) {
       console.error("Error processing congregation territories: ", error);
     }
-  };
-  const getUserAccessLevel = async (congregationCode: string) => {
-    return congregationAccess.current[congregationCode];
+    return territoryList;
   };
 
   const handleTerritorySelect = useCallback(
@@ -932,91 +919,66 @@ function Admin({ user }: adminProps) {
     if (!code) return;
     refreshAddressState();
 
-    Promise.all([
-      getUserAccessLevel(code),
-      checkCongregationExpireHours(code),
-      checkCongregationMaxTries(code),
-      getOptions(code),
-      getOptionIsMultiSelect(code),
-      getCongregationDetails(code),
-      getCongregationOrigin(code)
-    ])
-      .then(
-        ([
-          userAccessLevel,
-          expireHours,
-          maxTries,
-          options,
-          optionIsMultiselect,
-          congregationDetails,
-          origin
-        ]) => {
-          setUserAccessLevel(Number(userAccessLevel));
-          setDefaultExpiryHours(
-            expireHours.exists()
-              ? expireHours.val()
-              : DEFAULT_SELF_DESTRUCT_HOURS
+    setUserAccessLevel(congregationAccess.current[code]);
+    const congregationUnsub = onValue(
+      child(ref(database), `congregations/${code}`),
+      (snapshot) => {
+        try {
+          if (!snapshot.exists()) {
+            setIsUnauthorised(true);
+            errorHandler(
+              `Unauthorised access by ${user.email}`,
+              rollbar,
+              false
+            );
+            return;
+          }
+          const congregationDetails = snapshot.val();
+          const congName = congregationDetails["name"] as string;
+          const expireHours =
+            congregationDetails["expireHours"] || DEFAULT_SELF_DESTRUCT_HOURS;
+          const maxTries =
+            congregationDetails["maxTries"] || DEFAULT_CONGREGATION_MAX_TRIES;
+          const options = processOptions(
+            congregationDetails["options"]["list"]
+          );
+          const optionIsMultiselect =
+            congregationDetails["options"]["isMultiselect"] ||
+            DEFAULT_CONGREGATION_OPTION_IS_MULTIPLE;
+          const origin =
+            congregationDetails["origin"] ||
+            DEFAULT_MAP_DIRECTION_CONGREGATION_LOCATION;
+          const congregationTerritories = processCongregationTerritories(
+            congregationDetails["territories"]
           );
+
+          document.title = congName;
+          setName(congName);
+          setDefaultExpiryHours(expireHours);
           setOptions(options);
           setPolicy(
             new Policy(
               loginUserClaims.current,
               options,
-              maxTries.exists()
-                ? maxTries.val()
-                : DEFAULT_CONGREGATION_MAX_TRIES,
-              optionIsMultiselect.exists()
-                ? optionIsMultiselect.val()
-                : DEFAULT_CONGREGATION_OPTION_IS_MULTIPLE,
-              origin.exists()
-                ? origin.val()
-                : DEFAULT_MAP_DIRECTION_CONGREGATION_LOCATION
+              maxTries,
+              optionIsMultiselect,
+              origin
             )
           );
-
+          setTerritories(congregationTerritories);
           posthog?.identify(code, {
-            name: congregationDetails.exists()
-              ? congregationDetails.val()["name"]
-              : ""
+            name: congName
           });
-          processCongregationTerritories(
-            congregationDetails.exists() ? congregationDetails : undefined
-          );
+        } catch (error) {
+          errorHandler(error, rollbar);
+        } finally {
           setIsLoading(false);
         }
-      )
-      .catch((error) => {
-        // Handle the error here
-        console.error(error);
-      });
-  }, [code]);
-
-  const territoryAddressData = useMemo(() => {
-    const addressDataMap = new Map();
-    let totalPercent = 0;
-
-    addressData.forEach((address) => {
-      const postalCode = address.postalCode;
-      const maxUnitNumberLength = getMaxUnitLength(address.floors);
-      const completedPercent = getCompletedPercent(policy, address.floors);
-      addressDataMap.set(postalCode, {
-        length: maxUnitNumberLength,
-        percent: completedPercent
-      });
-      totalPercent += completedPercent.completedValue;
-    });
-
-    const { completedValue } = processCompletedPercentage(
-      totalPercent,
-      100 * addressData.size
+      }
     );
 
-    return {
-      total: completedValue,
-      aggregates: addressDataMap,
-      data: addressData
-    };
-  }, [addressData, policy]);
+    return () => congregationUnsub();
+  }, [code]);
 
   if (isLoading) return <Loader />;
   if (isUnauthorised) {
@@ -1026,7 +988,6 @@ function Admin({ user }: adminProps) {
     );
   }
 
-  const isDataCompletelyFetched = addressData.size === sortedAddressList.length;
   const isAdmin = userAccessLevel === USER_ACCESS_LEVELS.TERRITORY_SERVANT.CODE;
   const isReadonly = userAccessLevel === USER_ACCESS_LEVELS.READ_ONLY.CODE;
 
@@ -1094,8 +1055,10 @@ function Admin({ user }: adminProps) {
                   {selectedTerritoryCode ? (
                     <>
                       <AggregationBadge
-                        isDataFetched={isDataCompletelyFetched}
-                        aggregate={territoryAddressData.total}
+                        aggregate={
+                          territories.get(selectedTerritoryCode)?.aggregates ||
+                          0
+                        }
                       />
                       {selectedTerritoryCode}
                     </>
@@ -1502,26 +1465,18 @@ function Admin({ user }: adminProps) {
         alwaysOpen={!isReadonly}
         flush
       >
-        {sortedAddressList.map((currentAdd) => {
-          const currentPostalcode = currentAdd.code;
-          const addressElement = territoryAddressData.data.get(currentAdd.code);
-
+        {sortedAddressList.map((currentPostalcode) => {
+          const addressElement = addressData.get(currentPostalcode);
           if (!addressElement)
             return <div key={`empty-div-${currentPostalcode}`}></div>;
-
           const currentPostalname = addressElement.name;
-          const aggregate =
-            territoryAddressData.aggregates.get(currentPostalcode);
-
-          if (!aggregate)
-            throw new Error(
-              `No aggregate found for postal code ${currentPostalcode}`
-            );
-
-          const maxUnitNumberLength = aggregate.length;
-          const completedPercent = aggregate.percent;
+          const completeValue =
+            addressElement.aggregates?.value || DEFAULT_AGGREGATES.value;
+          const completedPercent =
+            addressElement.aggregates?.display || DEFAULT_AGGREGATES.display;
           const assigneeCount = addressElement.assigneeDetailsList.length;
           const personalCount = addressElement.personalDetailsList.length;
+          const maxUnitNumberLength = addressElement.maxUnitLength;
           return (
             <Accordion.Item
               key={`accordion-${currentPostalcode}`}
@@ -1535,8 +1490,8 @@ function Admin({ user }: adminProps) {
               <Accordion.Body className="p-0">
                 <ProgressBar
                   style={{ borderRadius: 0 }}
-                  now={completedPercent.completedValue}
-                  label={completedPercent.completedDisplay}
+                  now={completeValue}
+                  label={completedPercent}
                 />
                 <div key={`div-${currentPostalcode}`}>
                   <Navbar
@@ -2055,7 +2010,7 @@ function Admin({ user }: adminProps) {
                     floors={addressElement.floors}
                     maxUnitNumberLength={maxUnitNumberLength}
                     policy={policy}
-                    completedPercent={completedPercent}
+                    aggregates={addressElement.aggregates}
                     postalCode={currentPostalcode}
                     territoryType={addressElement.type}
                     userAccessLevel={userAccessLevel}
diff --git a/src/pages/slip.tsx b/src/pages/slip.tsx
index 41f4c896..0d224f29 100644
--- a/src/pages/slip.tsx
+++ b/src/pages/slip.tsx
@@ -3,6 +3,7 @@ import { ref, child, onValue, onChildRemoved, get } from "firebase/database";
 import { database } from "../firebase";
 import { Container, Nav, Navbar } from "react-bootstrap";
 import {
+  AggregatesProps,
   OptionProps,
   floorDetails,
   latlongInterface,
@@ -13,8 +14,6 @@ import { LinkSession, Policy } from "../utils/policies";
 import ZeroPad from "../utils/helpers/zeropad";
 import processAddressData from "../utils/helpers/processadddata";
 import getMaxUnitLength from "../utils/helpers/maxunitlength";
-import getCompletedPercent from "../utils/helpers/getcompletedpercent";
-import getOptions from "../utils/helpers/getcongoptions";
 import Legend from "../components/navigation/legend";
 import Loader from "../components/statics/loader";
 import {
@@ -35,13 +34,13 @@ import InstructionImg from "../assets/instruction.svg?react";
 import TimeImg from "../assets/time.svg?react";
 import ModalManager from "@ebay/nice-modal-react";
 import GetDirection from "../utils/helpers/directiongenerator";
-import getOptionIsMultiSelect from "../utils/helpers/getoptionmultiselect";
-import getCongregationOrigin from "../utils/helpers/getcongorigin";
 import { useParams } from "react-router-dom";
 import InvalidPage from "../components/statics/invalidpage";
 import { useRollbar } from "@rollbar/react";
 import SuspenseComponent from "../components/utils/suspense";
 import { usePostHog } from "posthog-js/react";
+import { processOptions } from "../utils/helpers/getcongoptions";
+import getCongregationDetails from "../utils/helpers/getcongdetails";
 
 const UpdateUnitStatus = lazy(() => import("../components/modal/updatestatus"));
 
@@ -58,9 +57,6 @@ const Map = () => {
   const [isLinkExpired, setIsLinkExpired] = useState<boolean>(true);
   const [tokenEndTime, setTokenEndTime] = useState<number>(0);
   const [publisherName, setPublisherName] = useState<string>("");
-  const [congregationMaxTries, setCongregationMaxTries] = useState<number>(
-    DEFAULT_CONGREGATION_MAX_TRIES
-  );
   const [postalcode, setPostalcode] = useState<string>("");
 
   const [showLegend, setShowLegend] = useState<boolean>(false);
@@ -76,6 +72,10 @@ const Map = () => {
   const [territoryType, setTerritoryType] = useState<number>(
     TERRITORY_TYPES.PUBLIC
   );
+  const [aggregate, setAggregate] = useState<AggregatesProps>({
+    value: 0,
+    display: ""
+  });
   const rollbar = useRollbar();
   const posthog = usePostHog();
 
@@ -127,7 +127,6 @@ const Map = () => {
       const tokenEndtime = linkrec.tokenEndtime;
 
       setPublisherName(linkrec.publisherName);
-      setCongregationMaxTries(linkrec.maxTries);
       setPostalcode(linkrec.postalCode);
       const currentTimestamp = new Date().getTime();
       setTokenEndTime(tokenEndtime);
@@ -160,27 +159,37 @@ const Map = () => {
   useEffect(() => {
     const getMapData = async () => {
       if (!code || !postalcode) return;
-      const options = await getOptions(code);
-      const isMultiselect = await getOptionIsMultiSelect(code);
-      const origin = await getCongregationOrigin(code);
+      const congregationDetails = await getCongregationDetails(code);
+      if (!congregationDetails.exists()) {
+        setIsLoading(false);
+        return;
+      }
+      const congregationData = congregationDetails.val();
+      const options = processOptions(congregationData.options?.list);
+      const isMultiselect =
+        congregationData.options?.isMultiSelect ||
+        DEFAULT_CONGREGATION_OPTION_IS_MULTIPLE;
+      const origin =
+        congregationData.origin || DEFAULT_MAP_DIRECTION_CONGREGATION_LOCATION;
+      const congregationMaxTries =
+        congregationData.maxTries || DEFAULT_CONGREGATION_MAX_TRIES;
       setOptions(options);
       setPolicy(
         new Policy(
           undefined,
           options,
           congregationMaxTries,
-          isMultiselect.exists()
-            ? isMultiselect.val()
-            : DEFAULT_CONGREGATION_OPTION_IS_MULTIPLE,
-          origin.exists()
-            ? origin.val()
-            : DEFAULT_MAP_DIRECTION_CONGREGATION_LOCATION
+          isMultiselect,
+          origin
         )
       );
       onValue(
         child(ref(database), `addresses/${code}/${postalcode}`),
-        (snapshot) => {
-          if (snapshot.exists()) {
+        async (snapshot) => {
+          try {
+            if (!snapshot.exists()) {
+              return;
+            }
             const postalSnapshot = snapshot.val();
             setValues((values) => ({
               ...values,
@@ -192,14 +201,16 @@ const Map = () => {
             setCoordinates(
               postalSnapshot.coordinates || DEFAULT_COORDINATES.Singapore
             );
-            processAddressData(code, postalcode, postalSnapshot.units)
-              .then((data) => {
-                setFloors(data);
-              })
-              .finally(() => {
-                setIsLoading(false);
-              });
+            setAggregate(postalSnapshot.aggregates);
+            const data = await processAddressData(
+              code,
+              postalcode,
+              postalSnapshot.units
+            );
+            setFloors(data);
             document.title = postalSnapshot.name;
+          } finally {
+            setIsLoading(false);
           }
         }
       );
@@ -209,10 +220,6 @@ const Map = () => {
   }, [postalcode, code]);
 
   const maxUnitNumberLength = useMemo(() => getMaxUnitLength(floors), [floors]);
-  const completedPercent = useMemo(
-    () => getCompletedPercent(policy as Policy, floors),
-    [policy, floors]
-  );
   if (isLoading) return <Loader />;
   if (isLinkExpired) {
     document.title = "Ministry Mapper";
@@ -264,7 +271,7 @@ const Map = () => {
         floors={floors}
         maxUnitNumberLength={maxUnitNumberLength}
         policy={policy}
-        completedPercent={completedPercent}
+        aggregates={aggregate}
         territoryType={territoryType}
         handleUnitStatusUpdate={(event) => {
           const { floor, unitno } = event.currentTarget.dataset;
diff --git a/src/utils/constants.tsx b/src/utils/constants.tsx
index 02d75402..b2debf36 100644
--- a/src/utils/constants.tsx
+++ b/src/utils/constants.tsx
@@ -76,7 +76,7 @@ const COUNTABLE_HOUSEHOLD_STATUS = [
 const MIN_START_FLOOR = 1;
 const MAX_TOP_FLOOR = 50;
 
-const TERRITORY_SELECTOR_VIEWPORT_HEIGHT = "75vh";
+const TERRITORY_SELECTOR_VIEWPORT_HEIGHT = "85vh";
 const LINK_SELECTOR_VIEWPORT_HEIGHT = "40vh";
 
 const TERRITORY_VIEW_WINDOW_WELCOME_TEXT =
@@ -97,6 +97,11 @@ const NOTIFICATION_TYPES = {
   INSTRUCTIONS: 2
 };
 
+const DEFAULT_AGGREGATES = {
+  value: 0,
+  display: "0%"
+};
+
 //eslint-disable-next-line
 const SPECIAL_CHARACTERS = /[`!@#$%^&()_+\=\[\]{};':"\\|,.<>\/?~][^-*]/;
 const NUMERIC_CHARACTERS = /^-?\d+$/;
@@ -164,8 +169,8 @@ const DEFAULT_COORDINATES = {
 };
 
 const CLOUD_FUNCTIONS_CALLS = {
-  UPDATE_USER_ACCESS: "updateUserAccessV2",
-  GET_CONGREGATION_USERS: "getCongregationUsersV2",
+  UPDATE_USER_ACCESS: "updateUserAccess",
+  GET_CONGREGATION_USERS: "getCongregationUsers",
   GET_USER_BY_EMAIL: "getUserByEmail"
 };
 
@@ -324,5 +329,6 @@ export {
   DEFAULT_COORDINATES,
   CLOUD_FUNCTIONS_CALLS,
   AI_SETTINGS,
-  PH_STATUS_KEYS
+  PH_STATUS_KEYS,
+  DEFAULT_AGGREGATES
 };
diff --git a/src/utils/helpers/checkcongexp.ts b/src/utils/helpers/checkcongexp.ts
deleted file mode 100644
index 67e38e0b..00000000
--- a/src/utils/helpers/checkcongexp.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { get, child, ref } from "firebase/database";
-import { database } from "../../firebase";
-import pollingQueryFunction from "./pollingquery";
-
-const checkCongregationExpireHours = async (code: string) => {
-  return await pollingQueryFunction(() =>
-    get(child(ref(database), `congregations/${code}/expiryHours`))
-  );
-};
-
-export default checkCongregationExpireHours;
diff --git a/src/utils/helpers/checkmaxtries.ts b/src/utils/helpers/checkmaxtries.ts
deleted file mode 100644
index 073333f6..00000000
--- a/src/utils/helpers/checkmaxtries.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { get, child, ref } from "firebase/database";
-import { database } from "../../firebase";
-import pollingQueryFunction from "./pollingquery";
-
-const checkCongregationMaxTries = async (code: string) => {
-  return await pollingQueryFunction(() =>
-    get(child(ref(database), `congregations/${code}/maxTries`))
-  );
-};
-
-export default checkCongregationMaxTries;
diff --git a/src/utils/helpers/getcompletedpercent.ts b/src/utils/helpers/getcompletedpercent.ts
deleted file mode 100644
index b5fd5199..00000000
--- a/src/utils/helpers/getcompletedpercent.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { floorDetails } from "../interface";
-import { Policy } from "../policies";
-import processCompletedPercentage from "./processcompletedpercent";
-
-const getCompletedPercent = (policy: Policy, floors: floorDetails[]) => {
-  if (!policy || !floors)
-    return {
-      completedValue: 0,
-      completedDisplay: ""
-    };
-  let totalUnits = 0;
-  let completedUnits = 0;
-
-  floors.forEach((element) => {
-    element.units.forEach((uElement) => {
-      const isCountable = policy.isCountable(uElement);
-      if (!isCountable) return;
-      totalUnits++;
-      if (policy.isCompleted(uElement)) completedUnits++;
-    });
-  });
-  return processCompletedPercentage(completedUnits, totalUnits);
-};
-
-export default getCompletedPercent;
diff --git a/src/utils/helpers/getcongoptions.ts b/src/utils/helpers/getcongoptions.ts
index 9db0860f..37f817a4 100644
--- a/src/utils/helpers/getcongoptions.ts
+++ b/src/utils/helpers/getcongoptions.ts
@@ -28,4 +28,24 @@ const getOptions = async (code: string) => {
   return householdTypes;
 };
 
-export default getOptions;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const processOptions = (optionList: any) => {
+  const householdTypes = new Array<HHOptionProps>();
+
+  // Retrieve the household types from the snapshot
+  Object.keys(optionList).forEach((key) => {
+    const value = optionList[key];
+    householdTypes.push({
+      code: key,
+      description: value.description,
+      isCountable: value.isCountable,
+      isDefault: value.isDefault,
+      sequence: value.sequence
+    });
+  });
+  // Sort the household types by sequence
+  householdTypes.sort((a, b) => a.sequence - b.sequence);
+  return householdTypes;
+};
+
+export { getOptions, processOptions };
diff --git a/src/utils/helpers/getterritorydetails.ts b/src/utils/helpers/getterritorydetails.ts
index 339c43b6..10e251fa 100644
--- a/src/utils/helpers/getterritorydetails.ts
+++ b/src/utils/helpers/getterritorydetails.ts
@@ -1,4 +1,4 @@
-import { get, query, ref, orderByValue, child } from "firebase/database";
+import { get, query, ref, orderByValue } from "firebase/database";
 import { database } from "../../firebase";
 import pollingQueryFunction from "./pollingquery";
 
@@ -6,29 +6,24 @@ const getTerritoryData = async (
   code: string,
   selectedTerritoryCode: string
 ) => {
-  const [territoryAddsResult, territoryNameResult] = await Promise.all([
-    pollingQueryFunction(() =>
-      get(
-        query(
-          ref(
-            database,
-            `congregations/${code}/territories/${selectedTerritoryCode}/addresses`
-          ),
-          orderByValue()
-        )
-      )
-    ),
-    pollingQueryFunction(() =>
-      get(
-        child(
-          ref(database),
-          `congregations/${code}/territories/${selectedTerritoryCode}/name`
-        )
-      )
-    )
-  ]);
+  try {
+    const territoryRef = query(
+      ref(
+        database,
+        `congregations/${code}/territories/${selectedTerritoryCode}/addresses`
+      ),
+      orderByValue()
+    );
 
-  return { territoryAddsResult, territoryNameResult };
+    const territoryAddsResult = await pollingQueryFunction(() =>
+      get(territoryRef)
+    );
+
+    return territoryAddsResult;
+  } catch (error) {
+    console.error("Error fetching territory data:", error);
+    return;
+  }
 };
 
 export default getTerritoryData;
diff --git a/src/utils/helpers/maxunitlength.ts b/src/utils/helpers/maxunitlength.ts
index c192a5f2..18269c5c 100644
--- a/src/utils/helpers/maxunitlength.ts
+++ b/src/utils/helpers/maxunitlength.ts
@@ -1,15 +1,12 @@
 import { floorDetails } from "../interface";
 
 const getMaxUnitLength = (floors: floorDetails[]) => {
-  let maxUnitNumberLength = 1;
-  if (floors.length === 0) return maxUnitNumberLength;
-  floors[0].units.forEach((element) => {
+  if (floors.length === 0 || floors[0].units.length === 0) return 1;
+
+  return floors[0].units.reduce((maxLength, element) => {
     const lengthOfUnitNumber = element.number.length;
-    if (maxUnitNumberLength < lengthOfUnitNumber) {
-      maxUnitNumberLength = lengthOfUnitNumber;
-    }
-  });
-  return maxUnitNumberLength;
+    return Math.max(maxLength, lengthOfUnitNumber);
+  }, 1);
 };
 
 export default getMaxUnitLength;
diff --git a/src/utils/helpers/processcompletedpercent.ts b/src/utils/helpers/processcompletedpercent.ts
deleted file mode 100644
index 3d8c44f4..00000000
--- a/src/utils/helpers/processcompletedpercent.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { MIN_PERCENTAGE_DISPLAY } from "../constants";
-
-const processCompletedPercentage = (
-  completedUnits: number,
-  totalUnits: number
-) => {
-  const completedValue =
-    totalUnits > 0 ? Math.round((completedUnits / totalUnits) * 100) : 0;
-  const completedDisplay =
-    completedValue > MIN_PERCENTAGE_DISPLAY ? `${completedValue}%` : "";
-  return { completedValue, completedDisplay };
-};
-
-export default processCompletedPercentage;
diff --git a/src/utils/helpers/processpostalno.ts b/src/utils/helpers/processpostalno.ts
index 73f5d60f..38ef547b 100644
--- a/src/utils/helpers/processpostalno.ts
+++ b/src/utils/helpers/processpostalno.ts
@@ -3,6 +3,7 @@ import { database } from "../../firebase";
 import { STATUS_CODES, NOT_HOME_STATUS_CODES } from "../constants";
 import { addressDetails, unitMaps } from "../interface";
 import pollingVoidFunction from "./pollingvoid";
+import updateAddressDelta from "./updateaddressdelta";
 
 const processPostalUnitNumber = async (
   congregationCode: string,
@@ -47,6 +48,7 @@ const processPostalUnitNumber = async (
     });
   }
   await pollingVoidFunction(() => update(ref(database), unitUpdates));
+  await updateAddressDelta(congregationCode, postalCode);
 };
 
 export default processPostalUnitNumber;
diff --git a/src/utils/helpers/updateaddressdelta.ts b/src/utils/helpers/updateaddressdelta.ts
new file mode 100644
index 00000000..1c660873
--- /dev/null
+++ b/src/utils/helpers/updateaddressdelta.ts
@@ -0,0 +1,13 @@
+import { ref, update, increment } from "firebase/database";
+import { database } from "../../firebase";
+import pollingVoidFunction from "./pollingvoid";
+
+async function updateAddressDelta(congregation: string, addressCode: string) {
+  await pollingVoidFunction(() =>
+    update(ref(database, `addresses/${congregation}/${addressCode}`), {
+      delta: increment(1)
+    })
+  );
+}
+
+export default updateAddressDelta;
diff --git a/src/utils/interface.tsx b/src/utils/interface.tsx
index 04139b02..d97771fe 100644
--- a/src/utils/interface.tsx
+++ b/src/utils/interface.tsx
@@ -88,6 +88,7 @@ export type adminProps = userInterface;
 
 export interface territoryDetails extends nameInterface {
   code: string;
+  aggregates: number;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   addresses: any;
 }
@@ -103,6 +104,8 @@ export interface addressDetails
   type: number;
   instructions: string;
   location?: string;
+  aggregates: AggregatesProps;
+  maxUnitLength: number;
 }
 
 export interface FormProps {
@@ -201,9 +204,9 @@ export interface AuthorizerProp {
   children: React.ReactElement;
 }
 
-export interface aggregateProp {
+export interface aggregateBadgeProp {
   aggregate?: number;
-  isDataFetched?: boolean;
+  width?: string;
 }
 
 export interface ExpiryButtonProp {
@@ -231,10 +234,7 @@ export interface territoryTableProps extends postalInterface {
   floors: floorDetails[];
   maxUnitNumberLength: number;
   policy: Policy | undefined;
-  completedPercent: {
-    completedValue: number;
-    completedDisplay: string;
-  };
+  aggregates: AggregatesProps;
   adminUnitHeaderStyle?: string;
   userAccessLevel?: number;
   territoryType?: number;
@@ -247,10 +247,7 @@ export interface territoryLandedProps extends postalInterface {
   isAdmin: boolean;
   houses: floorDetails;
   policy: Policy | undefined;
-  completedPercent: {
-    completedValue: number;
-    completedDisplay: string;
-  };
+  aggregates: AggregatesProps;
   adminUnitHeaderStyle?: string;
   userAccessLevel?: number;
   handleHouseUpdate: (event: React.MouseEvent<HTMLElement>) => void;
@@ -519,3 +516,8 @@ export interface UpdateUnitModalProps
 }
 
 export interface ShowExpiryModalProps extends ExpiryButtonProp {}
+
+export interface AggregatesProps {
+  value: number;
+  display: string;
+}