diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index e771e25f..e235a305 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -7,5 +7,5 @@
 %include "Enums.i"
 %include "PolyVoxCStdInt.i"
 %include "Utility.i"
-%include "PolyVoxForwardDeclarations.i"
-//%include "Vector.i"
+//%include "PolyVoxForwardDeclarations.i" //Shouldn't be needed
+%include "Vector.i"
diff --git a/library/bindings/Vector.i b/library/bindings/Vector.i
index dc341a8e..493fb918 100644
--- a/library/bindings/Vector.i
+++ b/library/bindings/Vector.i
@@ -1,10 +1,18 @@
 %module Vector
 %{
 #include "PolyVoxCore/Vector.h"
+//#include "PolyVoxCore/PolyVoxCStdInt.h"
 %}
 
 %include "PolyVoxCore/Vector.h"
 
-%template(VectorTest) PolyVox::Vector<3,float>;
+%template(Vector3DFloat) PolyVox::Vector<3,float>;
+%template(Vector3DDouble) PolyVox::Vector<3,double>;
+//%template(Vector3DInt8) PolyVox::Vector<3,int8>;
+//%template(Vector3DUint8) PolyVox::Vector<3,uint8>;
+//%template(Vector3DInt16) PolyVox::Vector<3,int16>;
+//%template(Vector3DUint16) PolyVox::Vector<3,uint16>;
+//%template(Vector3DInt32) PolyVox::Vector<3,int32>;
+//%template(Vector3DUint32) PolyVox::Vector<3,uint32>;
 
-%rename(assign) VectorTest::operator=;
+%rename(assign) Vector3DFloat::operator=;