diff --git a/files/init_db.sql b/files/init_db.sql
index 1fdc1ead7d9dd943bc32fe934b0dc0fd72c0cada..15641f4621f42a93f915379c92ea2fc78ef48c22 100644
--- a/files/init_db.sql
+++ b/files/init_db.sql
@@ -8,10 +8,11 @@ CREATE EXTERNAL TABLE IF NOT EXISTS score (
     anime_id INT,
     rating INT
 )
-ROW FORMAT DELIMITED
-FIELDS TERMINATED BY ','
-LINES TERMINATED BY '\n'
-STORED AS TEXTFILE
+ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
+WITH SERDEPROPERTIES (
+    "separatorChar" = ',',
+    "quoteChar"     = '\"'
+)
 LOCATION '/dataset/';
 
 
@@ -41,10 +42,11 @@ CREATE EXTERNAL TABLE IF NOT EXISTS anime (
     members INT,
     image_url STRING
 )
-ROW FORMAT DELIMITED
-FIELDS TERMINATED BY ','
-LINES TERMINATED BY '\n'
-STORED AS TEXTFILE
+ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
+WITH SERDEPROPERTIES (
+    "separatorChar" = ',',
+    "quoteChar"     = '\"'
+)
 LOCATION '/dataset/';
 
 CREATE EXTERNAL TABLE IF NOT EXISTS users (
@@ -65,10 +67,11 @@ CREATE EXTERNAL TABLE IF NOT EXISTS users (
     rewatched FLOAT,
     episodes_watched FLOAT
 )
-ROW FORMAT DELIMITED
-FIELDS TERMINATED BY ','
-LINES TERMINATED BY '\n'
-STORED AS TEXTFILE
+ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.OpenCSVSerde'
+WITH SERDEPROPERTIES (
+    "separatorChar" = ',',
+    "quoteChar"     = '\"'
+)
 LOCATION '/dataset/';