diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
index d25eda18da..4d3808fec8 100644
--- a/src/ifcwrap/IfcGeomWrapper.i
+++ b/src/ifcwrap/IfcGeomWrapper.i
@@ -83,6 +83,9 @@
 	void set_(const std::string& name, int val) {
 		return $self->set(name, val);
 	}
+	void set_(const std::string& name, ifcopenshell::geometry::settings::IteratorOutputOptions val) {
+		return $self->set(name, val);
+	}	
 	void set_(const std::string& name, double val) {
 		return $self->set(name, val);
 	}
@@ -92,7 +95,7 @@
 	void set_(const std::string& name, const std::set<int>& val) {
 		return $self->set(name, val);
 	}
-	boost::variant<bool, int, double, std::string, std::set<int>> get_(const std::string& name) {
+	ifcopenshell::geometry::Settings::value_variant_t get_(const std::string& name) {
 		return $self->get(name);
 	}
 	std::vector<std::string> setting_names() {
@@ -116,7 +119,7 @@
 	void set_(const std::string& name, const std::set<int>& val) {
 		return $self->set(name, val);
 	}
-	boost::variant<bool, int, double, std::string, std::set<int>> get_(const std::string& name) {
+	ifcopenshell::geometry::SerializerSettings::value_variant_t get_(const std::string& name) {
 		return $self->get(name);
 	}
 	std::vector<std::string> setting_names() {
diff --git a/src/ifcwrap/utils/typemaps_out.i b/src/ifcwrap/utils/typemaps_out.i
index bdeea95e55..579a94a237 100644
--- a/src/ifcwrap/utils/typemaps_out.i
+++ b/src/ifcwrap/utils/typemaps_out.i
@@ -148,7 +148,12 @@ CREATE_VECTOR_TYPEMAP_OUT(IfcParse::entity const *)
 CREATE_VECTOR_TYPEMAP_OUT(IfcParse::declaration const *)
 CREATE_VECTOR_TYPEMAP_OUT(IfcGeom::ConversionResultShape *)
 
-%typemap(out) boost::variant<bool, int, double, std::string, std::set<int>> {
+%typemap(out) ifcopenshell::geometry::Settings::value_variant_t {
+	pythonizing_visitor vis;
+	$result = $1.apply_visitor(vis);
+}
+
+%typemap(out) ifcopenshell::geometry::SerializerSettings::value_variant_t {
 	pythonizing_visitor vis;
 	$result = $1.apply_visitor(vis);
 }