diff --git a/xs/MANIFEST b/xs/MANIFEST
index 0b2a92aba..0ad4cd8c1 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -1675,6 +1675,7 @@ src/Model.hpp
 src/MultiPoint.cpp
 src/MultiPoint.hpp
 src/myinit.h
+src/perlglue.hpp
 src/Point.cpp
 src/Point.hpp
 src/Polygon.cpp
diff --git a/xs/src/BoundingBox.cpp b/xs/src/BoundingBox.cpp
index 446414115..86e0dae12 100644
--- a/xs/src/BoundingBox.cpp
+++ b/xs/src/BoundingBox.cpp
@@ -1,5 +1,8 @@
 #include "BoundingBox.hpp"
 #include <algorithm>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -156,4 +159,10 @@ BoundingBox3Base<PointClass>::center() const
 }
 template Pointf3 BoundingBox3Base<Pointf3>::center() const;
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(BoundingBox, "Geometry::BoundingBox");
+REGISTER_CLASS(BoundingBoxf, "Geometry::BoundingBoxf");
+REGISTER_CLASS(BoundingBoxf3, "Geometry::BoundingBoxf3");
+#endif
+
 }
diff --git a/xs/src/ExPolygon.cpp b/xs/src/ExPolygon.cpp
index a6c3bc7fd..12f595ac7 100644
--- a/xs/src/ExPolygon.cpp
+++ b/xs/src/ExPolygon.cpp
@@ -4,6 +4,9 @@
 #include "Line.hpp"
 #include "ClipperUtils.hpp"
 #include "polypartition.h"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 #include <list>
 
@@ -240,6 +243,9 @@ ExPolygon::triangulate2(Polygons* polygons) const
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(ExPolygon, "ExPolygon");
+
 SV*
 ExPolygon::to_AV() {
     const unsigned int num_holes = this->holes.size();
@@ -257,14 +263,14 @@ ExPolygon::to_AV() {
 SV*
 ExPolygon::to_SV_ref() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::ExPolygon::Ref", this );
+    sv_setref_pv( sv, perl_class_name_ref(this), this );
     return sv;
 }
 
 SV*
 ExPolygon::to_SV_clone_ref() const {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::ExPolygon", new ExPolygon(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new ExPolygon(*this) );
     return sv;
 }
 
@@ -300,8 +306,8 @@ void
 ExPolygon::from_SV_check(SV* expoly_sv)
 {
     if (sv_isobject(expoly_sv) && (SvTYPE(SvRV(expoly_sv)) == SVt_PVMG)) {
-        if (!sv_isa(expoly_sv, "Slic3r::ExPolygon") && !sv_isa(expoly_sv, "Slic3r::ExPolygon::Ref"))
-            CONFESS("Not a valid Slic3r::ExPolygon object");
+        if (!sv_isa(expoly_sv, perl_class_name(this)) && !sv_isa(expoly_sv, perl_class_name_ref(this)))
+          CONFESS("Not a valid %s object", perl_class_name(this));
         // a XS ExPolygon was supplied
         *this = *(ExPolygon *)SvIV((SV*)SvRV( expoly_sv ));
     } else {
diff --git a/xs/src/ExPolygonCollection.cpp b/xs/src/ExPolygonCollection.cpp
index 55cf1e468..fbfde19f4 100644
--- a/xs/src/ExPolygonCollection.cpp
+++ b/xs/src/ExPolygonCollection.cpp
@@ -1,5 +1,8 @@
 #include "ExPolygonCollection.hpp"
 #include "Geometry.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -67,4 +70,8 @@ ExPolygonCollection::convex_hull(Polygon* hull) const
     Slic3r::Geometry::convex_hull(pp, hull);
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(ExPolygonCollection, "ExPolygon::Collection");
+#endif
+
 }
diff --git a/xs/src/ExtrusionEntity.cpp b/xs/src/ExtrusionEntity.cpp
index f76bd2c74..3865df877 100644
--- a/xs/src/ExtrusionEntity.cpp
+++ b/xs/src/ExtrusionEntity.cpp
@@ -1,8 +1,11 @@
-#include <sstream>
 #include "ExtrusionEntity.hpp"
 #include "ExtrusionEntityCollection.hpp"
 #include "ExPolygonCollection.hpp"
 #include "ClipperUtils.hpp"
+#include <sstream>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -102,6 +105,9 @@ ExtrusionPath::_inflate_collection(const Polylines &polylines, ExtrusionEntityCo
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(ExtrusionPath, "ExtrusionPath");
+
 std::string
 ExtrusionPath::gcode(SV* extruder, double e, double F,
     double xofs, double yofs, std::string extrusion_axis,
@@ -212,4 +218,8 @@ ExtrusionLoop::last_point() const
     return this->polygon.points.front();  // in polygons, first == last
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(ExtrusionLoop, "ExtrusionLoop");
+#endif
+
 }
diff --git a/xs/src/ExtrusionEntityCollection.cpp b/xs/src/ExtrusionEntityCollection.cpp
index cc68a5d84..5431078f2 100644
--- a/xs/src/ExtrusionEntityCollection.cpp
+++ b/xs/src/ExtrusionEntityCollection.cpp
@@ -1,6 +1,9 @@
 #include "ExtrusionEntityCollection.hpp"
 #include <algorithm>
 #include <map>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -107,4 +110,9 @@ ExtrusionEntityCollection::chained_path_from(Point start_near, ExtrusionEntityCo
     }
 }
 
+#ifdef SLIC3RXS
+// there is no ExtrusionLoop::Collection or ExtrusionEntity::Collection
+REGISTER_CLASS(ExtrusionEntityCollection, "ExtrusionPath::Collection");
+#endif
+
 }
diff --git a/xs/src/Flow.cpp b/xs/src/Flow.cpp
index 13c12bef6..ebc7c8f25 100644
--- a/xs/src/Flow.cpp
+++ b/xs/src/Flow.cpp
@@ -1,5 +1,8 @@
 #include "Flow.hpp"
 #include <cmath>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -112,4 +115,8 @@ Flow::_spacing(float width, float nozzle_diameter, float height, float bridge_fl
     return width - OVERLAP_FACTOR * (width - min_flow_spacing);
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(Flow, "Flow");
+#endif
+
 }
diff --git a/xs/src/Line.cpp b/xs/src/Line.cpp
index f8fd7f67e..5583eb1ca 100644
--- a/xs/src/Line.cpp
+++ b/xs/src/Line.cpp
@@ -3,6 +3,9 @@
 #include <algorithm>
 #include <cmath>
 #include <sstream>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -115,6 +118,9 @@ Line::vector() const
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(Line, "Line");
+
 void
 Line::from_SV(SV* line_sv)
 {
@@ -127,8 +133,8 @@ void
 Line::from_SV_check(SV* line_sv)
 {
     if (sv_isobject(line_sv) && (SvTYPE(SvRV(line_sv)) == SVt_PVMG)) {
-        if (!sv_isa(line_sv, "Slic3r::Line") && !sv_isa(line_sv, "Slic3r::Line::Ref"))
-            CONFESS("Not a valid Slic3r::Line object");
+        if (!sv_isa(line_sv, perl_class_name(this)) && !sv_isa(line_sv, perl_class_name_ref(this)))
+            CONFESS("Not a valid %s object", perl_class_name(this));
         *this = *(Line*)SvIV((SV*)SvRV( line_sv ));
     } else {
         this->from_SV(line_sv);
@@ -141,11 +147,11 @@ Line::to_AV() {
     av_extend(av, 1);
     
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Point::Ref", &(this->a) );
+    sv_setref_pv( sv, perl_class_name_ref(&this->a), &(this->a) );
     av_store(av, 0, sv);
     
     sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Point::Ref", &(this->b) );
+    sv_setref_pv( sv, perl_class_name_ref(&this->b), &(this->b) );
     av_store(av, 1, sv);
     
     return newRV_noinc((SV*)av);
@@ -154,14 +160,14 @@ Line::to_AV() {
 SV*
 Line::to_SV_ref() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Line::Ref", this );
+    sv_setref_pv( sv, perl_class_name_ref(this), this );
     return sv;
 }
 
 SV*
 Line::to_SV_clone_ref() const {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Line", new Line(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new Line(*this) );
     return sv;
 }
 
diff --git a/xs/src/Point.cpp b/xs/src/Point.cpp
index f9b14429c..d2c2367ec 100644
--- a/xs/src/Point.cpp
+++ b/xs/src/Point.cpp
@@ -1,7 +1,10 @@
-#include <cmath>
-#include <sstream>
 #include "Point.hpp"
 #include "Line.hpp"
+#include <cmath>
+#include <sstream>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -139,17 +142,20 @@ Point::ccw(const Line &line) const
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(Point, "Point");
+
 SV*
 Point::to_SV_ref() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Point::Ref", (void*)this );
+    sv_setref_pv( sv, perl_class_name_ref(this), (void*)this );
     return sv;
 }
 
 SV*
 Point::to_SV_clone_ref() const {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Point", new Point(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new Point(*this) );
     return sv;
 }
 
@@ -176,14 +182,34 @@ void
 Point::from_SV_check(SV* point_sv)
 {
     if (sv_isobject(point_sv) && (SvTYPE(SvRV(point_sv)) == SVt_PVMG)) {
-        if (!sv_isa(point_sv, "Slic3r::Point") && !sv_isa(point_sv, "Slic3r::Point::Ref"))
-            CONFESS("Not a valid Slic3r::Point object");
+        if (!sv_isa(point_sv, perl_class_name(this)) && !sv_isa(point_sv, perl_class_name_ref(this)))
+            CONFESS("Not a valid %s object (got %s)", perl_class_name(this), HvNAME(SvSTASH(SvRV(point_sv))));
         *this = *(Point*)SvIV((SV*)SvRV( point_sv ));
     } else {
         this->from_SV(point_sv);
     }
 }
 
+#endif
+
+void
+Pointf::scale(double factor)
+{
+    this->x *= factor;
+    this->y *= factor;
+}
+
+void
+Pointf::translate(double x, double y)
+{
+    this->x += x;
+    this->y += y;
+}
+
+#ifdef SLIC3RXS
+
+REGISTER_CLASS(Pointf, "Pointf");
+
 SV*
 Pointf::to_SV_pureperl() const {
     AV* av = newAV();
@@ -207,20 +233,6 @@ Pointf::from_SV(SV* point_sv)
 }
 #endif
 
-void
-Pointf::scale(double factor)
-{
-    this->x *= factor;
-    this->y *= factor;
-}
-
-void
-Pointf::translate(double x, double y)
-{
-    this->x += x;
-    this->y += y;
-}
-
 void
 Pointf3::scale(double factor)
 {
@@ -235,4 +247,8 @@ Pointf3::translate(double x, double y, double z)
     this->z += z;
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(Pointf3, "Pointf3");
+#endif
+
 }
diff --git a/xs/src/Polygon.cpp b/xs/src/Polygon.cpp
index e2e1f7cae..0544b80e9 100644
--- a/xs/src/Polygon.cpp
+++ b/xs/src/Polygon.cpp
@@ -2,6 +2,9 @@
 #include "ClipperUtils.hpp"
 #include "Polygon.hpp"
 #include "Polyline.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -175,25 +178,28 @@ Polygon::triangulate_convex(Polygons* polygons) const
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(Polygon, "Polygon");
+
 SV*
 Polygon::to_SV_ref() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Polygon::Ref", (void*)this );
+    sv_setref_pv( sv, perl_class_name_ref(this), (void*)this );
     return sv;
 }
 
 SV*
 Polygon::to_SV_clone_ref() const {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Polygon", new Polygon(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new Polygon(*this) );
     return sv;
 }
 
 void
 Polygon::from_SV_check(SV* poly_sv)
 {
-    if (sv_isobject(poly_sv) && !sv_isa(poly_sv, "Slic3r::Polygon") && !sv_isa(poly_sv, "Slic3r::Polygon::Ref"))
-        CONFESS("Not a valid Slic3r::Polygon object");
+    if (sv_isobject(poly_sv) && !sv_isa(poly_sv, perl_class_name(this)) && !sv_isa(poly_sv, perl_class_name_ref(this)))
+        CONFESS("Not a valid %s object", perl_class_name(this));
     
     MultiPoint::from_SV_check(poly_sv);
 }
diff --git a/xs/src/Polyline.cpp b/xs/src/Polyline.cpp
index 6d719de9c..4c49435ae 100644
--- a/xs/src/Polyline.cpp
+++ b/xs/src/Polyline.cpp
@@ -1,5 +1,8 @@
 #include "Polyline.hpp"
 #include "Polygon.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -122,11 +125,14 @@ Polyline::simplify(double tolerance)
 
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(Polyline, "Polyline");
+
 SV*
 Polyline::to_SV_ref()
 {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Polyline::Ref", (void*)this );
+    sv_setref_pv( sv, perl_class_name_ref(this), (void*)this );
     return sv;
 }
 
@@ -134,15 +140,15 @@ SV*
 Polyline::to_SV_clone_ref() const
 {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Polyline", new Polyline(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new Polyline(*this) );
     return sv;
 }
 
 void
 Polyline::from_SV_check(SV* poly_sv)
 {
-    if (!sv_isa(poly_sv, "Slic3r::Polyline") && !sv_isa(poly_sv, "Slic3r::Polyline::Ref"))
-        CONFESS("Not a valid Slic3r::Polyline object");
+    if (!sv_isa(poly_sv, perl_class_name(this)) && !sv_isa(poly_sv, perl_class_name_ref(this)))
+        CONFESS("Not a valid %s object",perl_class_name(this));
     
     MultiPoint::from_SV_check(poly_sv);
 }
diff --git a/xs/src/PolylineCollection.cpp b/xs/src/PolylineCollection.cpp
index 41644c335..6bc218fab 100644
--- a/xs/src/PolylineCollection.cpp
+++ b/xs/src/PolylineCollection.cpp
@@ -1,4 +1,7 @@
 #include "PolylineCollection.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -50,4 +53,8 @@ PolylineCollection::leftmost_point() const
     return p;
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(PolylineCollection, "Polyline::Collection");
+#endif
+
 }
diff --git a/xs/src/Print.cpp b/xs/src/Print.cpp
index 539206c49..ced674bd4 100644
--- a/xs/src/Print.cpp
+++ b/xs/src/Print.cpp
@@ -1,4 +1,7 @@
 #include "Print.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -40,4 +43,8 @@ PrintState::invalidate_all()
     this->_done.clear();
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(PrintState, "Print::State");
+#endif
+
 }
diff --git a/xs/src/PrintConfig.cpp b/xs/src/PrintConfig.cpp
index 711740897..ba96bea38 100644
--- a/xs/src/PrintConfig.cpp
+++ b/xs/src/PrintConfig.cpp
@@ -1,7 +1,18 @@
 #include "PrintConfig.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
 t_optiondef_map PrintConfigDef::def = PrintConfigDef::build_def();
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(DynamicPrintConfig, "Config");
+REGISTER_CLASS(PrintObjectConfig, "Config::PrintObject");
+REGISTER_CLASS(PrintRegionConfig, "Config::PrintRegion");
+REGISTER_CLASS(PrintConfig, "Config::Print");
+REGISTER_CLASS(FullPrintConfig, "Config::Full");
+#endif
+
 }
diff --git a/xs/src/Surface.cpp b/xs/src/Surface.cpp
index 1cc7cf586..26727c486 100644
--- a/xs/src/Surface.cpp
+++ b/xs/src/Surface.cpp
@@ -1,4 +1,7 @@
 #include "Surface.hpp"
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -40,11 +43,14 @@ Surface::is_bridge() const
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(Surface, "Surface");
+
 void
 Surface::from_SV_check(SV* surface_sv)
 {
-    if (!sv_isa(surface_sv, "Slic3r::Surface") && !sv_isa(surface_sv, "Slic3r::Surface::Ref"))
-        CONFESS("Not a valid Slic3r::Surface object");
+    if (!sv_isa(surface_sv, perl_class_name(this)) && !sv_isa(surface_sv, perl_class_name_ref(this)))
+        CONFESS("Not a valid %s object", perl_class_name(this));
     // a XS Surface was supplied
     *this = *(Surface *)SvIV((SV*)SvRV( surface_sv ));
 }
@@ -52,14 +58,14 @@ Surface::from_SV_check(SV* surface_sv)
 SV*
 Surface::to_SV_ref() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Surface::Ref", (void*)this );
+    sv_setref_pv( sv, perl_class_name_ref(this), (void*)this );
     return sv;
 }
 
 SV*
 Surface::to_SV_clone_ref() const {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::Surface", new Surface(*this) );
+    sv_setref_pv( sv, perl_class_name(this), new Surface(*this) );
     return sv;
 }
 #endif
diff --git a/xs/src/SurfaceCollection.cpp b/xs/src/SurfaceCollection.cpp
index 16e1ee583..4fc8c5e28 100644
--- a/xs/src/SurfaceCollection.cpp
+++ b/xs/src/SurfaceCollection.cpp
@@ -1,5 +1,8 @@
 #include "SurfaceCollection.hpp"
 #include <map>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 namespace Slic3r {
 
@@ -48,4 +51,8 @@ SurfaceCollection::group(std::vector<SurfacesPtr> *retval)
     }
 }
 
+#ifdef SLIC3RXS
+REGISTER_CLASS(SurfaceCollection, "Surface::Collection");
+#endif
+
 }
diff --git a/xs/src/TriangleMesh.cpp b/xs/src/TriangleMesh.cpp
index 1641319ea..79e97b3ef 100644
--- a/xs/src/TriangleMesh.cpp
+++ b/xs/src/TriangleMesh.cpp
@@ -11,6 +11,9 @@
 #include <algorithm>
 #include <math.h>
 #include <assert.h>
+#ifdef SLIC3RXS
+#include "perlglue.hpp"
+#endif
 
 #ifdef SLIC3R_DEBUG
 #include "SVG.hpp"
@@ -320,10 +323,13 @@ TriangleMesh::require_shared_vertices()
 }
 
 #ifdef SLIC3RXS
+
+REGISTER_CLASS(TriangleMesh, "TriangleMesh");
+
 SV*
 TriangleMesh::to_SV() {
     SV* sv = newSV(0);
-    sv_setref_pv( sv, "Slic3r::TriangleMesh", (void*)this );
+    sv_setref_pv( sv, perl_class_name(this), (void*)this );
     return sv;
 }
 
diff --git a/xs/src/perlglue.hpp b/xs/src/perlglue.hpp
new file mode 100644
index 000000000..d950dd256
--- /dev/null
+++ b/xs/src/perlglue.hpp
@@ -0,0 +1,44 @@
+#ifndef slic3r_perlglue_hpp_
+#define slic3r_perlglue_hpp_
+
+namespace Slic3r {
+    
+template<class T>
+struct ClassTraits { 
+    static const char* name;
+    static const char* name_ref; 
+};
+    
+#define REGISTER_CLASS(cname,perlname)                                               \
+    class cname;                                                                     \
+    template <>const char* ClassTraits<cname>::name = "Slic3r::" perlname;           \
+    template <>const char* ClassTraits<cname>::name_ref = "Slic3r::" perlname "::Ref"; 
+    
+template<class T>
+const char* perl_class_name(const T*) { return ClassTraits<T>::name; }
+template<class T>
+const char* perl_class_name_ref(const T*) { return ClassTraits<T>::name_ref; }
+    
+template <class T> 
+class Ref {
+    T* val;
+public:
+    Ref() {}
+    Ref(T* t) : val(t) {}
+    operator T*() const {return val; }
+    static const char* CLASS() { return ClassTraits<T>::name_ref; }
+};
+  
+template <class T>
+class Clone {
+    T* val;
+public:
+    Clone() {}
+    Clone(T* t) : val(new T(*t)) {}
+    Clone(const T& t) : val(new T(t)) {}
+    operator T*() const {return val; }
+    static const char* CLASS() { return ClassTraits<T>::name; }
+};
+};
+
+#endif
diff --git a/xs/xsp/BoundingBox.xsp b/xs/xsp/BoundingBox.xsp
index f6d229493..5f932d3ee 100644
--- a/xs/xsp/BoundingBox.xsp
+++ b/xs/xsp/BoundingBox.xsp
@@ -4,26 +4,23 @@
 #include <myinit.h>
 #include "BoundingBox.hpp"
 #include "Point.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Geometry::BoundingBox} class BoundingBox {
     ~BoundingBox();
-    BoundingBox* clone()
-        %code{% const char* CLASS = "Slic3r::Geometry::BoundingBox"; RETVAL = new BoundingBox(*THIS); %};
+    Clone<BoundingBox> clone()
+        %code{% RETVAL = THIS; %};
     void merge(BoundingBox* bb) %code{% THIS->merge(*bb); %};
     void merge_point(Point* point) %code{% THIS->merge(*point); %};
     void scale(double factor);
     void translate(double x, double y);
     Polygon* polygon()
-        %code{% const char* CLASS = "Slic3r::Polygon"; RETVAL = new Polygon(); THIS->polygon(RETVAL); %};
-    Point* size()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->size()); %};
-    Point* center()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->center()); %};
-    Point* min_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->min); %};
-    Point* max_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->max); %};
+        %code{% RETVAL = new Polygon(); THIS->polygon(RETVAL); %};
+    Clone<Point> size();
+    Clone<Point> center();
+    Clone<Point> min_point() %code{% RETVAL = THIS->min; %};
+    Clone<Point> max_point() %code{% RETVAL = THIS->max; %};
     double x_min() %code{% RETVAL = THIS->min.x; %};
     double x_max() %code{% RETVAL = THIS->max.x; %};
     double y_min() %code{% RETVAL = THIS->min.y; %};
@@ -45,15 +42,13 @@ new_from_points(CLASS, points)
 
 %name{Slic3r::Geometry::BoundingBoxf3} class BoundingBoxf3 {
     ~BoundingBoxf3();
-    BoundingBoxf3* clone()
-        %code{% const char* CLASS = "Slic3r::Geometry::BoundingBoxf3"; RETVAL = new BoundingBoxf3(*THIS); %};
+    Clone<BoundingBoxf3> clone()
+        %code{% RETVAL = THIS; %};
     void merge(BoundingBoxf3* bb) %code{% THIS->merge(*bb); %};
     void scale(double factor);
     void translate(double x, double y, double z);
-    Pointf3* size()
-        %code{% const char* CLASS = "Slic3r::Pointf3"; RETVAL = new Pointf3(THIS->size()); %};
-    Pointf3* center()
-        %code{% const char* CLASS = "Slic3r::Pointf3"; RETVAL = new Pointf3(THIS->center()); %};
+    Clone<Pointf3> size();
+    Clone<Pointf3> center();
     double x_min() %code{% RETVAL = THIS->min.x; %};
     double x_max() %code{% RETVAL = THIS->max.x; %};
     double y_min() %code{% RETVAL = THIS->min.y; %};
diff --git a/xs/xsp/ExPolygon.xsp b/xs/xsp/ExPolygon.xsp
index cd4201016..8ad97c250 100644
--- a/xs/xsp/ExPolygon.xsp
+++ b/xs/xsp/ExPolygon.xsp
@@ -3,18 +3,19 @@
 %{
 #include <myinit.h>
 #include "ExPolygon.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::ExPolygon} class ExPolygon {
     ~ExPolygon();
-    ExPolygon* clone()
-        %code{% const char* CLASS = "Slic3r::ExPolygon"; RETVAL = new ExPolygon(*THIS); %};
+    Clone<ExPolygon> clone()
+        %code{% RETVAL = THIS; %};
     SV* arrayref()
         %code{% RETVAL = THIS->to_AV(); %};
     SV* pp()
         %code{% RETVAL = THIS->to_SV_pureperl(); %};
-    Polygon* contour()
-        %code{% const char* CLASS = "Slic3r::Polygon::Ref"; RETVAL = &(THIS->contour); %};
+    Ref<Polygon> contour()
+        %code{% RETVAL = &(THIS->contour); %};
     Polygons* holes()
         %code{% RETVAL = &(THIS->holes); %};
     void scale(double factor);
diff --git a/xs/xsp/ExPolygonCollection.xsp b/xs/xsp/ExPolygonCollection.xsp
index 536e50372..31b100157 100644
--- a/xs/xsp/ExPolygonCollection.xsp
+++ b/xs/xsp/ExPolygonCollection.xsp
@@ -3,12 +3,13 @@
 %{
 #include <myinit.h>
 #include "ExPolygonCollection.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::ExPolygon::Collection} class ExPolygonCollection {
     ~ExPolygonCollection();
-    ExPolygonCollection* clone()
-        %code{% const char* CLASS = "Slic3r::ExPolygon::Collection"; RETVAL = new ExPolygonCollection(*THIS); %};
+    Clone<ExPolygonCollection> clone() 
+        %code{% RETVAL = THIS; %};
     void clear()
         %code{% THIS->expolygons.clear(); %};
     void scale(double factor);
@@ -72,8 +73,6 @@ ExPolygonCollection::append(...)
 
 Polygon*
 ExPolygonCollection::convex_hull()
-    PREINIT:
-        const char* CLASS = "Slic3r::Polygon";
     CODE:
         RETVAL = new Polygon ();
         THIS->convex_hull(RETVAL);
diff --git a/xs/xsp/ExtrusionEntityCollection.xsp b/xs/xsp/ExtrusionEntityCollection.xsp
index 09296fcb0..d0f0233a4 100644
--- a/xs/xsp/ExtrusionEntityCollection.xsp
+++ b/xs/xsp/ExtrusionEntityCollection.xsp
@@ -3,6 +3,7 @@
 %{
 #include <myinit.h>
 #include "ExtrusionEntityCollection.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::ExtrusionPath::Collection} class ExtrusionEntityCollection {
@@ -12,20 +13,16 @@
         %code{% THIS->entities.clear(); %};
     ExtrusionEntityCollection* chained_path(bool no_reverse)
         %code{%
-            const char* CLASS = "Slic3r::ExtrusionPath::Collection";
             RETVAL = new ExtrusionEntityCollection();
             THIS->chained_path(RETVAL, no_reverse);
         %};
     ExtrusionEntityCollection* chained_path_from(Point* start_near, bool no_reverse)
         %code{%
-            const char* CLASS = "Slic3r::ExtrusionPath::Collection";
             RETVAL = new ExtrusionEntityCollection();
             THIS->chained_path_from(*start_near, RETVAL, no_reverse);
         %};
-    Point* first_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->first_point()); %};
-    Point* last_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->last_point()); %};
+    Clone<Point> first_point();
+    Clone<Point> last_point();
     int count()
         %code{% RETVAL = THIS->entities.size(); %};
     std::vector<size_t> orig_indices()
@@ -50,11 +47,13 @@ ExtrusionEntityCollection::arrayref()
             SV* sv = newSV(0);
             // return our item by reference
             if (ExtrusionPath* path = dynamic_cast<ExtrusionPath*>(*it)) {
-                sv_setref_pv( sv, "Slic3r::ExtrusionPath::Ref", path );
+                sv_setref_pv( sv, perl_class_name_ref(path), path );
             } else if (ExtrusionLoop* loop = dynamic_cast<ExtrusionLoop*>(*it)) {
-                sv_setref_pv( sv, "Slic3r::ExtrusionLoop::Ref", loop );
+                sv_setref_pv( sv, perl_class_name_ref(loop), loop );
+            } else if (ExtrusionEntityCollection* collection = dynamic_cast<ExtrusionEntityCollection*>(*it)) {
+                sv_setref_pv( sv, perl_class_name_ref(collection), collection );
             } else {
-                sv_setref_pv( sv, "Slic3r::ExtrusionPath::Collection::Ref", *it );
+                croak("Unexpected type in ExtrusionEntityCollection");
             }
             av_store(av, i++, sv);
         }
@@ -66,14 +65,19 @@ void
 ExtrusionEntityCollection::append(...)
     CODE:
         for (unsigned int i = 1; i < items; i++) {
+            if(!sv_isobject( ST(i) ) || (SvTYPE(SvRV( ST(i) )) != SVt_PVMG)) {
+                croak("Argument %d is not object", i);
+            }
             ExtrusionEntity* entity = (ExtrusionEntity *)SvIV((SV*)SvRV( ST(i) ));
             // append COPIES
             if (ExtrusionPath* path = dynamic_cast<ExtrusionPath*>(entity)) {
                 THIS->entities.push_back( new ExtrusionPath(*path) );
             } else if (ExtrusionLoop* loop = dynamic_cast<ExtrusionLoop*>(entity)) {
                 THIS->entities.push_back( new ExtrusionLoop(*loop) );
+            } else if(ExtrusionEntityCollection* collection = dynamic_cast<ExtrusionEntityCollection*>(entity)) {
+                THIS->entities.push_back( collection->clone() );
             } else {
-                THIS->entities.push_back( (*(ExtrusionEntityCollection*)entity).clone() );
+                croak("Argument %d is of unknown type", i);
             }
         }
 
@@ -89,8 +93,6 @@ ExtrusionEntityCollection::no_sort(...)
 
 ExtrusionEntityCollection*
 ExtrusionEntityCollection::chained_path_indices(bool no_reverse)
-    PREINIT:
-        const char* CLASS = "Slic3r::ExtrusionPath::Collection";
     CODE:
         RETVAL = new ExtrusionEntityCollection();
         THIS->chained_path(RETVAL, no_reverse, &RETVAL->orig_indices);
diff --git a/xs/xsp/ExtrusionLoop.xsp b/xs/xsp/ExtrusionLoop.xsp
index 02e55c7d3..9a4629156 100644
--- a/xs/xsp/ExtrusionLoop.xsp
+++ b/xs/xsp/ExtrusionLoop.xsp
@@ -3,6 +3,7 @@
 %{
 #include <myinit.h>
 #include "ExtrusionEntity.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::ExtrusionLoop} class ExtrusionLoop {
@@ -13,15 +14,11 @@
         %code{% RETVAL = THIS->polygon.to_SV_pureperl(); %};
     void reverse()
         %code{% THIS->polygon.reverse(); %};
-    ExtrusionPath* split_at_index(int index)
-        %code{% const char* CLASS = "Slic3r::ExtrusionPath"; RETVAL = THIS->split_at_index(index); %};
-    ExtrusionPath* split_at_first_point()
-        %code{% const char* CLASS = "Slic3r::ExtrusionPath"; RETVAL = THIS->split_at_first_point(); %};
+    ExtrusionPath* split_at_index(int index);
+    ExtrusionPath* split_at_first_point();
     bool make_counter_clockwise();
-    Point* first_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->first_point()); %};
-    Point* last_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->last_point()); %};
+    Clone<Point> first_point();
+    Clone<Point> last_point();
     bool is_perimeter();
     bool is_fill();
     bool is_bridge();
@@ -41,10 +38,8 @@ _new(CLASS, polygon_sv, role, mm3_per_mm)
     OUTPUT:
         RETVAL
 
-Polygon*
+Ref<Polygon>
 ExtrusionLoop::polygon(...)
-    PREINIT:
-        const char* CLASS = "Slic3r::Polygon::Ref";
     CODE:
         if (items > 1) {
             THIS->polygon.from_SV_check( ST(1) );
diff --git a/xs/xsp/ExtrusionPath.xsp b/xs/xsp/ExtrusionPath.xsp
index 15b1a7181..5c013b182 100644
--- a/xs/xsp/ExtrusionPath.xsp
+++ b/xs/xsp/ExtrusionPath.xsp
@@ -17,10 +17,8 @@
     void reverse();
     Lines lines()
         %code{% RETVAL = THIS->polyline.lines(); %};
-    Point* first_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->first_point()); %};
-    Point* last_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->last_point()); %};
+    Clone<Point> first_point();
+    Clone<Point> last_point();
     void clip_end(double distance);
     void simplify(double tolerance);
     double length();
@@ -46,10 +44,8 @@ _new(CLASS, polyline_sv, role, mm3_per_mm)
     OUTPUT:
         RETVAL
 
-Polyline*
+Ref<Polyline>
 ExtrusionPath::polyline(...)
-    PREINIT:
-        const char* CLASS = "Slic3r::Polyline::Ref";
     CODE:
         if (items > 1) {
             THIS->polyline.from_SV_check( ST(1) );
@@ -89,8 +85,6 @@ ExtrusionPath::append(...)
 
 ExtrusionEntityCollection*
 ExtrusionPath::intersect_expolygons(ExPolygonCollection* collection)
-    PREINIT:
-        const char* CLASS = "Slic3r::ExtrusionPath::Collection";
     CODE:
         RETVAL = new ExtrusionEntityCollection ();
         THIS->intersect_expolygons(*collection, RETVAL);
@@ -99,8 +93,6 @@ ExtrusionPath::intersect_expolygons(ExPolygonCollection* collection)
 
 ExtrusionEntityCollection*
 ExtrusionPath::subtract_expolygons(ExPolygonCollection* collection)
-    PREINIT:
-        const char* CLASS = "Slic3r::ExtrusionPath::Collection";
     CODE:
         RETVAL = new ExtrusionEntityCollection ();
         THIS->subtract_expolygons(*collection, RETVAL);
diff --git a/xs/xsp/Flow.xsp b/xs/xsp/Flow.xsp
index 4ff5427fc..226b12ea8 100644
--- a/xs/xsp/Flow.xsp
+++ b/xs/xsp/Flow.xsp
@@ -3,6 +3,7 @@
 %{
 #include <myinit.h>
 #include "Flow.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Flow} class Flow {
@@ -10,8 +11,8 @@
     %name{_new} Flow(float width, float spacing, float nozzle_diameter);
     void set_bridge(bool bridge)
         %code{% THIS->bridge = bridge; %};
-    Flow* clone()
-        %code{% const char* CLASS = "Slic3r::Flow"; RETVAL = new Flow(*THIS); %};
+    Clone<Flow> clone()
+        %code{% RETVAL = THIS; %};
     
     float width()
         %code{% RETVAL = THIS->width; %};
diff --git a/xs/xsp/Geometry.xsp b/xs/xsp/Geometry.xsp
index e771a937b..773e973b5 100644
--- a/xs/xsp/Geometry.xsp
+++ b/xs/xsp/Geometry.xsp
@@ -13,8 +13,6 @@
 Polygon*
 convex_hull(points)
     Points      points
-    PREINIT:
-        const char* CLASS = "Slic3r::Polygon";
     CODE:
         RETVAL = new Polygon ();
         Slic3r::Geometry::convex_hull(points, RETVAL);
diff --git a/xs/xsp/Line.xsp b/xs/xsp/Line.xsp
index 49e2dcf34..7d234729f 100644
--- a/xs/xsp/Line.xsp
+++ b/xs/xsp/Line.xsp
@@ -3,32 +3,31 @@
 %{
 #include <myinit.h>
 #include "Line.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Line} class Line {
     ~Line();
-    Line* clone()
-        %code{% const char* CLASS = "Slic3r::Line"; RETVAL = new Line(*THIS); %};
+    Clone<Line> clone()
+        %code{% RETVAL = THIS; %};
     SV* arrayref()
         %code{% RETVAL = THIS->to_AV(); %};
     SV* pp()
         %code{% RETVAL = THIS->to_SV_pureperl(); %};
-    Point* a()
-        %code{% const char* CLASS = "Slic3r::Point::Ref"; RETVAL = &(THIS->a); %};
-    Point* b()
-        %code{% const char* CLASS = "Slic3r::Point::Ref"; RETVAL = &(THIS->b); %};
+    Ref<Point> a()
+        %code{% RETVAL=&THIS->a; %};
+    Ref<Point> b()
+        %code{% RETVAL=&THIS->b; %};
     void reverse();
     void scale(double factor);
     void translate(double x, double y);
     double length();
     double atan2_();
     double direction();
-    Point* midpoint()
-         %code{% const char* CLASS = "Slic3r::Point"; RETVAL = THIS->midpoint(); %};
-    Point* point_at(double distance)
-         %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->point_at(distance)); %};
+    Point* midpoint();
+    Clone<Point> point_at(double distance);
     Polyline* as_polyline()
-        %code{% const char* CLASS = "Slic3r::Polyline"; RETVAL = new Polyline(*THIS); %};
+        %code{% RETVAL = new Polyline(*THIS); %};
 %{
 
 Line*
diff --git a/xs/xsp/Point.xsp b/xs/xsp/Point.xsp
index dd408ccf2..f2c1a699f 100644
--- a/xs/xsp/Point.xsp
+++ b/xs/xsp/Point.xsp
@@ -3,13 +3,14 @@
 %{
 #include <myinit.h>
 #include "Point.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Point} class Point {
     Point(long _x = 0, long _y = 0);
     ~Point();
-    Point* clone()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(*THIS); %};
+    Clone<Point> clone()
+        %code{% RETVAL=THIS; %}; 
     void scale(double factor);
     void translate(double x, double y);
     SV* arrayref()
@@ -22,7 +23,7 @@
         %code{% RETVAL = THIS->y; %};
     int nearest_point_index(Points points);
     Point* nearest_point(Points points)
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(); THIS->nearest_point(points, RETVAL); %};
+        %code{% RETVAL = new Point(); THIS->nearest_point(points, RETVAL); %};
     double distance_to(Point* point)
         %code{% RETVAL = THIS->distance_to(*point); %};
     double distance_to_line(Line* line)
@@ -58,8 +59,8 @@ Point::coincides_with(point_sv)
 %name{Slic3r::Pointf3} class Pointf3 {
     Pointf3(double _x = 0, double _y = 0, double _z = 0);
     ~Pointf3();
-    Pointf3* clone()
-        %code{% const char* CLASS = "Slic3r::Pointf3"; RETVAL = new Pointf3(*THIS); %};
+    Clone<Pointf3> clone()
+        %code{% RETVAL = THIS; %};
     double x()
         %code{% RETVAL = THIS->x; %};
     double y()
diff --git a/xs/xsp/Polygon.xsp b/xs/xsp/Polygon.xsp
index 65c826f3a..d27a9d1b0 100644
--- a/xs/xsp/Polygon.xsp
+++ b/xs/xsp/Polygon.xsp
@@ -3,12 +3,13 @@
 %{
 #include <myinit.h>
 #include "Polygon.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Polygon} class Polygon {
     ~Polygon();
-    Polygon* clone()
-        %code{% const char* CLASS = "Slic3r::Polygon"; RETVAL = new Polygon(*THIS); %};
+    Clone<Polygon> clone()
+        %code{% RETVAL = THIS; %};
     SV* arrayref()
         %code{% RETVAL = THIS->to_AV(); %};
     SV* pp()
@@ -18,11 +19,11 @@
     void reverse();
     Lines lines();
     Polyline* split_at(Point* point)
-        %code{% const char* CLASS = "Slic3r::Polyline"; RETVAL = THIS->split_at(*point); %};
+        %code{% RETVAL = THIS->split_at(*point); %};
     Polyline* split_at_index(int index)
-        %code{% const char* CLASS = "Slic3r::Polyline"; RETVAL = THIS->split_at_index(index); %};
+        %code{% RETVAL = THIS->split_at_index(index); %};
     Polyline* split_at_first_point()
-        %code{% const char* CLASS = "Slic3r::Polyline"; RETVAL = THIS->split_at_first_point(); %};
+        %code{% RETVAL = THIS->split_at_first_point(); %};
     Points equally_spaced_points(double distance);
     double length();
     double area();
@@ -31,8 +32,7 @@
     bool make_counter_clockwise();
     bool make_clockwise();
     bool is_valid();
-    Point* first_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->first_point()); %};
+    Clone<Point> first_point();
     bool contains_point(Point* point)
         %code{% RETVAL = THIS->contains_point(*point); %};
     Polygons simplify(double tolerance);
diff --git a/xs/xsp/Polyline.xsp b/xs/xsp/Polyline.xsp
index 8d10fb734..752962a6a 100644
--- a/xs/xsp/Polyline.xsp
+++ b/xs/xsp/Polyline.xsp
@@ -4,12 +4,13 @@
 #include <myinit.h>
 #include "ClipperUtils.hpp"
 #include "Polyline.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Polyline} class Polyline {
     ~Polyline();
-    Polyline* clone()
-        %code{% const char* CLASS = "Slic3r::Polyline"; RETVAL = new Polyline(*THIS); %};
+    Clone<Polyline> clone()
+        %code{% RETVAL = THIS; %};
     SV* arrayref()
         %code{% RETVAL = THIS->to_AV(); %};
     SV* pp()
@@ -20,10 +21,8 @@
         %code{% THIS->points.pop_back(); %};
     void reverse();
     Lines lines();
-    Point* first_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->first_point()); %};
-    Point* last_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->last_point()); %};
+    Clone<Point> first_point();
+    Clone<Point> last_point();
     Points equally_spaced_points(double distance);
     double length();
     bool is_valid();
diff --git a/xs/xsp/PolylineCollection.xsp b/xs/xsp/PolylineCollection.xsp
index a9061115c..b976b5a53 100644
--- a/xs/xsp/PolylineCollection.xsp
+++ b/xs/xsp/PolylineCollection.xsp
@@ -3,30 +3,28 @@
 %{
 #include <myinit.h>
 #include "PolylineCollection.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Polyline::Collection} class PolylineCollection {
     ~PolylineCollection();
-    PolylineCollection* clone()
-        %code{% const char* CLASS = "Slic3r::Polyline::Collection"; RETVAL = new PolylineCollection(*THIS); %};
+    Clone<PolylineCollection> clone()
+        %code{% RETVAL = THIS; %};
     void clear()
         %code{% THIS->polylines.clear(); %};
     PolylineCollection* chained_path(bool no_reverse)
         %code{%
-            const char* CLASS = "Slic3r::Polyline::Collection";
             RETVAL = new PolylineCollection();
             THIS->chained_path(RETVAL, no_reverse);
         %};
     PolylineCollection* chained_path_from(Point* start_near, bool no_reverse)
         %code{%
-            const char* CLASS = "Slic3r::Polyline::Collection";
             RETVAL = new PolylineCollection();
             THIS->chained_path_from(*start_near, RETVAL, no_reverse);
         %};
     int count()
         %code{% RETVAL = THIS->polylines.size(); %};
-    Point* leftmost_point()
-        %code{% const char* CLASS = "Slic3r::Point"; RETVAL = new Point(THIS->leftmost_point()); %};
+    Clone<Point> leftmost_point();
 %{
 
 PolylineCollection*
diff --git a/xs/xsp/Surface.xsp b/xs/xsp/Surface.xsp
index 0dbd66ad0..5c85017c8 100644
--- a/xs/xsp/Surface.xsp
+++ b/xs/xsp/Surface.xsp
@@ -4,12 +4,13 @@
 #include <myinit.h>
 #include "Surface.hpp"
 #include "ClipperUtils.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::Surface} class Surface {
     ~Surface();
-    ExPolygon* expolygon()
-        %code{% const char* CLASS = "Slic3r::ExPolygon::Ref"; RETVAL = &(THIS->expolygon); %};
+    Ref<ExPolygon> expolygon()
+        %code{% RETVAL = &(THIS->expolygon); %};
     double thickness()
         %code{% RETVAL = THIS->thickness; %};
     unsigned short thickness_layers()
diff --git a/xs/xsp/TriangleMesh.xsp b/xs/xsp/TriangleMesh.xsp
index 5f92874b1..8388c8a66 100644
--- a/xs/xsp/TriangleMesh.xsp
+++ b/xs/xsp/TriangleMesh.xsp
@@ -3,13 +3,14 @@
 %{
 #include <myinit.h>
 #include "TriangleMesh.hpp"
+#include "perlglue.hpp"
 %}
 
 %name{Slic3r::TriangleMesh} class TriangleMesh {
     TriangleMesh();
     ~TriangleMesh();
-    TriangleMesh* clone()
-        %code{% const char* CLASS = "Slic3r::TriangleMesh"; RETVAL = new TriangleMesh(*THIS); %};
+    Clone<TriangleMesh> clone()
+        %code{% RETVAL = THIS; %};
     void ReadSTLFile(char* input_file);
     void write_ascii(char* output_file);
     void write_binary(char* output_file);
@@ -31,7 +32,6 @@
         %code{% THIS->horizontal_projection(RETVAL); %};
     BoundingBoxf3* bounding_box()
         %code{%
-            const char* CLASS = "Slic3r::Geometry::BoundingBoxf3";
             RETVAL = new BoundingBoxf3();
             THIS->bounding_box(RETVAL);
         %};
@@ -189,8 +189,6 @@ TriangleMesh::bb3()
 
 Polygon*
 TriangleMesh::convex_hull()
-    PREINIT:
-        const char* CLASS = "Slic3r::Polygon";
     CODE:
         RETVAL = new Polygon ();
         THIS->convex_hull(RETVAL);
diff --git a/xs/xsp/my.map b/xs/xsp/my.map
index 9fbe0b907..306158396 100644
--- a/xs/xsp/my.map
+++ b/xs/xsp/my.map
@@ -2,30 +2,80 @@ std::vector<Points::size_type>  T_STD_VECTOR_INT
 std::vector<size_t>  T_STD_VECTOR_INT
 t_config_option_key T_STD_STRING
 
-BoundingBox*         O_OBJECT
-BoundingBoxf3*         O_OBJECT
-DynamicPrintConfig*  O_OBJECT
-PrintObjectConfig*  O_OBJECT
-PrintRegionConfig*  O_OBJECT
-PrintConfig*  O_OBJECT
-FullPrintConfig*  O_OBJECT
-ZTable*         O_OBJECT
-TriangleMesh*         O_OBJECT
-Point*         O_OBJECT
-Pointf3*         O_OBJECT
-Line*           O_OBJECT
-Polyline*       O_OBJECT
-PolylineCollection*    O_OBJECT
-Polygon*        O_OBJECT
-ExPolygon*      O_OBJECT
-ExPolygonCollection*    O_OBJECT
-ExtrusionEntityCollection*    O_OBJECT
-ExtrusionPath*  O_OBJECT
-ExtrusionLoop*  O_OBJECT
-Flow*           O_OBJECT
-PrintState*  O_OBJECT
-Surface*        O_OBJECT
-SurfaceCollection*      O_OBJECT
+BoundingBox*               O_OBJECT_SLIC3R
+Ref<BoundingBox>           O_OBJECT_SLIC3R_T
+Clone<BoundingBox>         O_OBJECT_SLIC3R_T
+
+BoundingBoxf3*             O_OBJECT_SLIC3R
+Ref<BoundingBoxf3>         O_OBJECT_SLIC3R_T
+Clone<BoundingBoxf3>       O_OBJECT_SLIC3R_T
+
+DynamicPrintConfig*        O_OBJECT_SLIC3R
+PrintObjectConfig*         O_OBJECT_SLIC3R
+PrintRegionConfig*         O_OBJECT_SLIC3R
+PrintConfig*               O_OBJECT_SLIC3R
+FullPrintConfig*           O_OBJECT_SLIC3R
+ZTable*                    O_OBJECT
+
+TriangleMesh*              O_OBJECT_SLIC3R
+Ref<TriangleMesh>          O_OBJECT_SLIC3R_T
+Clone<TriangleMesh>        O_OBJECT_SLIC3R_T
+
+Point*                     O_OBJECT_SLIC3R
+Ref<Point>                 O_OBJECT_SLIC3R_T
+Clone<Point>               O_OBJECT_SLIC3R_T
+
+Pointf3*                   O_OBJECT_SLIC3R
+Ref<Pointf3>               O_OBJECT_SLIC3R_T
+Clone<Pointf3>             O_OBJECT_SLIC3R_T
+
+Line*                      O_OBJECT_SLIC3R
+Ref<Line>                  O_OBJECT_SLIC3R_T
+Clone<Line>                O_OBJECT_SLIC3R_T
+
+Polyline*                  O_OBJECT_SLIC3R
+Ref<Polyline>              O_OBJECT_SLIC3R_T
+Clone<Polyline>            O_OBJECT_SLIC3R_T
+
+PolylineCollection*        O_OBJECT_SLIC3R
+Ref<PolylineCollection>    O_OBJECT_SLIC3R_T
+Clone<PolylineCollection>  O_OBJECT_SLIC3R_T
+
+Polygon*                   O_OBJECT_SLIC3R
+Ref<Polygon>               O_OBJECT_SLIC3R_T
+Clone<Polygon>             O_OBJECT_SLIC3R_T
+
+ExPolygon*                 O_OBJECT_SLIC3R
+Ref<ExPolygon>             O_OBJECT_SLIC3R_T
+Clone<ExPolygon>           O_OBJECT_SLIC3R_T
+
+ExPolygonCollection*       O_OBJECT_SLIC3R
+Ref<ExPolygonCollection>   O_OBJECT_SLIC3R_T
+Clone<ExPolygonCollection> O_OBJECT_SLIC3R_T
+
+ExtrusionEntityCollection*              O_OBJECT_SLIC3R
+Ref<ExtrusionEntityCollection>          O_OBJECT_SLIC3R_T
+Clone<ExtrusionEntityCollection>        O_OBJECT_SLIC3R_T
+
+ExtrusionPath*             O_OBJECT_SLIC3R
+Ref<ExtrusionPath>         O_OBJECT_SLIC3R_T
+Clone<ExtrusionPath>       O_OBJECT_SLIC3R_T
+
+ExtrusionLoop*             O_OBJECT_SLIC3R
+Ref<ExtrusionLoop>         O_OBJECT_SLIC3R_T
+Clone<ExtrusionLoop>       O_OBJECT_SLIC3R_T
+
+Flow*                      O_OBJECT_SLIC3R
+Ref<Flow>                  O_OBJECT_SLIC3R_T
+Clone<Flow>                O_OBJECT_SLIC3R_T
+
+PrintState*                O_OBJECT_SLIC3R
+
+Surface*                   O_OBJECT_SLIC3R
+Ref<Surface>               O_OBJECT_SLIC3R_T
+Clone<Surface>             O_OBJECT_SLIC3R_T
+
+SurfaceCollection*         O_OBJECT_SLIC3R
 
 ExtrusionRole     T_UV
 FlowRole     T_UV
@@ -55,6 +105,19 @@ TriangleMeshPtrs T_PTR_ARRAYREF
 
 INPUT
 
+O_OBJECT_SLIC3R
+    if( sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVMG) ) {
+        if ( sv_isa($arg, perl_class_name($var) ) ||  sv_isa($arg, perl_class_name_ref($var) )) {
+              $var = ($type)SvIV((SV*)SvRV( $arg ));
+        } else {
+              croak(\"$var is not of type %s (got %s)\", perl_class_name($var), HvNAME(SvSTASH(SvRV($arg))));
+              XSRETURN_UNDEF;
+        }
+    } else {
+        warn( \"${Package}::$func_name() -- $var is not a blessed SV reference\" );
+        XSRETURN_UNDEF;
+    }
+
 T_ARRAYREF
     if (SvROK($arg) && SvTYPE(SvRV($arg)) == SVt_PVAV) {
         AV* av = (AV*)SvRV($arg);
@@ -72,6 +135,14 @@ T_ARRAYREF
 	             \"$var\");
 
 OUTPUT
+# return object from pointer
+O_OBJECT_SLIC3R
+        sv_setref_pv( $arg, perl_class_name($var), (void*)$var );
+
+# return value handled by template class
+O_OBJECT_SLIC3R_T
+        sv_setref_pv( $arg, $type\::CLASS(), (void*)$var );
+
 
 T_ARRAYREF
 	AV* av = newAV();
diff --git a/xs/xsp/typemap.xspt b/xs/xsp/typemap.xspt
index 176b49878..2c3667096 100644
--- a/xs/xsp/typemap.xspt
+++ b/xs/xsp/typemap.xspt
@@ -10,23 +10,56 @@
 %typemap{SV*};
 %typemap{AV*};
 %typemap{Point*};
+%typemap{Ref<Point>}{simple};
+%typemap{Clone<Point>}{simple};
 %typemap{Pointf3*};
+%typemap{Ref<Pointf3>}{simple};
+%typemap{Clone<Pointf3>}{simple};
 %typemap{BoundingBox*};
+%typemap{Ref<BoundingBox>}{simple};
+%typemap{Clone<BoundingBox>}{simple};
 %typemap{BoundingBoxf3*};
+%typemap{Ref<BoundingBoxf3>}{simple};
+%typemap{Clone<BoundingBoxf3>}{simple};
 %typemap{DynamicPrintConfig*};
 %typemap{PrintObjectConfig*};
 %typemap{PrintRegionConfig*};
 %typemap{PrintConfig*};
 %typemap{FullPrintConfig*};
 %typemap{ExPolygon*};
+%typemap{Ref<ExPolygon>}{simple};
+%typemap{Clone<ExPolygon>}{simple};
 %typemap{ExPolygonCollection*};
+%typemap{Ref<ExPolygonCollection>}{simple};
+%typemap{Clone<ExPolygonCollection>}{simple};
 %typemap{Flow*};
+%typemap{Ref<Flow>}{simple};
+%typemap{Clone<Flow>}{simple};
 %typemap{Line*};
+%typemap{Ref<Line>}{simple};
+%typemap{Clone<Line>}{simple};
 %typemap{Polyline*};
+%typemap{Ref<Polyline>}{simple};
+%typemap{Clone<Polyline>}{simple};
 %typemap{Polygon*};
+%typemap{Ref<Polygon>}{simple};
+%typemap{Clone<Polygon>}{simple};
 %typemap{ExtrusionEntityCollection*};
+%typemap{Ref<ExtrusionEntityCollection>}{simple};
+%typemap{Clone<ExtrusionEntityCollection>}{simple};
 %typemap{ExtrusionPath*};
+%typemap{Ref<ExtrusionPath>}{simple};
+%typemap{Clone<ExtrusionPath>}{simple};
 %typemap{ExtrusionLoop*};
+%typemap{Ref<ExtrusionLoop>}{simple};
+%typemap{Clone<ExtrusionLoop>}{simple};
+%typemap{TriangleMesh*};
+%typemap{Ref<TriangleMesh>}{simple};
+%typemap{Clone<TriangleMesh>}{simple};
+%typemap{PolylineCollection*};
+%typemap{Ref<PolylineCollection>}{simple};
+%typemap{Clone<PolylineCollection>}{simple};
+
 %typemap{Points};
 %typemap{Pointfs};
 %typemap{Lines};