diff --git a/neo/assistant/load.go b/neo/assistant/load.go
index 2b81df4a..9dc80b61 100644
--- a/neo/assistant/load.go
+++ b/neo/assistant/load.go
@@ -424,13 +424,33 @@ func loadMap(data map[string]interface{}) (*Assistant, error) {
 	}
 
 	// prompts
-	if v, ok := data["prompts"].(string); ok {
-		var prompts []Prompt
-		err := yaml.Unmarshal([]byte(v), &prompts)
-		if err != nil {
-			return nil, err
+	if prompts, has := data["prompts"]; has {
+
+		switch v := prompts.(type) {
+		case []Prompt:
+			assistant.Prompts = v
+
+		case string:
+			var prompts []Prompt
+			err := yaml.Unmarshal([]byte(v), &prompts)
+			if err != nil {
+				return nil, err
+			}
+			assistant.Prompts = prompts
+
+		default:
+			raw, err := jsoniter.Marshal(v)
+			if err != nil {
+				return nil, err
+			}
+
+			var prompts []Prompt
+			err = jsoniter.Unmarshal(raw, &prompts)
+			if err != nil {
+				return nil, err
+			}
+			assistant.Prompts = prompts
 		}
-		assistant.Prompts = prompts
 	}
 
 	// tools
diff --git a/neo/assistant/utils.go b/neo/assistant/utils.go
index c1f3ce95..c931bf19 100644
--- a/neo/assistant/utils.go
+++ b/neo/assistant/utils.go
@@ -33,8 +33,11 @@ func getTimestamp(v interface{}) (int64, error) {
 			return ts, nil
 		}
 
+	case nil:
+		return 0, nil
 	}
-	return 0, fmt.Errorf("invalid timestamp type")
+
+	return 0, fmt.Errorf("invalid timestamp type %T", v)
 }
 
 func stringToTimestamp(v string) (int64, error) {
diff --git a/neo/store/xun.go b/neo/store/xun.go
index 8c87bb62..26862877 100644
--- a/neo/store/xun.go
+++ b/neo/store/xun.go
@@ -963,7 +963,11 @@ func (conv *Xun) SaveAssistant(assistant map[string]interface{}) (interface{}, e
 
 	// Generate assistant_id if not provided
 	if _, ok := assistantCopy["assistant_id"]; !ok {
-		assistantCopy["assistant_id"] = uuid.New().String()
+		var err error
+		assistantCopy["assistant_id"], err = conv.GenerateAssistantID()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	// Check if assistant exists
@@ -1359,3 +1363,33 @@ func (conv *Xun) GetHistoryWithFilter(sid string, cid string, filter ChatFilter)
 
 	return res, nil
 }
+
+// GenerateAssistantID generates a random-looking 6-digit ID
+func (conv *Xun) GenerateAssistantID() (string, error) {
+	maxAttempts := 10 // Maximum number of attempts to generate a unique ID
+	for i := 0; i < maxAttempts; i++ {
+		// Generate a random number using timestamp and some bit operations
+		timestamp := time.Now().UnixNano()
+		random := (timestamp ^ (timestamp >> 12)) % 1000000
+		hash := fmt.Sprintf("%06d", random)
+
+		// Check if this ID already exists
+		exists, err := conv.query.New().
+			Table(conv.getAssistantTable()).
+			Where("assistant_id", hash).
+			Exists()
+
+		if err != nil {
+			return "", err
+		}
+
+		if !exists {
+			return hash, nil
+		}
+
+		// If ID exists, wait a bit and try again
+		time.Sleep(time.Millisecond)
+	}
+
+	return "", fmt.Errorf("failed to generate unique ID after %d attempts", maxAttempts)
+}