diff --git a/debian/control b/debian/control
index 5d2470a6..f66bb9a5 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Depends:
  libdatetime-timezone-perl,
  libdbd-csv-perl,
  libdbd-mysql-perl,
+ libdbd-pg-perl,
  libdbd-sqlite3-perl,
  libemail-mime-attachment-stripper-perl,
  libemail-mime-perl,
@@ -70,7 +71,6 @@ Depends:
 Suggests:
  libdbd-odbc-perl,
  libdbd-oracle-perl,
- libdbd-pg-perl,
  tdsodbc,
 Description: NGCP bulk processor framework perl modules
  This package provides the NGCP::BulkProcessor perl modules that implement
diff --git a/lib/NGCP/BulkProcessor/SqlConnectors/PostgreSQLDB.pm b/lib/NGCP/BulkProcessor/SqlConnectors/PostgreSQLDB.pm
index 2ce17f08..7af7cd3c 100644
--- a/lib/NGCP/BulkProcessor/SqlConnectors/PostgreSQLDB.pm
+++ b/lib/NGCP/BulkProcessor/SqlConnectors/PostgreSQLDB.pm
@@ -94,7 +94,7 @@ sub tableidentifier {
 
     my $self = shift;
     my $tablename = shift;
-    return $tablename;
+    return '"' . $tablename . '"';
 
 }
 
@@ -103,8 +103,7 @@ sub _columnidentifier {
     my $self = shift;
     my $columnname = shift;
 
-    return $columnname;
-
+    return '"' . $columnname . '"';
 }
 
 sub get_tableidentifier {
@@ -114,7 +113,7 @@ sub get_tableidentifier {
     #return SUPER::get_tableidentifier($tablename,$schemaname);
 
     if (defined $schemaname) {
-        return $schemaname . '.' . $tablename;
+        return $schemaname . "." . $tablename;
     } else {
         return $tablename;
     }