diff --git a/src/psm_parser.py b/src/psm_parser.py
index c5ac408..d614056 100644
--- a/src/psm_parser.py
+++ b/src/psm_parser.py
@@ -99,7 +99,7 @@ function Get-CodeServerObject!NAME! {
                 $params.Add("CacheKeyProperty", $CacheKeyProperty)
             }
 
-            [void](Get-AllCodeServerPagesRoles @params)
+            [void](Get-AllCodeServerPages!NAME! @params)
         }
 
         $cacheKey = $Resource.GetHashCode()
@@ -119,6 +119,7 @@ function Get-CodeServerObject!NAME! {
 convert_from = """
 Function ConvertFrom-CodeServerObject!NAME!([PSCustomObject[]]$codeServerObject!NAME!) {
     $map = @{
+        "conceptCodeId" = "conceptCodeId";
 !MAPS!	
     }
     
@@ -145,21 +146,21 @@ class CodeServer!NAME! {
 !VARIABLES!
 
     }
-
+    [string]${conceptCodeId}
 !STRINGS!
 
 }
 
 Export-ModuleMember ConvertFrom-CodeServerObject!NAME!
-Export-AllCodeServerPages!NAME!
-Export-CodeServerObject!NAME!
+Export-ModuleMember Get-AllCodeServerPages!NAME!
+Export-ModuleMember Get-CodeServerObject!NAME!
 """
 
 def define_maps(items: list[str]) -> str:
-    return "\n".join([f"\t'{sanitize_name(item)}' = '{item}'" for item in items])
+    return "\n".join([f"\t\"{sanitize_name(item)}\" = \"{item}\";" for item in items])
 
 def define_variables(items: list[str]) -> str:
-    return "\n".join([f"\t$this.{{{sanitize_name(item)}}} = $dic['{item}']" for item in items])
+    return "\n".join([f"\t$this.{{{sanitize_name(item)}}} = $dic[\"{item}\"]" for item in items])
 
 def define_strings(items: list[str]) -> str:
     return "\n".join(["\t" + "[string]$" + "{" + sanitize_name(item) + "}" for item in items])
diff --git a/src/xml_parser.py b/src/xml_parser.py
index 5301838..cfd77a2 100644
--- a/src/xml_parser.py
+++ b/src/xml_parser.py
@@ -47,7 +47,7 @@ def add_connection(root: ET.Element, name: str, attr_list: list[str], descriptio
         if predefined_commands is None:
             predefined_commands = ET.SubElement(initialization, "PredefinedCommands")
         ET.SubElement(predefined_commands, "Command", Name=f"Get-AllCodeServerPages{name}")
-        ET.SubElement(predefined_commands, "Command", Name=f"Get-CodeServerPage{name}")
+        ET.SubElement(predefined_commands, "Command", Name=f"Get-CodeServerObject{name}")
 
     schema = root.find("Schema")
     if schema is not None:
@@ -57,22 +57,22 @@ def add_connection(root: ET.Element, name: str, attr_list: list[str], descriptio
         property = ET.SubElement(properties, "Property", Name="conceptCodeId", DataType="String", IsMultivalue="false", IsAutoFill="false", IsUniqueKey="true")
         return_binding = ET.SubElement(property, "ReturnBindings")
         ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-AllCodeServerPages{name}", Path="conceptCodeId")
-        ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-CodeServerPage{name}", Path="conceptCodeId")
+        ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-CodeServerObject{name}", Path="conceptCodeId")
         mapping = ET.SubElement(property, "CommandMappings")
-        ET.SubElement(mapping, "Map", ToCommand=f"Get-CodeServerPages{name}", Parameter="conceptCodeId")
+        ET.SubElement(mapping, "Map", ToCommand=f"Get-AllCodeServerPages{name}", Parameter="conceptCodeId")
 
         for attr in attr_list:
             property = ET.SubElement(properties, "Property", Name=sanitize_name(attr), DataType="String", IsMultivalue="false", IsAutoFill="false")
             return_binding = ET.SubElement(property, "ReturnBindings")
             ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-AllCodeServerPages{name}", Path=sanitize_name(attr))
-            ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-CodeServerPage{name}", Path=sanitize_name(attr))
+            ET.SubElement(return_binding, "Bind", CommandResultOf=f"Get-CodeServerObject{name}", Path=sanitize_name(attr))
         
         read_configuration = ET.SubElement(new_class, "ReadConfiguration")
         listing_command = ET.SubElement(read_configuration, "ListingCommand", Command=f"Get-AllCodeServerPages{name}")
         ET.SubElement(listing_command, "SetParameter", Param="Resource", Source="ConnectionParameter", Value=f"VarhaUrl{name}")
         ET.SubElement(listing_command, "SetParameter", Param="RootProperty", Source="FixedValue", Value="conceptCodes")
         cmd_squence = ET.SubElement(read_configuration, "CommandSequence")
-        item = ET.SubElement(cmd_squence, "Item", Command=f"Get-CodeServerPage{name}", Order="1")
+        item = ET.SubElement(cmd_squence, "Item", Command=f"Get-CodeServerObject{name}", Order="1")
         ET.SubElement(item, "SetParameter", Param="Resource", Source="ConnectionParameter", Value=f"VarhaUrl{name}")
         ET.SubElement(item, "SetParameter", Param="RootProperty", Source="FixedValue", Value="conceptCodes")
     return root