diff --git a/apps/shinkai-app/src/pages/AddAgent.tsx b/apps/shinkai-app/src/pages/AddAgent.tsx
index d27a4982e..192e26188 100644
--- a/apps/shinkai-app/src/pages/AddAgent.tsx
+++ b/apps/shinkai-app/src/pages/AddAgent.tsx
@@ -57,7 +57,6 @@ const AddAgent: React.FC = () => {
   const onSubmit = (data: z.infer<typeof addAgentSchema>) => {
     const modelMapping: Record<string, { model_type: string }> = {
       OpenAI: { model_type: modelType },
-      SleepAPI: { model_type: modelType },
     };
 
     if (!auth) return;
@@ -208,9 +207,6 @@ const AddAgent: React.FC = () => {
                           <IonSelectOption value="OpenAI">
                             OpenAI
                           </IonSelectOption>
-                          <IonSelectOption value="SleepAPI">
-                            SleepAPI
-                          </IonSelectOption>
                         </IonSelect>
                         <ErrorMessage
                           errors={addAgentForm.formState.errors}
diff --git a/apps/shinkai-visor/src/components/add-agent/add-agent.tsx b/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
index 1ee086b5c..c9d6cf9cb 100644
--- a/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
+++ b/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
@@ -1,13 +1,13 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useCreateAgent } from '@shinkai_network/shinkai-node-state/lib/mutations/createAgent/useCreateAgent';
 import { Bot, Loader2 } from 'lucide-react';
-import { useForm } from 'react-hook-form';
+import { useEffect, useState } from 'react';
+import { useForm, useWatch } from 'react-hook-form';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { z } from 'zod';
 
 import { useAuth } from '../../store/auth/auth';
-import { useUIContainer } from '../../store/ui-container/ui-container';
 import { Header } from '../header/header';
 import { Button } from '../ui/button';
 import {
@@ -27,17 +27,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from '../ui/select';
-
-enum Models {
-  OpenAI = 'open-api',
-  SleepApi = 'sleep-api',
-}
+import { Models, modelsConfig } from './models';
 
 const formSchema = z.object({
-  agentName: z.string().nonempty(),
-  externalUrl: z.string().url().nonempty(),
-  apiKey: z.string().nonempty(),
+  // TODO: Translate this error message
+  agentName: z.string().regex(/^[a-zA-Z0-9]+(_[a-zA-Z0-9]+)*$/, 'It just accepts alphanumeric characters and underscores'),
+  externalUrl: z.string().url(),
+  apiKey: z.string().min(4),
   model: z.nativeEnum(Models),
+  modelType: z.string().min(4),
 });
 
 type FormSchemaType = z.infer<typeof formSchema>;
@@ -45,33 +43,46 @@ type FormSchemaType = z.infer<typeof formSchema>;
 export const AddAgent = () => {
   const history = useHistory();
   const auth = useAuth((state) => state.auth);
-  const uiContainer = useUIContainer((state) => state.uiContainer);
   const form = useForm<FormSchemaType>({
     resolver: zodResolver(formSchema),
     defaultValues: {
-      agentName: 'gpt',
-      externalUrl: 'https://api.openai.com',
+      agentName: '',
+      externalUrl: modelsConfig[Models.OpenAI].apiUrl,
       apiKey: '',
       model: Models.OpenAI,
+      modelType: '',
     },
   });
   const intl = useIntl();
+  const currentModel = useWatch<FormSchemaType>({
+    control: form.control,
+    name: 'model',
+  });
   const { mutateAsync: createAgent, isLoading } = useCreateAgent({
-    onSuccess: (data) => {
+    onSuccess: () => {
       history.replace({ pathname: '/inboxes/create-job' });
     },
   });
-
   const modelOptions: { value: Models; label: string }[] = [
     {
       value: Models.OpenAI,
       label: intl.formatMessage({ id: 'openai' }),
     },
     {
-      value: Models.SleepApi,
-      label: intl.formatMessage({ id: 'sleep-api' }),
+      value: Models.TogetherComputer,
+      label: intl.formatMessage({ id: 'togethercomputer' }),
     },
   ];
+  const getModelObject = (model: Models, modelType: string) => {
+    switch (model) {
+      case Models.OpenAI:
+        return { OpenAI: { model_type: modelType } };
+      case Models.TogetherComputer:
+        return { GenericAPI: { model_type: modelType } };
+      default:
+        throw new Error('unknown model');
+    }
+  };
   const submit = (values: FormSchemaType) => {
     if (!auth) return;
     createAgent({
@@ -86,10 +97,7 @@ export const AddAgent = () => {
         perform_locally: false,
         storage_bucket_permissions: [],
         toolkit_permissions: [],
-        model:
-          values.model === Models.OpenAI
-            ? { OpenAI: { model_type: 'gpt-3.5-turbo' } }
-            : { SleepAPI: {} },
+        model: getModelObject(values.model, values.modelType),
       },
       setupDetailsState: {
         my_device_encryption_sk: auth.my_device_encryption_sk,
@@ -100,6 +108,26 @@ export const AddAgent = () => {
       },
     });
   };
+  const [modelTypeOptions, setModelTypeOptions] = useState<
+    { label: string; value: string }[]
+  >([]);
+  useEffect(() => {
+    const modelConfig = modelsConfig[currentModel as Models];
+    form.setValue('externalUrl', modelConfig.apiUrl);
+    setModelTypeOptions(
+      modelsConfig[currentModel as Models].modelTypes.map((modelType) => ({
+        label: modelType.name,
+        value: modelType.value,
+      }))
+    );
+  }, [currentModel, form]);
+  useEffect(() => {
+    if (!modelTypeOptions?.length) {
+      return;
+    }
+    form.setValue('modelType', modelTypeOptions[0].value);
+  }, [modelTypeOptions, form]);
+
   return (
     <div className="h-full flex flex-col space-y-3">
       <Header
@@ -171,13 +199,14 @@ export const AddAgent = () => {
                   <Select
                     defaultValue={field.value as unknown as string}
                     onValueChange={field.onChange}
+                    value={field.value}
                   >
                     <FormControl>
                       <SelectTrigger>
                         <SelectValue />
                       </SelectTrigger>
                     </FormControl>
-                    <SelectPortal container={uiContainer?.rootElement}>
+                    <SelectPortal>
                       <SelectContent>
                         {modelOptions.map((model) => (
                           <SelectItem
@@ -194,6 +223,39 @@ export const AddAgent = () => {
                 </FormItem>
               )}
             />
+
+            <FormField
+              control={form.control}
+              name="modelType"
+              render={({ field }) => (
+                <FormItem>
+                  <Select
+                    defaultValue={field.value as unknown as string}
+                    onValueChange={field.onChange}
+                    value={field.value}
+                  >
+                    <FormControl>
+                      <SelectTrigger>
+                        <SelectValue />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectPortal>
+                      <SelectContent className="max-h-[150px] max-w-[325px] text-xs overflow-y-auto">
+                        {modelTypeOptions.map((modelType) => (
+                          <SelectItem
+                            key={modelType.value}
+                            value={modelType.value}
+                          >
+                            {modelType.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </SelectPortal>
+                  </Select>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
           </div>
           <Button className="w-full" disabled={isLoading} type="submit">
             {isLoading ? (
diff --git a/apps/shinkai-visor/src/components/add-agent/models.ts b/apps/shinkai-visor/src/components/add-agent/models.ts
new file mode 100644
index 000000000..cb9b8425c
--- /dev/null
+++ b/apps/shinkai-visor/src/components/add-agent/models.ts
@@ -0,0 +1,209 @@
+export enum Models {
+  OpenAI = 'open-ai',
+  TogetherComputer = 'togethercomputer',
+}
+
+export const modelsConfig = {
+  [Models.OpenAI]: {
+    apiUrl: 'https://api.openai.com',
+    modelTypes: [
+      {
+        name: 'GPT 3.5 Turbo',
+        value: 'gpt-3.5-turbo',
+      },
+    ],
+  },
+  [Models.TogetherComputer]: {
+    apiUrl: 'https://api.together.xyz',
+    modelTypes: [
+      {
+        name: 'Stanford - Alpaca (7B)',
+        value: 'togethercomputer/alpaca-7b',
+      },
+      {
+        name: 'Austism - Chronos Hermes (13B)',
+        value: 'Austism/chronos-hermes-13b',
+      },
+      {
+        name: 'Meta - Code Llama Instruct (13B)	',
+        value: 'togethercomputer/CodeLlama-13b-Instruct	',
+      },
+      {
+        name: 'Meta - Code Llama Instruct (34B)	',
+        value: 'togethercomputer/CodeLlama-34b-Instruct	',
+      },
+      {
+        name: 'Meta - Code Llama Instruct (7B)	',
+        value: 'togethercomputer/CodeLlama-7b-Instruct	',
+      },
+      {
+        name: 'Databricks - Dolly v2 (12B)',
+        value: 'databricks/dolly-v2-12b',
+      },
+      {
+        name: 'Databricks - Dolly v2 (3B)',
+        value: 'databricks/dolly-v2-3b',
+      },
+      {
+        name: 'Databricks - Dolly v2 (7B)',
+        value: 'databricks/dolly-v2-7b',
+      },
+      {
+        name: 'TII UAE - Falcon Instruct (40B)',
+        value: 'togethercomputer/falcon-40b-instruct',
+      },
+      {
+        name: 'TII UAE - Falcon Instruct (7B)',
+        value: 'togethercomputer/falcon-7b-instruct',
+      },
+      {
+        name: 'Together - GPT-NeoXT-Chat-Base (20B)',
+        value: 'togethercomputer/GPT-NeoXT-Chat-Base-20B',
+      },
+      {
+        name: 'Tim Dettmers - Guanaco (13B)',
+        value: 'togethercomputer/guanaco-13b',
+      },
+      {
+        name: 'Tim Dettmers - Guanaco (33B)',
+        value: 'togethercomputer/guanaco-33b',
+      },
+      {
+        name: 'Tim Dettmers - Guanaco (65B)',
+        value: 'togethercomputer/guanaco-65b',
+      },
+      {
+        name: 'Tim Dettmers - Guanaco (7B)',
+        value: 'togethercomputer/guanaco-7b',
+      },
+      {
+        name: 'Salesforce - InstructCodeT5 (16B)',
+        value: 'Salesforce/instructcodet5p-16b',
+      },
+      {
+        name: 'LM Sys - Koala (13B)',
+        value: 'togethercomputer/Koala-13B',
+      },
+      {
+        name: '2048 - Koala (7B)',
+        value: 'togethercomputer/Koala-7B',
+      },
+      {
+        name: 'OpenAssistant - LLaMA 2 SFT v10 (70B)',
+        value: 'OpenAssistant/llama2-70b-oasst-sft-v10',
+      },
+      {
+        name: 'Meta - LLaMA-2 Chat (13B)',
+        value: 'togethercomputer/llama-2-13b-chat',
+      },
+      {
+        name: 'Meta - LLaMA-2 Chat (70B)',
+        value: 'togethercomputer/llama-2-70b-chat',
+      },
+      {
+        name: 'Meta - LLaMA-2 Chat (7B)',
+        value: 'togethercomputer/llama-2-7b-chat',
+      },
+      {
+        name: 'Together - LLaMA-2-7B-32K-Instruct (7B)',
+        value: 'togethercomputer/Llama-2-7B-32K-Instruct',
+      },
+      {
+        name: 'Mosaic ML - MPT-Chat (30B)',
+        value: 'togethercomputer/mpt-30b-chat',
+      },
+      {
+        name: 'Mosaic ML - MPT-Chat (7B)',
+        value: 'togethercomputer/mpt-7b-chat',
+      },
+      {
+        name: 'mistralai - Mistral (7B) Instruct',
+        value: 'mistralai/Mistral-7B-Instruct-v0.1',
+      },
+      {
+        name: 'Gryphe - MythoMax-L2 (13B)',
+        value: 'Gryphe/MythoMax-L2-13b',
+      },
+      {
+        name: 'NousResearch - Nous Hermes LLaMA-2 (70B)',
+        value: 'NousResearch/Nous-Hermes-Llama2-70b	',
+      },
+      {
+        name: 'NousResearch - Nous Hermes LLaMA-2 (7B)',
+        value: 'NousResearch/Nous-Hermes-Llama2-7b',
+      },
+      {
+        name: 'NousResearch - Nous Hermes Llama-2 (13B)',
+        value: 'NousResearch/Nous-Hermes-Llama2-13b',
+      },
+      {
+        name: 'LAION - Open-Assistant LLaMA SFT-6 (30B)',
+        value: 'OpenAssistant/oasst-sft-6-llama-30b-xor',
+      },
+      {
+        name: 'LAION - Open-Assistant Pythia SFT-4 (12B)',
+        value: 'OpenAssistant/oasst-sft-4-pythia-12b-epoch-3.5',
+      },
+      {
+        name: 'LAION - Open-Assistant StableLM SFT-7 (7B)',
+        value: 'OpenAssistant/stablelm-7b-sft-v7-epoch-3',
+      },
+      {
+        name: 'teknium - OpenHermes-2-Mistral (7B)',
+        value: 'teknium/OpenHermes-2-Mistral-7B',
+      },
+      {
+        name: 'OpenOrca - OpenOrca Mistral (7B) 8K',
+        value: 'Open-Orca/Mistral-7B-OpenOrca',
+      },
+      {
+        name: 'garage-bAInd - Platypus2 Instruct (70B)',
+        value: 'garage-bAInd/Platypus2-70B-instruct',
+      },
+      {
+        name: 'Together - Pythia-Chat-Base (7B)',
+        value: 'togethercomputer/Pythia-Chat-Base-7B-v0.16',
+      },
+      {
+        name: 'Qwen - Qwen-Chat (7B)',
+        value: 'togethercomputer/Qwen-7B-Chat',
+      },
+      {
+        name: 'Together - RedPajama-INCITE Chat (3B)',
+        value: 'togethercomputer/RedPajama-INCITE-Chat-3B-v1',
+      },
+      {
+        name: 'Together - RedPajama-INCITE Chat (7B)',
+        value: 'togethercomputer/RedPajama-INCITE-7B-Chat',
+      },
+      {
+        name: 'Upstage - SOLAR v0 (70B)',
+        value: 'upstage/SOLAR-0-70b-16bit',
+      },
+      {
+        name: 'HuggingFaceH4 - StarCoderChat Alpha (16B)',
+        value: 'HuggingFaceH4/starchat-alpha',
+      },
+      {
+        name: 'LM Sys - Vicuna v1.3 (13B)',
+        value: 'lmsys/vicuna-13b-v1.3',
+      },
+      {
+        name: 'LM Sys - Vicuna v1.3 (7B)',
+        value: 'lmsys/vicuna-7b-v1.3',
+      },
+      {
+        name: 'LM Sys - Vicuna v1.5 (13B)',
+        value: 'lmsys/vicuna-13b-v1.5',
+      },
+      {
+        name: 'LM Sys - Vicuna v1.5 (7B)',
+        value: 'lmsys/vicuna-7b-v1.5',
+      },
+      {
+        name: 'LM Sys - Vicuna-FastChat-T5 (3B)',
+        value: 'lmsys/fastchat-t5-3b-v1.0',
+      },
+    ],
+  },
+};
diff --git a/apps/shinkai-visor/src/components/create-job/create-job.tsx b/apps/shinkai-visor/src/components/create-job/create-job.tsx
index cdccc490e..a53126268 100644
--- a/apps/shinkai-visor/src/components/create-job/create-job.tsx
+++ b/apps/shinkai-visor/src/components/create-job/create-job.tsx
@@ -11,7 +11,6 @@ import { z } from 'zod';
 
 import { useQuery } from '../../hooks/use-query';
 import { useAuth } from '../../store/auth/auth';
-import { useUIContainer } from '../../store/ui-container/ui-container';
 import { FileInput } from '../file-input/file-input';
 import { Header } from '../header/header';
 import { Button } from '../ui/button';
@@ -48,7 +47,6 @@ export const CreateJob = () => {
   const location = useLocation<{ files: File[] }>();
   const query = useQuery();
   const auth = useAuth((state) => state.auth);
-  const uiContainer = useUIContainer((state) => state.uiContainer);
   const form = useForm<FormSchemaType>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -137,7 +135,7 @@ export const CreateJob = () => {
                         <SelectValue />
                       </SelectTrigger>
                     </FormControl>
-                    <SelectPortal container={uiContainer?.rootElement}>
+                    <SelectPortal>
                       <SelectContent>
                         {agents?.map((agent) => (
                           <SelectItem key={agent.id} value={agent.id}>
diff --git a/apps/shinkai-visor/src/components/nav/nav.tsx b/apps/shinkai-visor/src/components/nav/nav.tsx
index f8ad755b1..523eb65bc 100644
--- a/apps/shinkai-visor/src/components/nav/nav.tsx
+++ b/apps/shinkai-visor/src/components/nav/nav.tsx
@@ -16,7 +16,6 @@ import { useHistory, useLocation } from 'react-router-dom';
 import visorLogo from '../../assets/icons/visor.svg';
 import { srcUrlResolver } from '../../helpers/src-url-resolver';
 import { useAuth } from '../../store/auth/auth';
-import { useUIContainer } from '../../store/ui-container/ui-container';
 import {
   AlertDialog,
   AlertDialogAction,
@@ -53,7 +52,6 @@ export default function NavBar() {
   const location = useLocation();
   const setLogout = useAuth((state) => state.setLogout);
   const auth = useAuth((state) => state.auth);
-  const uiContainer = useUIContainer((state) => state.uiContainer);
 
   const [isMenuOpened, setMenuOpened] = useState(false);
   const isRootPage = [
@@ -171,7 +169,7 @@ export default function NavBar() {
                 )}
               </Button>
             </DropdownMenuTrigger>
-            <DropdownMenuPortal container={uiContainer?.rootElement}>
+            <DropdownMenuPortal>
               <DropdownMenuContent align="end" className="w-56">
                 <DropdownMenuLabel>
                   <FormattedMessage id="inbox.other"></FormattedMessage>
diff --git a/apps/shinkai-visor/src/lang/en.json b/apps/shinkai-visor/src/lang/en.json
index e5d7dbe1c..e054690a4 100644
--- a/apps/shinkai-visor/src/lang/en.json
+++ b/apps/shinkai-visor/src/lang/en.json
@@ -39,7 +39,6 @@
   "model.one": "Model",
   "model.other": "Models",
   "openai": "OpenAI",
-  "sleep-api": "Sleep API",
   "tmwtd": "Tell me what to do",
   "create-job": "Create job",
   "menu": "Menu",
@@ -84,5 +83,7 @@
   "file.other": "Files",
   "save": "Save",
   "name.one": "Name",
-  "edit": "Edit"
+  "edit": "Edit",
+  "togethercomputer": "Together AI",
+  "alphanumeric_with_underscore": "It just accepts alphanumeric characters and underscores"
 }
diff --git a/apps/shinkai-visor/src/lang/es.json b/apps/shinkai-visor/src/lang/es.json
index ffdb1a2ef..95a3d11d4 100644
--- a/apps/shinkai-visor/src/lang/es.json
+++ b/apps/shinkai-visor/src/lang/es.json
@@ -39,7 +39,6 @@
   "model.one": "Modelo",
   "model.other": "Modelos",
   "openai": "OpenAI",
-  "sleep-api": "Sleep API",
   "tmwtd": "Dime qué hacer",
   "create-job": "Crear job",
   "menu": "Menu",
@@ -84,5 +83,7 @@
   "file.other": "Archivos",
   "save": "Guardar",
   "name.one": "Nombre",
-  "edit": "Editar"
+  "edit": "Editar",
+  "togethercomputer": "Together AI",
+  "alphanumeric_with_underscore": "Solo se permiten caracteres alfanuméricos y guiones bajos"
 }
diff --git a/apps/shinkai-visor/src/store/ui-container/ui-container.ts b/apps/shinkai-visor/src/store/ui-container/ui-container.ts
deleted file mode 100644
index 66fbc0083..000000000
--- a/apps/shinkai-visor/src/store/ui-container/ui-container.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { create } from "zustand";
-import { devtools } from "zustand/middleware";
-
-export type UIContainerData = {
-  shadowRoot: ShadowRoot;
-  rootElement: HTMLElement;
-};
-
-type UIContainerStore = {
-  uiContainer: UIContainerData | null;
-  setUIContainer: (uiContainer: UIContainerData) => void;
-};
-
-export const useUIContainer = create<UIContainerStore>()(
-  devtools(
-    (set) => ({
-      uiContainer: null,
-      setUIContainer: (uiContainer: UIContainerData) => set({ uiContainer }),
-    }),
-    {
-      name: "ui-container",
-    }
-  )
-);
diff --git a/libs/shinkai-message-ts/src/models/SchemaTypes.ts b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
index 3e52e1f6e..7fc968ae4 100644
--- a/libs/shinkai-message-ts/src/models/SchemaTypes.ts
+++ b/libs/shinkai-message-ts/src/models/SchemaTypes.ts
@@ -74,15 +74,16 @@ export interface SerializedAgent {
 }
 export interface AgentAPIModel {
   OpenAI?: OpenAI;
-  SleepAPI?: SleepAPI;
+  GenericAPI?: GenericAPI;
 }
 
 export interface OpenAI {
   model_type: string;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface SleepAPI {}
+export interface GenericAPI {
+  model_type: string;
+}
 
 export interface APIAddAgentRequest {
   agent: SerializedAgent;
diff --git a/libs/shinkai-message-ts/src/wasm/SerializedAgentWrapper.ts b/libs/shinkai-message-ts/src/wasm/SerializedAgentWrapper.ts
index 0e4a86194..7db63043d 100644
--- a/libs/shinkai-message-ts/src/wasm/SerializedAgentWrapper.ts
+++ b/libs/shinkai-message-ts/src/wasm/SerializedAgentWrapper.ts
@@ -24,8 +24,8 @@ export class SerializedAgentWrapper {
     let modelStr = "";
     if (agent.model && agent.model.OpenAI && agent.model.OpenAI.model_type) {
       modelStr = "openai:" + agent.model.OpenAI.model_type;
-    } else if (agent.model && agent.model.SleepAPI) {
-      modelStr = "sleep";
+    } else if (agent.model && agent.model.GenericAPI && agent.model.GenericAPI.model_type) {
+      modelStr = "genericapi:" + agent.model.GenericAPI.model_type;
     } else {
       throw new Error("Invalid model: " + JSON.stringify(agent.model));
     }