diff --git a/model-utils.js b/model-utils.js
index e8dfc7b..f504bbd 100644
--- a/model-utils.js
+++ b/model-utils.js
@@ -2,66 +2,55 @@
 // This eliminates code duplication across service-worker.js and sidepanel.js
 
 class ModelUtils {
+    static toolModels = ['llama3.1', 'llama3.2', 'qwen2.5', 'mistral-nemo', 'firefunction', 'command-r'];
+    static visionModels = [
+        'llava', 'vision', 'qwen2-vl', 'qwen2.5vl', 'minicpm-v', 'bakllava',
+        'moondream', 'llama3.2-vision', 'llama4', 'gemma3', 'mistral-small3.1',
+        'mistral-small3.2', 'granite3.2-vision', 'llava-phi3', 'llava-llama3'
+    ];
+    static codeModels = ['codellama', 'codeqwen', 'deepseek-coder', 'starcoder'];
+    static thinkingModels = ['qwen2.5-coder', 'deepseek-r1', 'thinking', 'o1', 'reasoning'];
+
     static getModelCapabilities(modelName) {
         const capabilities = [];
         const name = modelName.toLowerCase();
-        
-        // Check for tool calling support
-        const toolModels = ['llama3.1', 'llama3.2', 'qwen2.5', 'mistral-nemo', 'firefunction', 'command-r'];
-        if (toolModels.some(toolModel => name.includes(toolModel))) {
+
+        if (this.toolModels.some(toolModel => name.includes(toolModel))) {
             capabilities.push('🛠️ Tools');
         }
-        
-        // Check for vision support
-        const visionModels = [
-            'llava', 'vision', 'qwen2-vl', 'qwen2.5vl', 'minicpm-v', 'bakllava', 
-            'moondream', 'llama3.2-vision', 'llama4', 'gemma3', 'mistral-small3.1', 
-            'mistral-small3.2', 'granite3.2-vision', 'llava-phi3', 'llava-llama3'
-        ];
-        if (visionModels.some(visionModel => name.includes(visionModel))) {
+
+        if (this.visionModels.some(visionModel => name.includes(visionModel))) {
             capabilities.push('👁️ Vision');
         }
-        
-        // Check for code support
-        const codeModels = ['codellama', 'codeqwen', 'deepseek-coder', 'starcoder'];
-        if (codeModels.some(codeModel => name.includes(codeModel))) {
+
+        if (this.codeModels.some(codeModel => name.includes(codeModel))) {
             capabilities.push('💻 Code');
         }
-        
-        // Check for thinking models
-        const thinkingModels = ['qwen2.5-coder', 'deepseek-r1', 'thinking', 'o1', 'reasoning'];
-        if (thinkingModels.some(thinkingModel => name.includes(thinkingModel))) {
+
+        if (this.thinkingModels.some(thinkingModel => name.includes(thinkingModel))) {
             capabilities.push('🧠 Thinking');
         }
-        
-        // Default to chat if no specific capabilities
+
         if (capabilities.length === 0) {
             capabilities.push('💬 Chat');
         }
-        
+
         return capabilities;
     }
-    
+
     static isThinkingModel(modelName) {
-        const thinkingModels = ['qwen2.5-coder', 'deepseek-r1', 'thinking', 'o1', 'reasoning'];
         const name = modelName.toLowerCase();
-        return thinkingModels.some(thinkingModel => name.includes(thinkingModel));
+        return this.thinkingModels.some(thinkingModel => name.includes(thinkingModel));
     }
-    
+
     static supportsVision(modelName) {
-        const visionModels = [
-            'llava', 'vision', 'qwen2-vl', 'qwen2.5vl', 'minicpm-v', 'bakllava', 
-            'moondream', 'llama3.2-vision', 'llama4', 'gemma3', 'mistral-small3.1', 
-            'mistral-small3.2', 'granite3.2-vision', 'llava-phi3', 'llava-llama3'
-        ];
         const name = modelName.toLowerCase();
-        return visionModels.some(visionModel => name.includes(visionModel));
+        return this.visionModels.some(visionModel => name.includes(visionModel));
     }
-    
+
     static supportsTools(modelName) {
-        const toolModels = ['llama3.1', 'llama3.2', 'qwen2.5', 'mistral-nemo', 'firefunction', 'command-r'];
         const name = modelName.toLowerCase();
-        return toolModels.some(toolModel => name.includes(toolModel));
+        return this.toolModels.some(toolModel => name.includes(toolModel));
     }
 }
 
@@ -71,4 +60,4 @@ if (typeof module !== 'undefined' && module.exports) {
 }
 if (typeof window !== 'undefined') {
     window.ModelUtils = ModelUtils;
-}
\ No newline at end of file
+}