diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 3a01606ce32369d0f0968282569eaf4ed59d778c..19c0d75a095bc5dc239d1d95237378bcf2fbb8da 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -364,7 +364,7 @@ for COMPONENT in $TFS_COMPONENTS; do
     echo "Waiting for '$COMPONENT' component..."
     COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")
     kubectl wait --namespace $TFS_K8S_NAMESPACE \
-        --for='condition=available' --timeout=300s deployment/${COMPONENT_OBJNAME}service
+        --for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service
     printf "\n"
 done
 
diff --git a/src/context/service/ContextServiceServicerImpl.py b/src/context/service/ContextServiceServicerImpl.py
index 8b5a3f7bca87c054fa7faeb89472271fd549f1fc..2cfe39b0cdbb9080f84a76c335077020c9631a80 100644
--- a/src/context/service/ContextServiceServicerImpl.py
+++ b/src/context/service/ContextServiceServicerImpl.py
@@ -44,7 +44,7 @@ from .database.Slice import (
     slice_delete, slice_get, slice_list_ids, slice_list_objs, slice_select, slice_set, slice_unset)
 from .database.Topology import (
     topology_delete, topology_get, topology_get_details, topology_list_ids, topology_list_objs, topology_set)
-from .database.OpticalConfigOperator import (set_OpticalConfig,select_OpticalConfig,get_OpticalConfig)
+from .database.OpticalConfig import (set_opticalconfig,select_opticalconfig,get_opticalconfig)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -302,16 +302,16 @@ class ContextServiceServicerImpl(ContextServiceServicer, ContextPolicyServiceSer
     @safe_and_metered_rpc_method(METRICS_POOL,LOGGER)
     def GetOpticalConfig(self,request:Empty,context:grpc.ServicerContext) -> OpticalConfigList:
   
-        result =get_OpticalConfig(db_engine=self.db_engine)
+        result =get_opticalconfig(db_engine=self.db_engine)
       
         return OpticalConfigList(OpticalConfigs=result)
     def SetOpticalConfig(self,request:OpticalConfig,context:grpc.ServicerContext)-> OpticalConfigId:
       
-        OpticalConfig_id= set_OpticalConfig(db_engine=self.db_engine,request=request)
+        OpticalConfig_id= set_opticalconfig(db_engine=self.db_engine,request=request)
   
         return OpticalConfigId(**OpticalConfig_id)
     def SelectOpticalConfig (self,request:OpticalConfigId,context:grpc.ServicerContext) -> OpticalConfig:
-        result =select_OpticalConfig(db_engine=self.db_engine,request=request)
+        result =select_opticalconfig(db_engine=self.db_engine,request=request)
         logging.info(f"FromSelectOpticalConfig {result}")
         myid =OpticalConfigId()
         myid.CopyFrom(result.OpticalConfig_id)
diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index 04fb54be5edf2aa02d21f2608bef4146b7c629c5..35c542854b156433c5aa7a2af6f03e7aee999d39 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -469,7 +469,7 @@ def get_edit_target (device:Device,is_opticalband:bool)-> str:
         if device.device_type =='optical-roadm': return 'media-channel'
         else : return 'optical-channel'
         
-def is_key_existed( key:str ,keys_dic=dict,key_name_to_use= None | str ) -> dict:
+def is_key_existed( key:str ,keys_dic=dict,key_name_to_use= None ) -> dict:
     dic={}
     dic["resource_key"]=key    
     if key_name_to_use is not None: