diff --git a/Java/export-api-sample/src/main/java/com/perfecto/reporting/sample/api/ExportAllDataCodeSample.java b/Java/export-api-sample/src/main/java/com/perfecto/reporting/sample/api/ExportAllDataCodeSample.java
index 8f3cc3a..9c2c138 100644
--- a/Java/export-api-sample/src/main/java/com/perfecto/reporting/sample/api/ExportAllDataCodeSample.java
+++ b/Java/export-api-sample/src/main/java/com/perfecto/reporting/sample/api/ExportAllDataCodeSample.java
@@ -106,7 +106,40 @@ private static void downloadAttachments(JsonObject testJson, Path testFolder, St
             System.out.println("No attachments found for test execution '" + testName + "'");
         }
     }
+    
+    // below is handled for downloading accessibility reports
+public static void downloadAttachmentsNew(JsonObject testJson, Path testFolder) throws IOException, URISyntaxException {
+        String testName = testJson.get("name").getAsString();
+        String testId = testJson.get("id").getAsString();
+        
+        JsonArray attachmentsArray = testJson.getAsJsonArray("artifacts");
+        if (attachmentsArray.size() > 0) {
+            Path attachmentsDir = Paths.get(testFolder.toString(), "attachments");
+            Files.createDirectories(attachmentsDir);
 
+            for (JsonElement attachmentElement : attachmentsArray) {
+                JsonObject artifactJson = attachmentElement.getAsJsonObject();
+                
+                String type=null;
+                Path attachmentDir =null;
+                if(artifactJson.get("type").getAsString().contains("Accessibility")){
+                	
+                	type = artifactJson.get("fileName").getAsString();
+                	attachmentDir= Paths.get(attachmentsDir.toString()+"/"+artifactJson.get("type").getAsString(), type.toLowerCase());
+                    
+                }else{
+                	  type = artifactJson.get("type").getAsString();
+                	  attachmentDir= Paths.get(attachmentsDir.toString(), type.toLowerCase());
+                }
+                        Files.createDirectories(attachmentDir);
+                String path = artifactJson.get("path").getAsString();
+                Path artifactPath = Paths.get(attachmentDir.toString(), FilenameUtils.getName(testName+"_"+testId+".Zip"));
+                ReportiumExportUtils.downloadFileToFS(artifactPath, new URI(path));
+            }
+        } else {
+            System.out.println("No attachments found for test execution '" + testName + "'");
+        }
+    }
     private static void downloadVideos(JsonObject testJson, Path testFolder) throws IOException, URISyntaxException {
         String testName = testJson.get("name").getAsString();
         JsonArray videosArray = testJson.getAsJsonArray("videos");
@@ -124,4 +157,4 @@ private static void downloadVideos(JsonObject testJson, Path testFolder) throws
             System.out.println("No videos found for test execution '" + testName + "'");
         }
     }
-}
\ No newline at end of file
+}