diff --git a/include/BarcodeFactory.h b/include/BarcodeFactory.h
index df841af..45463c5 100644
--- a/include/BarcodeFactory.h
+++ b/include/BarcodeFactory.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Code39Generator.h"
+#include "DataBarExpandedGenerator.h"
 #include "DataBarGenerator.h"
 #include "DataMatrixGenerator.h"
 #include "IBarcodeGenerator.h"
diff --git a/include/Code39Generator.h b/include/Code39Generator.h
new file mode 100644
index 0000000..e4f3576
--- /dev/null
+++ b/include/Code39Generator.h
@@ -0,0 +1,21 @@
+#pragma once
+#include "IBarcodeGenerator.h"
+#include <ZXing/Barcode.h>
+#include <ZXing/BarcodeFormat.h>
+#include <ZXing/BitMatrix.h>
+#include <ZXing/BitMatrixIO.h>
+#include <ZXing/CharacterSet.h>
+#include <ZXing/Matrix.h>
+#include <ZXing/MultiFormatWriter.h>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+class Code39Generator : public virtual IBarcodeGenerator {
+private:
+  ZXing::MultiFormatWriter writer{ZXing::BarcodeFormat::Code39};
+
+public:
+  std::string generate(const std::string &text, int margin, int size);
+};
\ No newline at end of file
diff --git a/include/DataBarExpandedGenerator.h b/include/DataBarExpandedGenerator.h
new file mode 100644
index 0000000..7458761
--- /dev/null
+++ b/include/DataBarExpandedGenerator.h
@@ -0,0 +1,21 @@
+#pragma once
+#include "IBarcodeGenerator.h"
+#include <ZXing/Barcode.h>
+#include <ZXing/BarcodeFormat.h>
+#include <ZXing/BitMatrix.h>
+#include <ZXing/BitMatrixIO.h>
+#include <ZXing/CharacterSet.h>
+#include <ZXing/Matrix.h>
+#include <ZXing/MultiFormatWriter.h>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+class DataBarExpandedGenerator : public virtual IBarcodeGenerator {
+private:
+  ZXing::MultiFormatWriter writer{ZXing::BarcodeFormat::DataBarExpanded};
+
+public:
+  std::string generate(const std::string &text, int margin, int size);
+};
\ No newline at end of file
diff --git a/src/BarcodeFactory.cpp b/src/BarcodeFactory.cpp
index 1468d7d..7e2a9a0 100644
--- a/src/BarcodeFactory.cpp
+++ b/src/BarcodeFactory.cpp
@@ -13,6 +13,10 @@ BarcodeFactory::create(const std::string type) {
     return std::make_unique<ItfGenerator>();
   } else if (type == "DataBar") {
     return std::make_unique<DataBarGenerator>();
+  } else if (type == "DataBarExpanded") {
+    return std::make_unique<DataBarExpandedGenerator>();
+  } else if (type == "Code39") {
+    return std::make_unique<Code39Generator>();
   }
 
   return std::make_unique<QrGenerator>();
diff --git a/src/Code39Generator.cpp b/src/Code39Generator.cpp
new file mode 100644
index 0000000..a4d95ac
--- /dev/null
+++ b/src/Code39Generator.cpp
@@ -0,0 +1,10 @@
+#include "../include/Code39Generator.h"
+
+std::string Code39Generator::generate(const std::string &text, int margin,
+                                      int size) {
+  writer.setMargin(margin);
+  writer.setEncoding(ZXing::CharacterSet::UTF8);
+  ZXing::BitMatrix matrix = writer.encode(text, size, size);
+
+  return ZXing::ToSVG(matrix);
+}
\ No newline at end of file
diff --git a/src/DataBarExpandedGenerator.cpp b/src/DataBarExpandedGenerator.cpp
new file mode 100644
index 0000000..7321be9
--- /dev/null
+++ b/src/DataBarExpandedGenerator.cpp
@@ -0,0 +1,10 @@
+#include "../include/DataBarExpandedGenerator.h"
+
+std::string DataBarExpandedGenerator::generate(const std::string &text,
+                                               int margin, int size) {
+  writer.setMargin(margin);
+  writer.setEncoding(ZXing::CharacterSet::UTF8);
+  ZXing::BitMatrix matrix = writer.encode(text, size, size);
+
+  return ZXing::ToSVG(matrix);
+}
\ No newline at end of file