diff --git a/components/JsonToHtml/renderOptions.tsx b/components/JsonToHtml/renderOptions.tsx
index 334290fc7..862d8bc1b 100644
--- a/components/JsonToHtml/renderOptions.tsx
+++ b/components/JsonToHtml/renderOptions.tsx
@@ -377,7 +377,9 @@ export const renderOptions: RenderOptions = {
         } else if (
           entry?.node.__typename === ContentEnum.blocks.LoyaltyPage ||
           entry?.node.__typename === ContentEnum.blocks.ContentPage ||
-          entry?.node.__typename === ContentEnum.blocks.AccountPage
+          entry?.node.__typename === ContentEnum.blocks.AccountPage ||
+          entry?.node.__typename === ContentEnum.blocks.CollectionPage ||
+          entry?.node.__typename === ContentEnum.blocks.HotelPage
         ) {
           // If entry is not an ImageContainer, it is a page and we return it as a link
           const props = extractPossibleAttributes(node.attrs)
diff --git a/lib/graphql/Fragments/Alert.graphql b/lib/graphql/Fragments/Alert.graphql
index f2cb56323..e31cc4495 100644
--- a/lib/graphql/Fragments/Alert.graphql
+++ b/lib/graphql/Fragments/Alert.graphql
@@ -2,11 +2,13 @@
 #import "./PageLink/ContentPageLink.graphql"
 #import "./PageLink/HotelPageLink.graphql"
 #import "./PageLink/LoyaltyPageLink.graphql"
+#import "./PageLink/CollectionPageLink.graphql"
 
 #import "./AccountPage/Ref.graphql"
 #import "./ContentPage/Ref.graphql"
 #import "./HotelPage/Ref.graphql"
 #import "./LoyaltyPage/Ref.graphql"
+#import "./CollectionPage/Ref.graphql"
 
 fragment Alert on Alert {
   type
@@ -28,6 +30,7 @@ fragment Alert on Alert {
           ...ContentPageLink
           ...HotelPageLink
           ...LoyaltyPageLink
+          ...CollectionPageLink
         }
       }
     }
@@ -47,6 +50,7 @@ fragment Alert on Alert {
             ...ContentPageLink
             ...HotelPageLink
             ...LoyaltyPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -65,6 +69,7 @@ fragment AlertRef on Alert {
           ...ContentPageRef
           ...HotelPageRef
           ...LoyaltyPageRef
+          ...CollectionPageRef
         }
       }
     }
@@ -79,6 +84,7 @@ fragment AlertRef on Alert {
             ...ContentPageRef
             ...HotelPageRef
             ...LoyaltyPageRef
+            ...CollectionPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Blocks/Accordion.graphql b/lib/graphql/Fragments/Blocks/Accordion.graphql
index e77b26606..678d44355 100644
--- a/lib/graphql/Fragments/Blocks/Accordion.graphql
+++ b/lib/graphql/Fragments/Blocks/Accordion.graphql
@@ -25,6 +25,29 @@ fragment AccordionBlock on Accordion {
             ...ContentPageLink
             ...HotelPageLink
             ...LoyaltyPageLink
+            ...CollectionPageLink
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment GlobalAccordionBlock on GlobalAccordion {
+  __typename
+  questions {
+    question
+    answer {
+      json
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageLink
+            ...ContentPageLink
+            ...HotelPageLink
+            ...LoyaltyPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -72,6 +95,7 @@ fragment SpecificAccordion on ContentPageBlocksAccordionBlockAccordionsSpecificA
               ...ContentPageLink
               ...HotelPageLink
               ...LoyaltyPageLink
+              ...CollectionPageLink
             }
           }
         }
@@ -114,6 +138,7 @@ fragment SpecificAccordionRefs on ContentPageBlocksAccordionBlockAccordionsSpeci
               ...ContentPageRef
               ...HotelPageRef
               ...LoyaltyPageRef
+              ...CollectionPageRef
             }
           }
         }
diff --git a/lib/graphql/Fragments/Blocks/Card.graphql b/lib/graphql/Fragments/Blocks/Card.graphql
index 39aa63a49..bf4538038 100644
--- a/lib/graphql/Fragments/Blocks/Card.graphql
+++ b/lib/graphql/Fragments/Blocks/Card.graphql
@@ -3,6 +3,8 @@
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 
 fragment CardBlock on Card {
   background_image
@@ -27,6 +29,8 @@ fragment CardBlock on Card {
           ...AccountPageLink
           ...ContentPageLink
           ...LoyaltyPageLink
+          ...HotelPageLink
+          ...CollectionPageLink
         }
       }
     }
@@ -46,6 +50,8 @@ fragment CardBlock on Card {
           ...AccountPageLink
           ...ContentPageLink
           ...LoyaltyPageLink
+          ...HotelPageLink
+          ...CollectionPageLink
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Content.graphql b/lib/graphql/Fragments/Blocks/Content.graphql
index 4a48f35f3..e8c917c3b 100644
--- a/lib/graphql/Fragments/Blocks/Content.graphql
+++ b/lib/graphql/Fragments/Blocks/Content.graphql
@@ -5,11 +5,13 @@
 #import "../ContentPage/Ref.graphql"
 #import "../HotelPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
 
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 
 fragment Content_ContentPage on ContentPageBlocksContent {
   content {
@@ -20,6 +22,7 @@ fragment Content_ContentPage on ContentPageBlocksContent {
             __typename
             ...AccountPageLink
             ...ContentPageLink
+            ...CollectionPageLink
             ...HotelPageLink
             ...LoyaltyPageLink
             ...ImageContainer
@@ -40,6 +43,7 @@ fragment Content_ContentPageRefs on ContentPageBlocksContent {
             __typename
             ...AccountPageRef
             ...ContentPageRef
+            ...CollectionPageRef
             ...HotelPageRef
             ...LoyaltyPageRef
             ...ImageContainerRef
@@ -63,6 +67,8 @@ fragment Content_LoyaltyPage on LoyaltyPageBlocksContent {
             ...Image
             ...ImageContainer
             ...LoyaltyPageLink
+            ...CollectionPageLink
+            ...HotelPageLink
           }
         }
       }
@@ -81,6 +87,8 @@ fragment Content_LoyaltyPageRefs on LoyaltyPageBlocksContent {
             ...ContentPageRef
             ...ImageContainerRef
             ...LoyaltyPageRef
+            ...CollectionPageRef
+            ...HotelPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Blocks/DynamicContent.graphql b/lib/graphql/Fragments/Blocks/DynamicContent.graphql
index aee4c82fa..af829e382 100644
--- a/lib/graphql/Fragments/Blocks/DynamicContent.graphql
+++ b/lib/graphql/Fragments/Blocks/DynamicContent.graphql
@@ -2,9 +2,11 @@
 #import "../ContentPage/Ref.graphql"
 #import "../HotelPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
 
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
 
@@ -21,6 +23,9 @@ fragment DynamicContent_AccountPage on AccountPageContentDynamicContent {
             __typename
             ...AccountPageLink
             ...LoyaltyPageLink
+            ...ContentPageLink
+            ...HotelPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -37,6 +42,9 @@ fragment DynamicContent_AccountPageRefs on AccountPageContentDynamicContent {
             __typename
             ...AccountPageRef
             ...LoyaltyPageRef
+            ...ContentPageRef
+            ...HotelPageRef
+            ...CollectionPageRef
           }
         }
       }
@@ -55,7 +63,9 @@ fragment DynamicContent_ContentPage on ContentPageBlocksDynamicContent {
         edges {
           node {
             __typename
+            ...AccountPageLink
             ...ContentPageLink
+            ...CollectionPageLink
             ...HotelPageLink
             ...LoyaltyPageLink
           }
@@ -75,6 +85,8 @@ fragment DynamicContent_ContentPageRefs on ContentPageBlocksDynamicContent {
             ...ContentPageRef
             ...HotelPageRef
             ...LoyaltyPageRef
+            ...AccountPageRef
+            ...CollectionPageRef
           }
         }
       }
@@ -95,6 +107,9 @@ fragment DynamicContent_LoyaltyPage on LoyaltyPageBlocksDynamicContent {
             __typename
             ...ContentPageLink
             ...LoyaltyPageLink
+            ...AccountPageLink
+            ...HotelPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -109,8 +124,11 @@ fragment DynamicContent_LoyaltyPageRefs on LoyaltyPageBlocksDynamicContent {
         edges {
           node {
             __typename
-            ...ContentPageLink
-            ...LoyaltyPageLink
+            ...ContentPageRef
+            ...LoyaltyPageRef
+            ...AccountPageRef
+            ...HotelPageRef
+            ...CollectionPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql b/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
index 84da04bcb..586258821 100644
--- a/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
+++ b/lib/graphql/Fragments/Blocks/LoyaltyCard.graphql
@@ -1,5 +1,11 @@
 #import "../System.graphql"
 
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
+
 fragment LoyaltyCardBlock on LoyaltyCard {
   body_text
   heading
@@ -19,6 +25,8 @@ fragment LoyaltyCardBlock on LoyaltyCard {
           ...LoyaltyPageLink
           ...ContentPageLink
           ...AccountPageLink
+          ...HotelPageLink
+          ...CollectionPageLink
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql b/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql
index 453fe405e..d125d77ed 100644
--- a/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/Accordion.graphql
@@ -2,6 +2,7 @@
 #import "../../ContentPage/Ref.graphql"
 #import "../../HotelPage/Ref.graphql"
 #import "../../LoyaltyPage/Ref.graphql"
+#import "../../CollectionPage/Ref.graphql"
 
 fragment AccordionBlockRefs on Accordion {
   questions {
@@ -14,6 +15,26 @@ fragment AccordionBlockRefs on Accordion {
             ...ContentPageRef
             ...HotelPageRef
             ...LoyaltyPageRef
+            ...CollectionPageRef
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment GlobalAccordionBlockRefs on GlobalAccordion {
+  questions {
+    answer {
+      embedded_itemsConnection {
+        edges {
+          node {
+            __typename
+            ...AccountPageRef
+            ...ContentPageRef
+            ...HotelPageRef
+            ...LoyaltyPageRef
+            ...CollectionPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Blocks/Refs/Card.graphql b/lib/graphql/Fragments/Blocks/Refs/Card.graphql
index 8bbf74c32..e19052c8c 100644
--- a/lib/graphql/Fragments/Blocks/Refs/Card.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/Card.graphql
@@ -1,6 +1,8 @@
 #import "../../AccountPage/Ref.graphql"
 #import "../../ContentPage/Ref.graphql"
 #import "../../LoyaltyPage/Ref.graphql"
+#import "../../CollectionPage/Ref.graphql"
+#import "../../HotelPage/Ref.graphql"
 
 fragment CardBlockRef on Card {
   secondary_button {
@@ -11,6 +13,8 @@ fragment CardBlockRef on Card {
           ...AccountPageRef
           ...ContentPageRef
           ...LoyaltyPageRef
+          ...CollectionPageRef
+          ...HotelPageRef
         }
       }
     }
@@ -23,6 +27,8 @@ fragment CardBlockRef on Card {
           ...AccountPageRef
           ...ContentPageRef
           ...LoyaltyPageRef
+          ...CollectionPageRef
+          ...HotelPageRef
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql b/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
index 34275c120..38255a6a6 100644
--- a/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/LoyaltyCard.graphql
@@ -1,3 +1,9 @@
+#import "../../AccountPage/Ref.graphql"
+#import "../../ContentPage/Ref.graphql"
+#import "../../LoyaltyPage/Ref.graphql"
+#import "../../HotelPage/Ref.graphql"
+#import "../../CollectionPage/Ref.graphql"
+
 fragment LoyaltyCardBlockRef on LoyaltyCard {
   link {
     linkConnection {
@@ -7,6 +13,8 @@ fragment LoyaltyCardBlockRef on LoyaltyCard {
           ...LoyaltyPageRef
           ...ContentPageRef
           ...AccountPageRef
+          ...HotelPageRef
+          ...CollectionPageRef
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/Refs/TeaserCard.graphql b/lib/graphql/Fragments/Blocks/Refs/TeaserCard.graphql
index cba0b5231..b6abf8875 100644
--- a/lib/graphql/Fragments/Blocks/Refs/TeaserCard.graphql
+++ b/lib/graphql/Fragments/Blocks/Refs/TeaserCard.graphql
@@ -2,6 +2,7 @@
 #import "../../ContentPage/Ref.graphql"
 #import "../../LoyaltyPage/Ref.graphql"
 #import "../../HotelPage/Ref.graphql"
+#import "../../CollectionPage/Ref.graphql"
 
 fragment TeaserCardBlockRef on TeaserCard {
   secondary_button {
@@ -13,6 +14,7 @@ fragment TeaserCardBlockRef on TeaserCard {
           ...ContentPageRef
           ...LoyaltyPageRef
           ...HotelPageRef
+          ...CollectionPageRef
         }
       }
     }
@@ -26,6 +28,7 @@ fragment TeaserCardBlockRef on TeaserCard {
           ...ContentPageRef
           ...LoyaltyPageRef
           ...HotelPageRef
+          ...CollectionPageRef
         }
       }
     }
@@ -40,6 +43,7 @@ fragment TeaserCardBlockRef on TeaserCard {
             ...ContentPageRef
             ...LoyaltyPageRef
             ...HotelPageRef
+            ...CollectionPageRef
           }
         }
       }
@@ -52,6 +56,8 @@ fragment TeaserCardBlockRef on TeaserCard {
             ...ContentPageRef
             ...LoyaltyPageRef
             ...HotelPageRef
+            ...CollectionPageRef
+            ...AccountPageRef
           }
         }
       }
@@ -64,6 +70,8 @@ fragment TeaserCardBlockRef on TeaserCard {
             ...ContentPageRef
             ...LoyaltyPageRef
             ...HotelPageRef
+            ...CollectionPageRef
+            ...AccountPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Blocks/Shortcuts.graphql b/lib/graphql/Fragments/Blocks/Shortcuts.graphql
index cfdb9bcbe..c44a8d990 100644
--- a/lib/graphql/Fragments/Blocks/Shortcuts.graphql
+++ b/lib/graphql/Fragments/Blocks/Shortcuts.graphql
@@ -2,11 +2,13 @@
 #import "../CollectionPage/Ref.graphql"
 #import "../ContentPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
 
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/CollectionPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
 
 fragment Shortcuts on Shortcuts {
   subtitle: preamble
@@ -22,6 +24,8 @@ fragment Shortcuts on Shortcuts {
           ...AccountPageLink
           ...ContentPageLink
           ...LoyaltyPageLink
+          ...CollectionPageLink
+          ...HotelPageLink
         }
       }
     }
@@ -61,6 +65,8 @@ fragment ShortcutsRefs on Shortcuts {
           ...AccountPageRef
           ...ContentPageRef
           ...LoyaltyPageRef
+          ...CollectionPageRef
+          ...HotelPageRef
         }
       }
     }
diff --git a/lib/graphql/Fragments/Blocks/TeaserCard.graphql b/lib/graphql/Fragments/Blocks/TeaserCard.graphql
index 07a16b366..7857d6d52 100644
--- a/lib/graphql/Fragments/Blocks/TeaserCard.graphql
+++ b/lib/graphql/Fragments/Blocks/TeaserCard.graphql
@@ -2,6 +2,7 @@
 
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 
@@ -28,6 +29,7 @@ fragment TeaserCardBlock on TeaserCard {
           ...LoyaltyPageLink
           ...ContentPageLink
           ...AccountPageLink
+          ...CollectionPageLink
           ...HotelPageLink
         }
       }
@@ -47,6 +49,7 @@ fragment TeaserCardBlock on TeaserCard {
           __typename
           ...LoyaltyPageLink
           ...ContentPageLink
+          ...CollectionPageLink
           ...AccountPageLink
           ...HotelPageLink
         }
@@ -65,6 +68,7 @@ fragment TeaserCardBlock on TeaserCard {
             __typename
             ...AccountPageLink
             ...ContentPageLink
+            ...CollectionPageLink
             ...HotelPageLink
             ...LoyaltyPageLink
           }
@@ -85,8 +89,10 @@ fragment TeaserCardBlock on TeaserCard {
         edges {
           node {
             __typename
+            ...AccountPageLink
             ...LoyaltyPageLink
             ...ContentPageLink
+            ...CollectionPageLink
             ...HotelPageLink
           }
         }
@@ -105,8 +111,10 @@ fragment TeaserCardBlock on TeaserCard {
         edges {
           node {
             __typename
+            ...AccountPageLink
             ...LoyaltyPageLink
             ...ContentPageLink
+            ...CollectionPageLink
             ...HotelPageLink
           }
         }
diff --git a/lib/graphql/Fragments/Blocks/TextCols.graphql b/lib/graphql/Fragments/Blocks/TextCols.graphql
index 236078c8a..3752e95e3 100644
--- a/lib/graphql/Fragments/Blocks/TextCols.graphql
+++ b/lib/graphql/Fragments/Blocks/TextCols.graphql
@@ -1,10 +1,14 @@
 #import "../ContentPage/Ref.graphql"
 #import "../HotelPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
+#import "../AccountPage/Ref.graphql"
 
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
+#import "../PageLink/AccountPageLink.graphql"
 
 fragment TextCols_ContentPage on ContentPageBlocksTextCols {
   text_cols {
@@ -19,6 +23,8 @@ fragment TextCols_ContentPage on ContentPageBlocksTextCols {
               ...ContentPageLink
               ...HotelPageLink
               ...LoyaltyPageLink
+              ...CollectionPageLink
+              ...AccountPageLink
             }
           }
         }
@@ -40,10 +46,12 @@ fragment TextCols_ContentPageRef on ContentPageBlocksTextCols {
               ...ContentPageRef
               ...HotelPageRef
               ...LoyaltyPageRef
+              ...CollectionPageRef
+              ...AccountPageRef
             }
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/graphql/Fragments/Blocks/UspGrid.graphql b/lib/graphql/Fragments/Blocks/UspGrid.graphql
index e7f435b5a..9313ae34c 100644
--- a/lib/graphql/Fragments/Blocks/UspGrid.graphql
+++ b/lib/graphql/Fragments/Blocks/UspGrid.graphql
@@ -2,11 +2,13 @@
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 
 #import "../AccountPage/Ref.graphql"
 #import "../ContentPage/Ref.graphql"
 #import "../HotelPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
 
 fragment UspGrid_ContentPage on ContentPageBlocksUspGrid {
   __typename
@@ -28,6 +30,7 @@ fragment UspGrid_ContentPage on ContentPageBlocksUspGrid {
                       ...ContentPageLink
                       ...HotelPageLink
                       ...LoyaltyPageLink
+                      ...CollectionPageLink
                     }
                   }
                 }
@@ -57,6 +60,7 @@ fragment UspGrid_ContentPageRefs on ContentPageBlocksUspGrid {
                       ...ContentPageRef
                       ...HotelPageRef
                       ...LoyaltyPageRef
+                      ...CollectionPageRef
                     }
                   }
                 }
@@ -89,6 +93,7 @@ fragment UspGrid_CollectionPage on CollectionPageBlocksUspGrid {
                       ...ContentPageLink
                       ...HotelPageLink
                       ...LoyaltyPageLink
+                      ...CollectionPageLink
                     }
                   }
                 }
@@ -118,6 +123,7 @@ fragment UspGrid_CollectionPageRefs on CollectionPageBlocksUspGrid {
                       ...ContentPageRef
                       ...HotelPageRef
                       ...LoyaltyPageRef
+                      ...CollectionPageRef
                     }
                   }
                 }
diff --git a/lib/graphql/Fragments/CollectionPage/NavigationLinks.graphql b/lib/graphql/Fragments/CollectionPage/NavigationLinks.graphql
index 55a7572a1..ade4cda1d 100644
--- a/lib/graphql/Fragments/CollectionPage/NavigationLinks.graphql
+++ b/lib/graphql/Fragments/CollectionPage/NavigationLinks.graphql
@@ -2,8 +2,9 @@
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/AccountPageLink.graphql"
 
-fragment NavigationLinks on CollectionPageHeader {
+fragment NavigationLinks_CollectionPage on CollectionPageHeader {
   navigation_links {
     title
     linkConnection {
@@ -14,6 +15,24 @@ fragment NavigationLinks on CollectionPageHeader {
           ...CollectionPageLink
           ...ContentPageLink
           ...LoyaltyPageLink
+          ...AccountPageLink
+        }
+      }
+    }
+  }
+}
+
+fragment NavigationLinksRef_CollectionPage on CollectionPageHeader {
+  navigation_links {
+    linkConnection {
+      edges {
+        node {
+          __typename
+          ...ContentPageRef
+          ...HotelPageRef
+          ...LoyaltyPageRef
+          ...CollectionPageRef
+          ...AccountPageRef
         }
       }
     }
diff --git a/lib/graphql/Fragments/ContentPage/NavigationLinks.graphql b/lib/graphql/Fragments/ContentPage/NavigationLinks.graphql
index b82d68627..ed4b72836 100644
--- a/lib/graphql/Fragments/ContentPage/NavigationLinks.graphql
+++ b/lib/graphql/Fragments/ContentPage/NavigationLinks.graphql
@@ -1,8 +1,16 @@
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/HotelPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
+#import "../PageLink/AccountPageLink.graphql"
 
-fragment NavigationLinks on ContentPageHeader {
+#import "../ContentPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../LoyaltyPage/Ref.graphql"
+#import "../AccountPage/Ref.graphql"
+
+fragment NavigationLinks_ContentPage on ContentPageHeader {
   navigation_links {
     title
     linkConnection {
@@ -12,6 +20,25 @@ fragment NavigationLinks on ContentPageHeader {
           ...HotelPageLink
           ...ContentPageLink
           ...LoyaltyPageLink
+          ...CollectionPageLink
+          ...AccountPageLink
+        }
+      }
+    }
+  }
+}
+
+fragment NavigationLinksRef_ContentPage on ContentPageHeader {
+  navigation_links {
+    linkConnection {
+      edges {
+        node {
+          __typename
+          ...ContentPageRef
+          ...HotelPageRef
+          ...LoyaltyPageRef
+          ...CollectionPageRef
+          ...AccountPageRef
         }
       }
     }
diff --git a/lib/graphql/Fragments/Sidebar/Content.graphql b/lib/graphql/Fragments/Sidebar/Content.graphql
index f02d5a928..8c3637163 100644
--- a/lib/graphql/Fragments/Sidebar/Content.graphql
+++ b/lib/graphql/Fragments/Sidebar/Content.graphql
@@ -3,9 +3,15 @@
 
 #import "../ContentPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../AccountPage/Ref.graphql"
 
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/AccountPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
 
 fragment ContentSidebar_ContentPage on ContentPageSidebarContent {
   content {
@@ -15,9 +21,12 @@ fragment ContentSidebar_ContentPage on ContentPageSidebarContent {
         edges {
           node {
             __typename
-            ...ContentPageLink
             ...Image
             ...ImageContainer
+            ...AccountPageLink
+            ...ContentPageLink
+            ...CollectionPageLink
+            ...HotelPageLink
             ...LoyaltyPageLink
           }
         }
@@ -33,8 +42,11 @@ fragment ContentSidebar_ContentPageRefs on ContentPageSidebarContent {
         edges {
           node {
             __typename
-            ...ContentPageRef
             ...ImageContainerRef
+            ...AccountPageRef
+            ...ContentPageRef
+            ...CollectionPageRef
+            ...HotelPageRef
             ...LoyaltyPageRef
           }
         }
@@ -51,9 +63,12 @@ fragment ContentSidebar_LoyaltyPage on LoyaltyPageSidebarContent {
         edges {
           node {
             __typename
-            ...ContentPageLink
             ...Image
             ...ImageContainer
+            ...AccountPageLink
+            ...ContentPageLink
+            ...CollectionPageLink
+            ...HotelPageLink
             ...LoyaltyPageLink
           }
         }
@@ -72,6 +87,9 @@ fragment ContentSidebar_LoyaltyPageRefs on LoyaltyPageSidebarContent {
             ...ContentPageRef
             ...ImageContainerRef
             ...LoyaltyPageRef
+            ...CollectionPageRef
+            ...HotelPageRef
+            ...AccountPageRef
           }
         }
       }
diff --git a/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
index 99f529cd7..cb9886b91 100644
--- a/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
+++ b/lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
@@ -1,10 +1,14 @@
 #import "../AccountPage/Ref.graphql"
 #import "../ContentPage/Ref.graphql"
 #import "../LoyaltyPage/Ref.graphql"
+#import "../HotelPage/Ref.graphql"
+#import "../CollectionPage/Ref.graphql"
 
 #import "../PageLink/AccountPageLink.graphql"
 #import "../PageLink/ContentPageLink.graphql"
 #import "../PageLink/LoyaltyPageLink.graphql"
+#import "../PageLink/HotelPageLink.graphql"
+#import "../PageLink/CollectionPageLink.graphql"
 
 fragment ContactFields on ContactFields {
   display_text
@@ -30,6 +34,8 @@ fragment JoinLoyaltyContactSidebar_ContentPage on ContentPageSidebarJoinLoyaltyC
             ...AccountPageLink
             ...ContentPageLink
             ...LoyaltyPageLink
+            ...HotelPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -55,6 +61,8 @@ fragment JoinLoyaltyContactSidebar_ContentPageRefs on ContentPageSidebarJoinLoya
             ...AccountPageRef
             ...ContentPageRef
             ...LoyaltyPageRef
+            ...HotelPageRef
+            ...CollectionPageRef
           }
         }
       }
@@ -80,6 +88,8 @@ fragment JoinLoyaltyContactSidebar_LoyaltyPage on LoyaltyPageSidebarJoinLoyaltyC
             ...AccountPageLink
             ...ContentPageLink
             ...LoyaltyPageLink
+            ...HotelPageLink
+            ...CollectionPageLink
           }
         }
       }
@@ -105,6 +115,8 @@ fragment JoinLoyaltyContactSidebar_LoyaltyPageRefs on LoyaltyPageSidebarJoinLoya
             ...AccountPageRef
             ...ContentPageRef
             ...LoyaltyPageRef
+            ...HotelPageRef
+            ...CollectionPageRef
           }
         }
       }
diff --git a/lib/graphql/Query/AccountPage/Navigation.graphql b/lib/graphql/Query/AccountPage/Navigation.graphql
index defd6fe39..17ef35d3e 100644
--- a/lib/graphql/Query/AccountPage/Navigation.graphql
+++ b/lib/graphql/Query/AccountPage/Navigation.graphql
@@ -1,9 +1,13 @@
 #import "../../Fragments/PageLink/AccountPageLink.graphql"
 #import "../../Fragments/PageLink/ContentPageLink.graphql"
 #import "../../Fragments/PageLink/LoyaltyPageLink.graphql"
+#import "../../Fragments/PageLink/CollectionPageLink.graphql"
+#import "../../Fragments/PageLink/HotelPageLink.graphql"
 #import "../../Fragments/AccountPage/Ref.graphql"
 #import "../../Fragments/ContentPage/Ref.graphql"
 #import "../../Fragments/LoyaltyPage/Ref.graphql"
+#import "../../Fragments/HotelPage/Ref.graphql"
+#import "../../Fragments/CollectionPage/Ref.graphql"
 #import "../../Fragments/System.graphql"
 
 query GetNavigationMyPages($locale: String!) {
@@ -20,6 +24,8 @@ query GetNavigationMyPages($locale: String!) {
                 ...AccountPageLink
                 ...ContentPageLink
                 ...LoyaltyPageLink
+                ...CollectionPageLink
+                ...HotelPageLink
               }
             }
           }
@@ -42,6 +48,8 @@ query GetNavigationMyPagesRefs($locale: String!) {
                 ...AccountPageRef
                 ...ContentPageRef
                 ...LoyaltyPageRef
+                ...CollectionPageRef
+                ...HotelPageRef
               }
             }
           }
diff --git a/lib/graphql/Query/CollectionPage/CollectionPage.graphql b/lib/graphql/Query/CollectionPage/CollectionPage.graphql
index 50a10047b..239eb3c20 100644
--- a/lib/graphql/Query/CollectionPage/CollectionPage.graphql
+++ b/lib/graphql/Query/CollectionPage/CollectionPage.graphql
@@ -13,7 +13,7 @@ query GetCollectionPage($locale: String!, $uid: String!) {
     header {
       heading
       preamble
-      ...NavigationLinks
+      ...NavigationLinks_CollectionPage
     }
     blocks {
       __typename
@@ -35,19 +35,7 @@ query GetCollectionPage($locale: String!, $uid: String!) {
 query GetCollectionPageRefs($locale: String!, $uid: String!) {
   collection_page(locale: $locale, uid: $uid) {
     header {
-      navigation_links {
-        linkConnection {
-          edges {
-            node {
-              __typename
-              ...CollectionPageRef
-              ...ContentPageRef
-              ...HotelPageRef
-              ...LoyaltyPageRef
-            }
-          }
-        }
-      }
+      ...NavigationLinksRef_CollectionPage
     }
     blocks {
       __typename
diff --git a/lib/graphql/Query/ContentPage/ContentPage.graphql b/lib/graphql/Query/ContentPage/ContentPage.graphql
index 7b7f98511..87b7f285f 100644
--- a/lib/graphql/Query/ContentPage/ContentPage.graphql
+++ b/lib/graphql/Query/ContentPage/ContentPage.graphql
@@ -25,7 +25,7 @@ query GetContentPage($locale: String!, $uid: String!) {
     header {
       heading
       preamble
-      ...NavigationLinks
+      ...NavigationLinks_ContentPage
     }
     blocks {
       __typename
@@ -78,18 +78,7 @@ query GetContentPageBlocksBatch2($locale: String!, $uid: String!) {
 query GetContentPageRefs($locale: String!, $uid: String!) {
   content_page(locale: $locale, uid: $uid) {
     header {
-      navigation_links {
-        linkConnection {
-          edges {
-            node {
-              __typename
-              ...ContentPageRef
-              ...HotelPageRef
-              ...LoyaltyPageRef
-            }
-          }
-        }
-      }
+      ...NavigationLinksRef_ContentPage
     }
     sidebar {
       __typename
diff --git a/lib/graphql/Query/Footer.graphql b/lib/graphql/Query/Footer.graphql
index 789e5c109..81ce2b9dd 100644
--- a/lib/graphql/Query/Footer.graphql
+++ b/lib/graphql/Query/Footer.graphql
@@ -4,11 +4,13 @@
 #import "../Fragments/PageLink/ContentPageLink.graphql"
 #import "../Fragments/PageLink/HotelPageLink.graphql"
 #import "../Fragments/PageLink/LoyaltyPageLink.graphql"
+#import "../Fragments/PageLink/CollectionPageLink.graphql"
 
 #import "../Fragments/AccountPage/Ref.graphql"
 #import "../Fragments/ContentPage/Ref.graphql"
 #import "../Fragments/HotelPage/Ref.graphql"
 #import "../Fragments/LoyaltyPage/Ref.graphql"
+#import "../Fragments/CollectionPage/Ref.graphql"
 
 #import "../Fragments/Footer/AppDownloads.graphql"
 #import "../Fragments/Footer/SocialMedia.graphql"
@@ -29,6 +31,8 @@ query GetFooter($locale: String!) {
               ...ContentPageLink
               ...HotelPageLink
               ...LoyaltyPageLink
+              ...AccountPageLink
+              ...CollectionPageLink
             }
           }
         }
@@ -44,6 +48,8 @@ query GetFooter($locale: String!) {
                 ...ContentPageLink
                 ...HotelPageLink
                 ...LoyaltyPageLink
+                ...AccountPageLink
+                ...CollectionPageLink
               }
             }
           }
@@ -66,6 +72,8 @@ query GetFooter($locale: String!) {
               ...ContentPageLink
               ...HotelPageLink
               ...LoyaltyPageLink
+              ...AccountPageLink
+              ...CollectionPageLink
             }
           }
         }
@@ -86,6 +94,8 @@ query GetFooterRef($locale: String!) {
               ...ContentPageRef
               ...HotelPageRef
               ...LoyaltyPageRef
+              ...AccountPageRef
+              ...CollectionPageRef
             }
           }
         }
@@ -98,6 +108,8 @@ query GetFooterRef($locale: String!) {
                 ...ContentPageRef
                 ...HotelPageRef
                 ...LoyaltyPageRef
+                ...AccountPageRef
+                ...CollectionPageRef
               }
             }
           }
@@ -110,6 +122,8 @@ query GetFooterRef($locale: String!) {
               ...ContentPageRef
               ...HotelPageRef
               ...LoyaltyPageRef
+              ...AccountPageRef
+              ...CollectionPageRef
             }
           }
         }
diff --git a/lib/graphql/Query/Header.graphql b/lib/graphql/Query/Header.graphql
index 892a36195..814fa294f 100644
--- a/lib/graphql/Query/Header.graphql
+++ b/lib/graphql/Query/Header.graphql
@@ -60,6 +60,8 @@ query GetHeader($locale: String!) {
               ...ContentPageLink
               ...HotelPageLink
               ...LoyaltyPageLink
+              ...CollectionPageLink
+              ...AccountPageLink
             }
           }
         }
@@ -72,6 +74,8 @@ query GetHeader($locale: String!) {
                 ...ContentPageLink
                 ...HotelPageLink
                 ...LoyaltyPageLink
+                ...CollectionPageLink
+                ...AccountPageLink
               }
             }
           }
@@ -87,6 +91,8 @@ query GetHeader($locale: String!) {
                   ...ContentPageLink
                   ...HotelPageLink
                   ...LoyaltyPageLink
+                  ...CollectionPageLink
+                  ...AccountPageLink
                 }
               }
             }
@@ -146,6 +152,8 @@ query GetHeaderRef($locale: String!) {
               ...ContentPageRef
               ...HotelPageRef
               ...LoyaltyPageRef
+              ...CollectionPageRef
+              ...AccountPageRef
             }
           }
         }
@@ -157,6 +165,8 @@ query GetHeaderRef($locale: String!) {
                 ...ContentPageRef
                 ...HotelPageRef
                 ...LoyaltyPageRef
+                ...CollectionPageRef
+                ...AccountPageRef
               }
             }
           }
@@ -170,6 +180,8 @@ query GetHeaderRef($locale: String!) {
                   ...ContentPageRef
                   ...HotelPageRef
                   ...LoyaltyPageRef
+                  ...CollectionPageRef
+                  ...AccountPageRef
                 }
               }
             }
diff --git a/lib/graphql/Query/HotelPage/HotelPage.graphql b/lib/graphql/Query/HotelPage/HotelPage.graphql
index 541f4a9cc..82136fdda 100644
--- a/lib/graphql/Query/HotelPage/HotelPage.graphql
+++ b/lib/graphql/Query/HotelPage/HotelPage.graphql
@@ -2,8 +2,16 @@
 #import "../../Fragments/PageLink/ContentPageLink.graphql"
 #import "../../Fragments/PageLink/HotelPageLink.graphql"
 #import "../../Fragments/PageLink/LoyaltyPageLink.graphql"
+#import "../../Fragments/PageLink/CollectionPageLink.graphql"
+
+#import "../../Fragments/AccountPage/Ref.graphql"
+#import "../../Fragments/ContentPage/Ref.graphql"
+#import "../../Fragments/HotelPage/Ref.graphql"
+#import "../../Fragments/LoyaltyPage/Ref.graphql"
+#import "../../Fragments/CollectionPage/Ref.graphql"
 
 #import "../../Fragments/Blocks/Accordion.graphql"
+#import "../../Fragments/Blocks/Refs/Accordion.graphql"
 
 query GetHotelPage($locale: String!, $uid: String!) {
   hotel_page(locale: $locale, uid: $uid) {
@@ -23,23 +31,7 @@ query GetHotelPage($locale: String!, $uid: String!) {
       }
       specific_faq {
         __typename
-        questions {
-          question
-          answer {
-            json
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageLink
-                  ...ContentPageLink
-                  ...HotelPageLink
-                  ...LoyaltyPageLink
-                }
-              }
-            }
-          }
-        }
+        ...GlobalAccordionBlock
       }
     }
     content {
@@ -86,21 +78,7 @@ query GetHotelPageRefs($locale: String!, $uid: String!) {
         }
       }
       specific_faq {
-        questions {
-          answer {
-            embedded_itemsConnection {
-              edges {
-                node {
-                  __typename
-                  ...AccountPageRef
-                  ...ContentPageRef
-                  ...HotelPageRef
-                  ...LoyaltyPageRef
-                }
-              }
-            }
-          }
-        }
+        ...GlobalAccordionBlockRefs
       }
     }
     content {
diff --git a/server/routers/contentstack/base/output.ts b/server/routers/contentstack/base/output.ts
index d9f1f1790..a976a01a4 100644
--- a/server/routers/contentstack/base/output.ts
+++ b/server/routers/contentstack/base/output.ts
@@ -459,6 +459,8 @@ const linkRefsUnionSchema = z.discriminatedUnion("__typename", [
   pageLinks.contentPageRefSchema,
   pageLinks.hotelPageRefSchema,
   pageLinks.loyaltyPageRefSchema,
+  pageLinks.accountPageRefSchema,
+  pageLinks.collectionPageRefSchema,
 ])
 
 const linkRefsSchema = z
@@ -557,6 +559,7 @@ const linkUnionSchema = z.discriminatedUnion("__typename", [
   pageLinks.contentPageSchema,
   pageLinks.hotelPageSchema,
   pageLinks.loyaltyPageSchema,
+  pageLinks.collectionPageSchema,
 ])
 
 const linkSchema = z
@@ -732,6 +735,7 @@ export const alertSchema = z
                   pageLinks.contentPageSchema,
                   pageLinks.hotelPageSchema,
                   pageLinks.loyaltyPageSchema,
+                  pageLinks.collectionPageSchema,
                 ])
                 .transform((data) => {
                   const link = pageLinks.transform(data)
@@ -835,6 +839,7 @@ const sidepeekContentRefSchema = z.object({
             pageLinks.contentPageRefSchema,
             pageLinks.hotelPageRefSchema,
             pageLinks.loyaltyPageRefSchema,
+            pageLinks.collectionPageRefSchema,
           ]),
         })
       ),
diff --git a/server/routers/contentstack/myPages/navigation/output.ts b/server/routers/contentstack/myPages/navigation/output.ts
index e277a0c92..2f817c77b 100644
--- a/server/routers/contentstack/myPages/navigation/output.ts
+++ b/server/routers/contentstack/myPages/navigation/output.ts
@@ -12,6 +12,8 @@ const pageConnection = z.object({
         pageLinks.accountPageSchema,
         pageLinks.contentPageSchema,
         pageLinks.loyaltyPageSchema,
+        pageLinks.collectionPageSchema,
+        pageLinks.hotelPageSchema,
       ]),
     })
   ),
@@ -24,6 +26,8 @@ const pageConnectionRefs = z.object({
         pageLinks.accountPageRefSchema,
         pageLinks.contentPageRefSchema,
         pageLinks.loyaltyPageRefSchema,
+        pageLinks.collectionPageRefSchema,
+        pageLinks.hotelPageRefSchema,
       ]),
     })
   ),
diff --git a/server/routers/contentstack/schemas/blocks/accordion.ts b/server/routers/contentstack/schemas/blocks/accordion.ts
index c593c5c22..0e4c77268 100644
--- a/server/routers/contentstack/schemas/blocks/accordion.ts
+++ b/server/routers/contentstack/schemas/blocks/accordion.ts
@@ -18,6 +18,7 @@ export const accordionItemsSchema = z.array(
                 pageLinks.contentPageSchema,
                 pageLinks.hotelPageSchema,
                 pageLinks.loyaltyPageSchema,
+                pageLinks.collectionPageSchema,
               ])
               .transform((data) => {
                 const link = pageLinks.transform(data)
@@ -101,6 +102,7 @@ const actualRefs = z.discriminatedUnion("__typename", [
   pageLinks.contentPageRefSchema,
   pageLinks.hotelPageRefSchema,
   pageLinks.loyaltyPageRefSchema,
+  pageLinks.collectionPageRefSchema,
 ])
 
 export const globalAccordionConnectionRefs = z.object({
diff --git a/server/routers/contentstack/schemas/blocks/cardsGrid.ts b/server/routers/contentstack/schemas/blocks/cardsGrid.ts
index 0cf13859e..8afc38ccf 100644
--- a/server/routers/contentstack/schemas/blocks/cardsGrid.ts
+++ b/server/routers/contentstack/schemas/blocks/cardsGrid.ts
@@ -75,6 +75,7 @@ export const teaserCardBlockSchema = z.object({
                   pageLinks.contentPageSchema,
                   pageLinks.hotelPageSchema,
                   pageLinks.loyaltyPageSchema,
+                  pageLinks.collectionPageSchema,
                 ])
                 .transform((data) => {
                   const link = pageLinks.transform(data)
diff --git a/server/routers/contentstack/schemas/blocks/content.ts b/server/routers/contentstack/schemas/blocks/content.ts
index f7ede04d3..53de24634 100644
--- a/server/routers/contentstack/schemas/blocks/content.ts
+++ b/server/routers/contentstack/schemas/blocks/content.ts
@@ -31,6 +31,7 @@ export const contentSchema = z.object({
                   pageLinks.contentPageSchema,
                   pageLinks.hotelPageSchema,
                   pageLinks.loyaltyPageSchema,
+                  pageLinks.collectionPageSchema,
                 ])
                 .transform((data) => {
                   const link = pageLinks.transform(data)
@@ -63,6 +64,7 @@ export const contentRefsSchema = z.object({
                 pageLinks.contentPageRefSchema,
                 pageLinks.hotelPageRefSchema,
                 pageLinks.loyaltyPageRefSchema,
+                pageLinks.collectionPageRefSchema,
               ]),
             })
           ),
diff --git a/server/routers/contentstack/schemas/blocks/contentEmbeds.ts b/server/routers/contentstack/schemas/blocks/contentEmbeds.ts
index 88549fd63..22643a352 100644
--- a/server/routers/contentstack/schemas/blocks/contentEmbeds.ts
+++ b/server/routers/contentstack/schemas/blocks/contentEmbeds.ts
@@ -13,6 +13,7 @@ export const contentEmbedsSchema = z
     pageLinks.contentPageSchema,
     pageLinks.hotelPageSchema,
     pageLinks.loyaltyPageSchema,
+    pageLinks.collectionPageSchema,
   ])
   .transform((data) => {
     const link = pageLinks.transform(data)
diff --git a/server/routers/contentstack/schemas/blocks/dynamicContent.ts b/server/routers/contentstack/schemas/blocks/dynamicContent.ts
index 8b317648a..812fd6f57 100644
--- a/server/routers/contentstack/schemas/blocks/dynamicContent.ts
+++ b/server/routers/contentstack/schemas/blocks/dynamicContent.ts
@@ -26,6 +26,7 @@ export const dynamicContentSchema = z.object({
                   pageLinks.contentPageSchema,
                   pageLinks.hotelPageSchema,
                   pageLinks.loyaltyPageSchema,
+                  pageLinks.collectionPageSchema,
                 ])
                 .transform((data) => {
                   const link = pageLinks.transform(data)
@@ -64,6 +65,7 @@ export const dynamicContentRefsSchema = z.object({
                 pageLinks.contentPageRefSchema,
                 pageLinks.hotelPageRefSchema,
                 pageLinks.loyaltyPageRefSchema,
+                pageLinks.collectionPageRefSchema,
               ]),
             })
           ),
diff --git a/server/routers/contentstack/schemas/blocks/shortcuts.ts b/server/routers/contentstack/schemas/blocks/shortcuts.ts
index 3f08ff665..0026bb4bc 100644
--- a/server/routers/contentstack/schemas/blocks/shortcuts.ts
+++ b/server/routers/contentstack/schemas/blocks/shortcuts.ts
@@ -23,6 +23,8 @@ export const shortcutsBlockSchema = z.object({
                       pageLinks.accountPageSchema,
                       pageLinks.contentPageSchema,
                       pageLinks.loyaltyPageSchema,
+                      pageLinks.collectionPageSchema,
+                      pageLinks.hotelPageSchema,
                     ])
                     .transform((data) => {
                       const link = pageLinks.transform(data)
@@ -79,6 +81,8 @@ export const shortcutsRefsSchema = z.object({
                   pageLinks.accountPageRefSchema,
                   pageLinks.contentPageRefSchema,
                   pageLinks.loyaltyPageRefSchema,
+                  pageLinks.collectionPageRefSchema,
+                  pageLinks.hotelPageRefSchema,
                 ]),
               })
             ),
diff --git a/server/routers/contentstack/schemas/blocks/textCols.ts b/server/routers/contentstack/schemas/blocks/textCols.ts
index 6c6a465ff..0bad1549f 100644
--- a/server/routers/contentstack/schemas/blocks/textCols.ts
+++ b/server/routers/contentstack/schemas/blocks/textCols.ts
@@ -27,6 +27,8 @@ export const textColsSchema = z.object({
                     pageLinks.contentPageSchema,
                     pageLinks.hotelPageSchema,
                     pageLinks.loyaltyPageSchema,
+                    pageLinks.collectionPageSchema,
+                    pageLinks.accountPageSchema,
                   ])
                   .transform((data) => {
                     const link = pageLinks.transform(data)
diff --git a/server/routers/contentstack/schemas/blocks/uspGrid.ts b/server/routers/contentstack/schemas/blocks/uspGrid.ts
index fc351fbe0..cc8acb0d1 100644
--- a/server/routers/contentstack/schemas/blocks/uspGrid.ts
+++ b/server/routers/contentstack/schemas/blocks/uspGrid.ts
@@ -18,6 +18,7 @@ const uspCardSchema = z.object({
               pageLinks.contentPageSchema,
               pageLinks.hotelPageSchema,
               pageLinks.loyaltyPageSchema,
+              pageLinks.collectionPageSchema,
             ])
             .transform((data) => {
               const link = pageLinks.transform(data)
diff --git a/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts b/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts
index e545f9c97..10b85bc1c 100644
--- a/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts
+++ b/server/routers/contentstack/schemas/blocks/utils/buttonLinkSchema.ts
@@ -22,6 +22,7 @@ export const buttonSchema = z
               pageLinks.contentPageSchema,
               pageLinks.loyaltyPageSchema,
               pageLinks.hotelPageSchema,
+              pageLinks.collectionPageSchema,
             ])
             .transform((data) => {
               const link = pageLinks.transform(data)
diff --git a/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts b/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts
index 1febeebd5..738d06688 100644
--- a/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts
+++ b/server/routers/contentstack/schemas/blocks/utils/linkConnection.ts
@@ -11,6 +11,8 @@ export const linkConnectionRefsSchema = z
             pageLinks.accountPageRefSchema,
             pageLinks.contentPageRefSchema,
             pageLinks.loyaltyPageRefSchema,
+            pageLinks.collectionPageRefSchema,
+            pageLinks.hotelPageRefSchema,
           ]),
         })
       ),
diff --git a/server/routers/contentstack/schemas/linkConnection.ts b/server/routers/contentstack/schemas/linkConnection.ts
index 8fd074ba9..ea6ee3649 100644
--- a/server/routers/contentstack/schemas/linkConnection.ts
+++ b/server/routers/contentstack/schemas/linkConnection.ts
@@ -8,6 +8,7 @@ const linkUnionSchema = z.discriminatedUnion("__typename", [
   pageLinks.collectionPageSchema,
   pageLinks.hotelPageSchema,
   pageLinks.loyaltyPageSchema,
+  pageLinks.accountPageSchema,
 ])
 
 const titleSchema = z.object({
@@ -51,6 +52,8 @@ const linkRefsUnionSchema = z.discriminatedUnion("__typename", [
   pageLinks.contentPageRefSchema,
   pageLinks.hotelPageRefSchema,
   pageLinks.loyaltyPageRefSchema,
+  pageLinks.accountPageRefSchema,
+  pageLinks.collectionPageRefSchema,
 ])
 
 export const linkConnectionRefs = z
diff --git a/server/routers/contentstack/schemas/sidebar/content.ts b/server/routers/contentstack/schemas/sidebar/content.ts
index 8f8e83239..2f84243d9 100644
--- a/server/routers/contentstack/schemas/sidebar/content.ts
+++ b/server/routers/contentstack/schemas/sidebar/content.ts
@@ -29,6 +29,9 @@ export const contentSchema = z.object({
                   imageSchema,
                   pageLinks.contentPageSchema,
                   pageLinks.loyaltyPageSchema,
+                  pageLinks.collectionPageSchema,
+                  pageLinks.hotelPageSchema,
+                  pageLinks.accountPageSchema,
                 ])
                 .transform((data) => {
                   const link = pageLinks.transform(data)
@@ -54,6 +57,9 @@ const actualRefs = z.discriminatedUnion("__typename", [
   imageContainerRefsSchema,
   pageLinks.contentPageRefSchema,
   pageLinks.loyaltyPageRefSchema,
+  pageLinks.collectionPageRefSchema,
+  pageLinks.hotelPageRefSchema,
+  pageLinks.accountPageRefSchema,
 ])
 
 type Ref = typeof actualRefs._type
diff --git a/types/trpc/routers/contentstack/contentPage.ts b/types/trpc/routers/contentstack/contentPage.ts
index e1b71bff5..1ee74c5a6 100644
--- a/types/trpc/routers/contentstack/contentPage.ts
+++ b/types/trpc/routers/contentstack/contentPage.ts
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import {
+import type {
   blocksSchema,
   contentPageRefsSchema,
   contentPageSchema,
diff --git a/types/trpc/routers/contentstack/loyaltyPage.ts b/types/trpc/routers/contentstack/loyaltyPage.ts
index 277d45ae0..9c0ecd203 100644
--- a/types/trpc/routers/contentstack/loyaltyPage.ts
+++ b/types/trpc/routers/contentstack/loyaltyPage.ts
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import {
+import type {
   blocksSchema,
   loyaltyPageRefsSchema,
   loyaltyPageSchema,
diff --git a/types/trpc/routers/utils/embeds.ts b/types/trpc/routers/utils/embeds.ts
index d32971741..6c647aea7 100644
--- a/types/trpc/routers/utils/embeds.ts
+++ b/types/trpc/routers/utils/embeds.ts
@@ -1,5 +1,5 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import { contentEmbedsSchema } from "@/server/routers/contentstack/schemas/blocks/contentEmbeds"
+import type { contentEmbedsSchema } from "@/server/routers/contentstack/schemas/blocks/contentEmbeds"
 
 export type Embeds = z.output<typeof contentEmbedsSchema>