diff --git a/src/main/java/com/olympus/hermione/stepSolvers/EmbeddingDocTempSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/EmbeddingDocTempSolver.java
index 6b13974..994e8f7 100644
--- a/src/main/java/com/olympus/hermione/stepSolvers/EmbeddingDocTempSolver.java
+++ b/src/main/java/com/olympus/hermione/stepSolvers/EmbeddingDocTempSolver.java
@@ -84,15 +84,21 @@ public class EmbeddingDocTempSolver extends StepSolver {
                     this.max_num_chunks,
                     true);
 
+        
             docs.forEach(doc -> {
                 List<Document> splitDocs = splitter.split(doc);
+                Integer docIndex = 0;
                 logger.info("Number of documents: " + splitDocs.size());
-                
-                splitDocs.forEach(splitDoc -> {
-                    splitDoc.getMetadata().put("KsScenarioExecutionId", this.scenario_execution_id);
-                });
+
+                for (Document splitDoc : splitDocs) {
+                    splitDoc.getMetadata().put("KsDocumentId", this.scenario_execution_id);
+                    splitDoc.getMetadata().put("KsDocumentIndex",docIndex.toString());
+                    logger.info("DOC INDEX: ", docIndex);
+                    docIndex++;
+                } 
                 vectorStore.add(splitDocs);
             });
+
         }catch (Exception e){
             logger.error("Error while solvingStep: "+e.getMessage());
             e.printStackTrace();