diff --git a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
index 1d622dd6..752e4fe4 100644
--- a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
+++ b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useContext, useEffect, useState } from 'react';
+import { createContext, use, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router';
 
 export interface NavigationProps {
@@ -23,9 +23,9 @@ interface INavigationContext {
   setIsBlocked: (value: boolean) => void;
 }
 
-const NavigationContext = createContext<INavigationContext | null>(null);
+export const NavigationContext = createContext<INavigationContext | null>(null);
 export const useConceptNavigation = () => {
-  const context = useContext(NavigationContext);
+  const context = use(NavigationContext);
   if (!context) {
     throw new Error('useConceptNavigation has to be used within <NavigationState>');
   }
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
index 1ce36d05..a831d904 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useContext, useEffect, useState } from 'react';
+import { createContext, use, useEffect, useState } from 'react';
 
 import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
@@ -44,9 +44,9 @@ export interface IOssEditContext {
   setSelected: React.Dispatch<React.SetStateAction<number[]>>;
 }
 
-const OssEditContext = createContext<IOssEditContext | null>(null);
+export const OssEditContext = createContext<IOssEditContext | null>(null);
 export const useOssEdit = () => {
-  const context = useContext(OssEditContext);
+  const context = use(OssEditContext);
   if (context === null) {
     throw new Error('useOssEdit has to be used within <OssEditState>');
   }
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TemplateContext.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TemplateContext.tsx
index e142f8ce..7e2939b5 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TemplateContext.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TemplateContext.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useContext, useState } from 'react';
+import { createContext, use, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 
 import { useDialogsStore } from '@/stores/dialogs';
@@ -25,9 +25,9 @@ export interface ITemplateContext {
   onChangeFilterCategory: (newFilterCategory: IConstituenta | null) => void;
 }
 
-const TemplateContext = createContext<ITemplateContext | null>(null);
+export const TemplateContext = createContext<ITemplateContext | null>(null);
 export const useTemplateContext = () => {
-  const context = useContext(TemplateContext);
+  const context = use(TemplateContext);
   if (context === null) {
     throw new Error('useTemplateContext has to be used within <TemplateState>');
   }
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
index ff193de3..13cc24af 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorControls.tsx
@@ -18,7 +18,7 @@ interface EditorControlsProps {
 }
 
 export function EditorControls({ constituenta, disabled, onEditTerm }: EditorControlsProps) {
-  const { schema } = useRSEdit();
+  const schema = useRSEdit().schema;
   const { isModified } = useModificationStore();
   const isProcessing = useMutatingRSForm();
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
index 00a4e244..dfe94c96 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@@ -61,7 +61,7 @@ export function EditorRSExpression({
   onShowTypeGraph,
   ...restProps
 }: EditorRSExpressionProps) {
-  const { schema } = useRSEdit();
+  const schema = useRSEdit().schema;
 
   const [isModified, setIsModified] = useState(false);
   const rsInput = useRef<ReactCodeMirrorRef>(null);
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
index 6a01f75f..c93cfb86 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
@@ -8,8 +8,8 @@ import { colorBgSchemas } from '../../../colors';
 import { useRSEdit } from '../RSEditContext';
 
 export function SchemasGuide() {
-  const { items: libraryItems } = useLibrary();
-  const { schema } = useRSEdit();
+  const libraryItems = useLibrary().items;
+  const schema = useRSEdit().schema;
 
   const schemas = (() => {
     const processed = new Set<number>();
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
index 7d29f833..354a7a2e 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { createContext, useContext, useEffect, useState } from 'react';
+import { createContext, use, useEffect, useState } from 'react';
 
 import { urls, useConceptNavigation } from '@/app';
 import { useAuthSuspense } from '@/features/auth';
@@ -66,9 +66,9 @@ export interface IRSEditContext {
   promptTemplate: () => void;
 }
 
-const RSEditContext = createContext<IRSEditContext | null>(null);
+export const RSEditContext = createContext<IRSEditContext | null>(null);
 export const useRSEdit = () => {
-  const context = useContext(RSEditContext);
+  const context = use(RSEditContext);
   if (context === null) {
     throw new Error('useRSEdit has to be used within <RSEditState>');
   }
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
index bb34bbfe..c8b1f28b 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@@ -24,7 +24,7 @@ export function ConstituentsSearch({ dense }: ConstituentsSearchProps) {
   const setSource = useCstSearchStore(state => state.setSource);
   const toggleInherited = useCstSearchStore(state => state.toggleInherited);
 
-  const { schema } = useRSEdit();
+  const schema = useRSEdit().schema;
 
   return (
     <div className='flex border-b clr-input rounded-t-md'>