diff --git a/fpga/common b/fpga/common
index 3b5952a41..fc69b4c4e 160000
--- a/fpga/common
+++ b/fpga/common
@@ -1 +1 @@
-Subproject commit 3b5952a413ba8f8c7731c6a0c8336e1f523884b8
+Subproject commit fc69b4c4e8377e36ae536d6697276a1a2b528a4e
diff --git a/fpga/include/villas/fpga/card.hpp b/fpga/include/villas/fpga/card.hpp
index 7efd21988..fce834c97 100644
--- a/fpga/include/villas/fpga/card.hpp
+++ b/fpga/include/villas/fpga/card.hpp
@@ -141,6 +141,12 @@ public:
 	virtual std::string
 	getDescription() const
 	{ return "Xilinx PCIe FPGA cards"; } 
+
+	virtual
+	std::string getType() const
+	{
+		return "card";
+	}
 };
 
 } /* namespace fpga */
diff --git a/fpga/include/villas/fpga/core.hpp b/fpga/include/villas/fpga/core.hpp
index aaeed05d4..6170eb49e 100644
--- a/fpga/include/villas/fpga/core.hpp
+++ b/fpga/include/villas/fpga/core.hpp
@@ -55,7 +55,6 @@ class Core;
 class CoreFactory;
 class InterruptController;
 
-
 class IpIdentifier {
 public:
 
@@ -245,6 +244,12 @@ public:
 	static Core::List
 	make(PCIeCard* card, json_t *json_ips);
 
+	virtual
+	std::string getType() const
+	{
+		return "core";
+	}
+
 protected:
 	Logger
 	getLogger() const
diff --git a/fpga/lib/core.cpp b/fpga/lib/core.cpp
index 06837c487..21671dc61 100644
--- a/fpga/lib/core.cpp
+++ b/fpga/lib/core.cpp
@@ -332,7 +332,7 @@ Core::dump()
 CoreFactory*
 CoreFactory::lookup(const Vlnv &vlnv)
 {
-	for (auto &ip : plugin::Registry::lookup<CoreFactory>()) {
+	for (auto &ip : plugin::registry->lookup<CoreFactory>()) {
 		if (ip->getCompatibleVlnv() == vlnv)
 			return ip;
 	}
diff --git a/fpga/src/villas-fpga-pipe.cpp b/fpga/src/villas-fpga-pipe.cpp
index f13be7aed..ea35df9d7 100644
--- a/fpga/src/villas-fpga-pipe.cpp
+++ b/fpga/src/villas-fpga-pipe.cpp
@@ -92,7 +92,7 @@ setupFpgaCard(const std::string &configFile, const std::string &fpgaName)
 	}
 
 	// get the FPGA card plugin
-	auto fpgaCardFactory = plugin::Registry::lookup<fpga::PCIeCardFactory>("pcie");
+	auto fpgaCardFactory = plugin::registry->lookup<fpga::PCIeCardFactory>("pcie");
 	if (fpgaCardFactory == nullptr) {
 		logger->error("No FPGA plugin found");
 		exit(1);