diff --git a/Engine.h b/Engine.h
index 5cd061f..d58d405 100644
--- a/Engine.h
+++ b/Engine.h
@@ -11,6 +11,7 @@
 #include "TextureCache/TextureCache.h"
 #include "wfobj/WFObj.h"
 #include "Video.h"
+#include "refptr/refptr.h"
 
 class Engine
 {
@@ -18,10 +19,10 @@ class Engine
         class Object
         {
             public:
-                enum ObjectType { CUBE, SPHERE, PLANE, CYLINDER, CCYLINDER };
                 Object(bool is_static, OdeWorld & world, GLuint dl,
                         float scale = 1.0f);
-                Object(bool is_static, OdeWorld & world, ObjectType obj,
+                Object(bool is_static, OdeWorld & world,
+                        OdeWorld::GeomType geom_type,
                         const std::vector<float> & args);
                 Object(const Object & orig);
                 ~Object();
@@ -67,6 +68,8 @@ class Engine
                 bool m_is_visible;
                 float m_scale;
                 bool m_is_scaled;
+                OdeWorld::GeomType  m_geom_type;
+                refptr< std::vector<float> > m_args;
         };
 
         class EngineFileLoader : public FileLoader