diff --git a/app/Jobs/BiayaKartu.php b/app/Jobs/BiayaKartu.php
index 7cc8444..d591f44 100644
--- a/app/Jobs/BiayaKartu.php
+++ b/app/Jobs/BiayaKartu.php
@@ -19,8 +19,8 @@ class BiayaKartu implements ShouldQueue
     /**
      * Database constants
      */
-    private const DB_TABLE           = 'IST77.VW_CMS_VCARD';
-    private const BATCH_SIZE         = 100;
+    private const DB_TABLE           = 'IST77.CMS_VCARD';
+    private const BATCH_SIZE         = 1000;
     private const MAX_EXECUTION_TIME = 86400; // 24 jam dalam detik
 
     /**
@@ -74,6 +74,8 @@ class BiayaKartu implements ShouldQueue
     {
         return DB::connection('oracle')
                  ->table(self::DB_TABLE)
+                 ->select('CRDNO', 'ACCFLAG', 'CRACC1', 'CRACC2', 'CRACC3', 'CRACC4', 'CRACC5', 'CRACCNAM1', 'CRACCNAM2', 'CRACCNAM3', 'CRACCNAM4', 'CRACCNAM5', 'CRSTS','CTTYPE','CTDESC','CRDATE','LAST_UPDATE')
+                 ->join('IST77.CMS_VCARDTYP', 'IST77.CMS_VCARD.CRTYPE', '=','IST77.CMS_VCARD.CTTYPE')
                  ->where('crsts', 1)
                  ->whereNotNull('ACCFLAG')
                  ->where('ACCFLAG', '>', 0)
diff --git a/app/Jobs/GenerateBiayaKartuCsvJob.php b/app/Jobs/GenerateBiayaKartuCsvJob.php
index 9650d18..69c52af 100644
--- a/app/Jobs/GenerateBiayaKartuCsvJob.php
+++ b/app/Jobs/GenerateBiayaKartuCsvJob.php
@@ -76,7 +76,15 @@
         : array
         {
             $cards    = $this->getEligibleAtmCards();
-            $filename = storage_path('app/' . $this->csvFilename);
+            //$filename = storage_path('app/' . $this->csvFilename);
+
+            // Add date-time to filename
+            $dateTime = now()->format('Ymd_Hi');
+            $filenameWithDate = pathinfo($this->csvFilename, PATHINFO_FILENAME) .
+                '_' . $dateTime . '.' .
+                pathinfo($this->csvFilename, PATHINFO_EXTENSION);
+
+            $filename = storage_path('app/' . $filenameWithDate);
 
             $handle = fopen($filename, 'w+');
             if (!$handle) {