diff --git a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
index 4a16b84b..dfbfaa43 100644
--- a/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
+++ b/server/AyaNova/generator/CoreJobMetricsSnapshot.cs
@@ -147,13 +147,21 @@ namespace AyaNova.Biz
                 var UtilFilesInfo = FileUtil.GetUtilityFolderSizeInfo();
                 var AttachmentFilesInfo = FileUtil.GetAttachmentFolderSizeInfo();
 
-//Available space
-
+                //Available space
+                var UtilityFilesAvailableSpace = FileUtil.UtilityFilesDriveAvailableSpace();
+                var AttachmentFilesAvailableSpace = FileUtil.AttachmentFilesDriveAvailableSpace();
 
                 using (AyContext ct = ServiceProviderProvider.DBContext)
                 {
                     //write to db
-                    MetricDD dd = new MetricDD(AttachmentFilesInfo.SizeWithChildren, AttachmentFilesInfo.FileCountWithChildren, UtilFilesInfo.SizeWithChildren, UtilFilesInfo.FileCountWithChildren);
+                    MetricDD dd = new MetricDD(){
+                       AttachmentFileSize= AttachmentFilesInfo.SizeWithChildren, 
+                       AttachmentFileCount=AttachmentFilesInfo.FileCountWithChildren, 
+                       AttachmentFilesAvailableSpace=AttachmentFilesAvailableSpace,                       
+                       UtilityFileSize=UtilFilesInfo.SizeWithChildren, 
+                       UtilityFileCount=UtilFilesInfo.FileCountWithChildren,
+                       UtilityFilesAvailableSpace=UtilityFilesAvailableSpace
+                    };
                     ct.MetricDD.Add(dd);
                     ct.SaveChanges();
                 }